From 1e0b8ff5f8a0a99ea5382bf1cef876385d1ba765 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Wed, 9 Nov 2022 21:57:28 -0800 Subject: [PATCH] Refactor enchant IDs --- proto/common.proto | 14 +- sim/common/tbc/enchant_effects.go | 44 +- sim/common/wotlk/enchant_effects.go | 84 +- sim/core/character.go | 4 +- sim/core/item_effects.go | 10 + sim/core/items/all_enchants.go | 446 +++--- sim/core/items/items.go | 16 +- sim/deathknight/dps/TestFrost.results | 424 ++--- sim/deathknight/dps/TestUnholy.results | 626 ++++---- sim/deathknight/dps/presets.go | 290 ++-- sim/deathknight/items.go | 6 +- sim/deathknight/tank/presets.go | 186 +-- sim/druid/balance/TestBalance.results | 398 ++--- sim/druid/balance/presets.go | 35 +- sim/druid/feral/presets.go | 18 +- sim/druid/tank/presets.go | 22 +- sim/hunter/TestHunter.results | 535 +++---- sim/hunter/presets.go | 36 +- sim/mage/presets.go | 119 +- sim/paladin/protection/presets.go | 184 +-- sim/paladin/retribution/presets.go | 18 +- sim/priest/healing/presets.go | 20 +- sim/priest/shadow/presets.go | 18 +- sim/priest/smite/TestSmite.results | 361 +++-- sim/priest/smite/presets.go | 60 +- sim/rogue/presets.go | 98 +- sim/shaman/elemental/TestElemental.results | 524 +++---- sim/shaman/elemental/presets.go | 118 +- sim/shaman/enhancement/presets.go | 188 +-- sim/warlock/TestWarlock.results | 224 +-- sim/warlock/presets.go | 190 +-- sim/warrior/dps/TestArms.results | 398 ++--- sim/warrior/dps/TestFury.results | 398 ++--- sim/warrior/dps/presets.go | 44 +- .../protection/TestProtectionWarrior.results | 408 ++--- sim/warrior/protection/presets.go | 39 +- ui/balance_druid/presets.ts | 373 +++-- ui/core/components/gear_picker.ts | 10 +- ui/core/components/importers.ts | 11 - ui/core/player.ts | 10 +- ui/core/proto_utils/equipped_item.ts | 2 +- ui/core/sim.ts | 45 +- ui/deathknight/presets.ts | 1197 +++++++------- ui/deathknight/sim.ts | 2 +- ui/elemental_shaman/presets.ts | 546 ++++--- ui/enhancement_shaman/presets.ts | 359 +++-- ui/feral_druid/presets.ts | 330 ++-- ui/feral_tank_druid/presets.ts | 394 +---- ui/feral_tank_druid/sim.ts | 6 +- ui/healing_priest/presets.ts | 80 +- ui/hunter/presets.ts | 88 +- ui/hunter/sim.ts | 2 +- ui/mage/presets.ts | 1390 ++++++++--------- ui/mage/sim.ts | 8 +- ui/protection_paladin/presets.ts | 368 ++--- ui/protection_warrior/presets.ts | 382 ++--- ui/protection_warrior/sim.ts | 2 +- ui/raid/import_export.ts | 5 +- ui/raid/presets.ts | 50 +- ui/retribution_paladin/presets.ts | 835 +++++----- ui/rogue/presets.ts | 710 ++++----- ui/shadow_priest/presets.ts | 368 +++-- ui/smite_priest/presets.ts | 38 +- ui/tank_deathknight/presets.ts | 184 +-- ui/warlock/presets.ts | 990 ++++++------ ui/warrior/presets.ts | 734 ++++----- 66 files changed, 7746 insertions(+), 8376 deletions(-) diff --git a/proto/common.proto b/proto/common.proto index 7d8ba30e5b..b83d8d8fce 100644 --- a/proto/common.proto +++ b/proto/common.proto @@ -683,13 +683,15 @@ enum EnchantType { } message Enchant { - int32 id = 1; // ID of the enchant "item". - int32 effect_id = 2; // ID of the effect (for the item tooltip UI) - string name = 3; + // All enchants have an effect ID. Some also have an item ID, others have a spell ID, + // and yet others have both item and spell IDs. No single ID alone is not enough + // to uniquely identify an enchant. Uniqueness requires either effect ID + slot, or + // effect ID + item/spell ID. + int32 effect_id = 2; // ID of the effect. + int32 item_id = 1; // ID of the enchant "item". Might be 0 if not available. + int32 spell_id = 10; // ID of the enchant "spell". Might be 0 if not available. - // If true, then id is the ID of the enchant spell instead of the formula item. - // This is used by enchants for which a formula doesn't exist (its taught by a trainer). - bool is_spell_id = 10; + string name = 3; ItemType type = 4; // Which type of item this enchant can be applied to. EnchantType enchant_type = 9; diff --git a/sim/common/tbc/enchant_effects.go b/sim/common/tbc/enchant_effects.go index 4c9578b5e5..9ee79cff65 100644 --- a/sim/common/tbc/enchant_effects.go +++ b/sim/common/tbc/enchant_effects.go @@ -13,7 +13,7 @@ func init() { // Keep these in order by item ID. // TODO: Crusader, Mongoose, and Executioner could also be modelled as AddWeaponEffect instead - core.AddWeaponEffect(16250, func(agent core.Agent, slot proto.ItemSlot) { + core.AddWeaponEffect(1897, func(agent core.Agent, slot proto.ItemSlot) { w := &agent.GetCharacter().AutoAttacks.MH if slot == proto.ItemSlot_ItemSlotOffHand { w = &agent.GetCharacter().AutoAttacks.OH @@ -22,14 +22,14 @@ func init() { w.BaseDamageMax += 5 }) - core.NewEnchantEffect(18283, func(agent core.Agent) { + core.NewEnchantEffect(2523, func(agent core.Agent) { agent.GetCharacter().AddBonusRangedHitRating(30) }) - core.NewEnchantEffect(23766, func(agent core.Agent) { + core.NewEnchantEffect(2724, func(agent core.Agent) { agent.GetCharacter().AddBonusRangedCritRating(28) }) - core.NewEnchantEffect(22560, func(agent core.Agent) { + core.NewEnchantEffect(2671, func(agent core.Agent) { // Sunfire agent.GetCharacter().OnSpellRegistered(func(spell *core.Spell) { if spell.SpellSchool.Matches(core.SpellSchoolArcane | core.SpellSchoolFire) { @@ -37,7 +37,7 @@ func init() { } }) }) - core.NewEnchantEffect(22561, func(agent core.Agent) { + core.NewEnchantEffect(2672, func(agent core.Agent) { // Soulfrost agent.GetCharacter().OnSpellRegistered(func(spell *core.Spell) { if spell.SpellSchool.Matches(core.SpellSchoolFrost | core.SpellSchoolShadow) { @@ -46,7 +46,7 @@ func init() { }) }) - core.AddWeaponEffect(22552, func(agent core.Agent, slot proto.ItemSlot) { + core.AddWeaponEffect(963, func(agent core.Agent, slot proto.ItemSlot) { w := &agent.GetCharacter().AutoAttacks.MH if slot == proto.ItemSlot_ItemSlotOffHand { w = &agent.GetCharacter().AutoAttacks.OH @@ -58,10 +58,10 @@ func init() { // ApplyCrusaderEffect will be applied twice if there is two weapons with this enchant. // However it will automatically overwrite one of them so it should be ok. // A single application of the aura will handle both mh and oh procs. - core.NewEnchantEffect(16252, func(agent core.Agent) { + core.NewEnchantEffect(1900, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 16252 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 16252 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 1900 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 1900 if !mh && !oh { return } @@ -95,17 +95,17 @@ func init() { }) }) - core.NewEnchantEffect(22535, func(agent core.Agent) { + core.NewEnchantEffect(2929, func(agent core.Agent) { agent.GetCharacter().PseudoStats.BonusDamage += 2 }) // ApplyMongooseEffect will be applied twice if there is two weapons with this enchant. // However it will automatically overwrite one of them so it should be ok. // A single application of the aura will handle both mh and oh procs. - core.NewEnchantEffect(22559, func(agent core.Agent) { + core.NewEnchantEffect(2673, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 22559 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 22559 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 2673 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 2673 if !mh && !oh { return } @@ -137,25 +137,25 @@ func init() { }) }) - core.AddWeaponEffect(23765, func(agent core.Agent, _ proto.ItemSlot) { + core.AddWeaponEffect(2723, func(agent core.Agent, _ proto.ItemSlot) { w := &agent.GetCharacter().AutoAttacks.Ranged w.BaseDamageMin += 12 w.BaseDamageMax += 12 }) - core.NewEnchantEffect(33150, func(agent core.Agent) { + core.NewEnchantEffect(2621, func(agent core.Agent) { character := agent.GetCharacter() character.PseudoStats.ThreatMultiplier *= 0.98 }) - core.NewEnchantEffect(33153, func(agent core.Agent) { + core.NewEnchantEffect(2613, func(agent core.Agent) { character := agent.GetCharacter() character.PseudoStats.ThreatMultiplier *= 1.02 }) - core.NewEnchantEffect(33307, func(agent core.Agent) { + core.NewEnchantEffect(3225, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 33307 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 33307 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3225 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3225 if !mh && !oh { return } @@ -223,10 +223,10 @@ func init() { }, }) } - core.NewEnchantEffect(35498, func(agent core.Agent) { + core.NewEnchantEffect(3273, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 35498 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 35498 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3273 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3273 if !mh && !oh { return } diff --git a/sim/common/wotlk/enchant_effects.go b/sim/common/wotlk/enchant_effects.go index aa0c0d352e..4e011697b8 100644 --- a/sim/common/wotlk/enchant_effects.go +++ b/sim/common/wotlk/enchant_effects.go @@ -11,10 +11,10 @@ import ( func init() { // Keep these in order by item ID. - core.NewEnchantEffect(37339, func(agent core.Agent) { + core.NewEnchantEffect(3251, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 37339 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 37339 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3251 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3251 if !mh && !oh { return } @@ -57,10 +57,10 @@ func init() { }) }) - core.NewEnchantEffect(37344, func(agent core.Agent) { + core.NewEnchantEffect(3239, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 37344 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 37344 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3239 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3239 if !mh && !oh { return } @@ -99,7 +99,7 @@ func init() { }) }) - core.NewEnchantEffect(41146, func(agent core.Agent) { + core.NewEnchantEffect(3607, func(agent core.Agent) { character := agent.GetCharacter() // TODO: This should be ranged-only haste. For now just make it hunter-only. if character.Class == proto.Class_ClassHunter { @@ -107,11 +107,11 @@ func init() { } }) - core.NewEnchantEffect(41167, func(agent core.Agent) { + core.NewEnchantEffect(3608, func(agent core.Agent) { agent.GetCharacter().AddBonusRangedCritRating(40) }) - core.NewEnchantEffect(42500, func(agent core.Agent) { + core.NewEnchantEffect(3748, func(agent core.Agent) { character := agent.GetCharacter() actionID := core.ActionID{ItemID: 42500} @@ -145,35 +145,27 @@ func init() { }) }) - core.NewEnchantEffect(44473, func(agent core.Agent) { + core.NewEnchantEffect(3247, func(agent core.Agent) { character := agent.GetCharacter() if character.CurrentTarget.MobType == proto.MobType_MobTypeUndead { character.PseudoStats.MobTypeAttackPower += 140 } }) - core.NewEnchantEffect(44485, func(agent core.Agent) { + core.NewEnchantEffect(3253, func(agent core.Agent) { character := agent.GetCharacter() character.PseudoStats.ThreatMultiplier *= 1.02 }) - // Apply for Wisdom to Cloak (itemid) but NOT for Enchant Gloves Precision (spellid) - core.NewEnchantEffect(44488, func(agent core.Agent) { + core.NewEnchantEffect(3296, func(agent core.Agent) { character := agent.GetCharacter() - if character.Equip[proto.ItemSlot_ItemSlotBack].Enchant.ID == 44488 { - if character.Equip[proto.ItemSlot_ItemSlotHands].Enchant.ID == 44488 { - // If someone has both of these enchants for some reason, this will get called twice. - character.PseudoStats.ThreatMultiplier *= 0.98995 - } else { - character.PseudoStats.ThreatMultiplier *= 0.98 - } - } + character.PseudoStats.ThreatMultiplier *= 0.98 }) - core.NewEnchantEffect(44492, func(agent core.Agent) { + core.NewEnchantEffect(3789, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 44492 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 44492 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3789 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3789 if !mh && !oh { return } @@ -208,10 +200,10 @@ func init() { }) // TODO: These are stand-in values without any real reference. - core.NewEnchantEffect(44494, func(agent core.Agent) { + core.NewEnchantEffect(3241, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 44494 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 44494 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3241 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3241 if !mh && !oh { return } @@ -238,7 +230,7 @@ func init() { }) }) - core.NewEnchantEffect(44495, func(agent core.Agent) { + core.NewEnchantEffect(3790, func(agent core.Agent) { character := agent.GetCharacter() procAura := character.NewTemporaryStatsAura("Black Magic Proc", core.ActionID{SpellID: 59626}, stats.Stats{stats.MeleeHaste: 250, stats.SpellHaste: 250}, time.Second*10) @@ -266,13 +258,13 @@ func init() { }) }) - core.AddWeaponEffect(44739, func(agent core.Agent, _ proto.ItemSlot) { + core.AddWeaponEffect(3843, func(agent core.Agent, _ proto.ItemSlot) { w := &agent.GetCharacter().AutoAttacks.Ranged w.BaseDamageMin += 15 w.BaseDamageMax += 15 }) - core.NewEnchantEffect(54998, func(agent core.Agent) { + core.NewEnchantEffect(3603, func(agent core.Agent) { character := agent.GetCharacter() actionID := core.ActionID{SpellID: 54757} @@ -309,7 +301,7 @@ func init() { }) }) - core.NewEnchantEffect(54999, func(agent core.Agent) { + core.NewEnchantEffect(3604, func(agent core.Agent) { character := agent.GetCharacter() actionID := core.ActionID{SpellID: 54758} @@ -372,10 +364,10 @@ func init() { }) } - core.NewEnchantEffect(53343, func(agent core.Agent) { + core.NewEnchantEffect(3370, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 53343 - oh := character.HasOHWeapon() && character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 53343 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3370 + oh := character.HasOHWeapon() && character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3370 if !mh && !oh { return } @@ -457,10 +449,10 @@ func init() { // ApplyRuneOfTheFallenCrusader will be applied twice if there is two weapons with this enchant. // However it will automatically overwrite one of them so it should be ok. // A single application of the aura will handle both mh and oh procs. - core.NewEnchantEffect(53344, func(agent core.Agent) { + core.NewEnchantEffect(3368, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 53344 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 53344 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3368 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3368 if !mh && !oh { return } @@ -502,10 +494,10 @@ func init() { }) }) - core.NewEnchantEffect(70164, func(agent core.Agent) { + core.NewEnchantEffect(3883, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 70164 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 70164 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3883 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3883 if !mh && !oh { return } @@ -514,10 +506,10 @@ func init() { character.MultiplyStat(stats.Stamina, 1.01) }) - core.NewEnchantEffect(62158, func(agent core.Agent) { + core.NewEnchantEffect(3847, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 62158 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 62158 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3847 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3847 if !mh { return } @@ -530,7 +522,7 @@ func init() { character.MultiplyStat(stats.Stamina, 1.02) }) - core.NewEnchantEffect(55642, func(agent core.Agent) { + core.NewEnchantEffect(3722, func(agent core.Agent) { character := agent.GetCharacter() procAura := character.NewTemporaryStatsAura("Lightweave Embroidery Proc", core.ActionID{SpellID: 55637}, stats.Stats{stats.SpellPower: 295}, time.Second*15) @@ -554,7 +546,7 @@ func init() { }) }) - core.NewEnchantEffect(55769, func(agent core.Agent) { + core.NewEnchantEffect(3728, func(agent core.Agent) { character := agent.GetCharacter() if !character.HasManaBar() { return @@ -581,7 +573,7 @@ func init() { }) }) - core.NewEnchantEffect(55777, func(agent core.Agent) { + core.NewEnchantEffect(3730, func(agent core.Agent) { character := agent.GetCharacter() procAura := character.NewTemporaryStatsAura("Swordguard Embroidery Proc", core.ActionID{SpellID: 55775}, stats.Stats{stats.AttackPower: 400, stats.RangedAttackPower: 400}, time.Second*15) diff --git a/sim/core/character.go b/sim/core/character.go index ccd85ab951..0f9776a4a3 100644 --- a/sim/core/character.go +++ b/sim/core/character.go @@ -178,11 +178,11 @@ func (character *Character) applyItemEffects(agent Agent) { } // TODO: should we use eq.Enchant.EffectID because some enchants use a spellID instead of itemID? - if applyEnchantEffect, ok := enchantEffects[eq.Enchant.ID]; ok { + if applyEnchantEffect, ok := enchantEffects[eq.Enchant.EffectID]; ok { applyEnchantEffect(agent) } - if applyWeaponEffect, ok := weaponEffects[eq.Enchant.ID]; ok { + if applyWeaponEffect, ok := weaponEffects[eq.Enchant.EffectID]; ok { applyWeaponEffect(agent, proto.ItemSlot(slot)) } } diff --git a/sim/core/item_effects.go b/sim/core/item_effects.go index d9924fffe7..3367a2d240 100644 --- a/sim/core/item_effects.go +++ b/sim/core/item_effects.go @@ -91,6 +91,16 @@ func NewEnchantEffect(id int32, enchantEffect ApplyEffect) { } func AddWeaponEffect(id int32, weaponEffect ApplyWeaponEffect) { + found := false + for _, enchantsByID := range items.EnchantsByItemByID { + if _, ok := enchantsByID[id]; ok { + found = true + break + } + } + if !found { + panic(fmt.Sprintf("No enchant with ID: %d", id)) + } if HasWeaponEffect(id) { panic(fmt.Sprintf("Cannot add multiple effects for one item: %d, %#v", id, weaponEffect)) } diff --git a/sim/core/items/all_enchants.go b/sim/core/items/all_enchants.go index 3a92ee0618..e333b1f059 100644 --- a/sim/core/items/all_enchants.go +++ b/sim/core/items/all_enchants.go @@ -7,285 +7,285 @@ import ( var Enchants = []Enchant{ // Multi-slot - {ID: 38375, EffectID: 3329, Name: "Borean Armor Kit", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 12}, ItemType: proto.ItemType_ItemTypeHead, EnchantType: proto.EnchantType_EnchantTypeKit}, - {ID: 38376, EffectID: 3330, Name: "Heavy Borean Armor Kit", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 18}, ItemType: proto.ItemType_ItemTypeHead, EnchantType: proto.EnchantType_EnchantTypeKit}, + {EffectID: 3329, ItemID: 38375, Name: "Borean Armor Kit", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 12}, ItemType: proto.ItemType_ItemTypeHead, EnchantType: proto.EnchantType_EnchantTypeKit}, + {EffectID: 3330, ItemID: 38376, Name: "Heavy Borean Armor Kit", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 18}, ItemType: proto.ItemType_ItemTypeHead, EnchantType: proto.EnchantType_EnchantTypeKit}, // Head - {ID: 44069, EffectID: 3795, Name: "Arcanum of Triumph", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50, stats.Resilience: 20}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44075, EffectID: 3796, Name: "Arcanum of Dominance", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 29, stats.Resilience: 20}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44875, EffectID: 3842, Name: "Arcanum of the Savage Gladiator", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.Resilience: 25}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44137, EffectID: 3812, Name: "Arcanum of the Frosty Soul", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.FrostResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44138, EffectID: 3813, Name: "Arcanum of Toxic Warding", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.NatureResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44139, EffectID: 3814, Name: "Arcanum of the Fleeing Shadow", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.ShadowResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44140, EffectID: 3815, Name: "Arcanum of the Eclipsed Moon", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.ArcaneResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44141, EffectID: 3816, Name: "Arcanum of the Flame's Soul", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.FireResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44876, EffectID: 3819, Name: "Arcanum of Blissful Mending", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 30, stats.MP5: 10}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44877, EffectID: 3820, Name: "Arcanum of Burning Mysteries", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 30, stats.MeleeCrit: 20, stats.SpellCrit: 20}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44878, EffectID: 3818, Name: "Arcanum of the Stalwart Protector", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 37, stats.Defense: 20}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 44879, EffectID: 3817, Name: "Arcanum of Torment", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50, stats.MeleeCrit: 20, stats.SpellCrit: 20}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 67839, EffectID: 3878, Name: "Mind Amplification Dish", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 45}, ItemType: proto.ItemType_ItemTypeHead, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 3795, ItemID: 44069, Name: "Arcanum of Triumph", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50, stats.Resilience: 20}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3796, ItemID: 44075, Name: "Arcanum of Dominance", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 29, stats.Resilience: 20}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3842, ItemID: 44875, Name: "Arcanum of the Savage Gladiator", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.Resilience: 25}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3812, ItemID: 44137, Name: "Arcanum of the Frosty Soul", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.FrostResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3813, ItemID: 44138, Name: "Arcanum of Toxic Warding", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.NatureResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3814, ItemID: 44139, Name: "Arcanum of the Fleeing Shadow", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.ShadowResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3815, ItemID: 44140, Name: "Arcanum of the Eclipsed Moon", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.ArcaneResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3816, ItemID: 44141, Name: "Arcanum of the Flame's Soul", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 30, stats.FireResistance: 25}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3819, ItemID: 44876, Name: "Arcanum of Blissful Mending", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 30, stats.MP5: 10}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3820, ItemID: 44877, Name: "Arcanum of Burning Mysteries", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 30, stats.MeleeCrit: 20, stats.SpellCrit: 20}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3818, ItemID: 44878, Name: "Arcanum of the Stalwart Protector", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 37, stats.Defense: 20}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3817, ItemID: 44879, Name: "Arcanum of Torment", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50, stats.MeleeCrit: 20, stats.SpellCrit: 20}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3878, SpellID: 67839, Name: "Mind Amplification Dish", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 45}, ItemType: proto.ItemType_ItemTypeHead, RequiredProfession: proto.Profession_Engineering}, // Shoulder - {ID: 44067, EffectID: 3793, Name: "Inscription of Triumph", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 40, stats.RangedAttackPower: 40, stats.Resilience: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44068, EffectID: 3794, Name: "Inscription of Dominance", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 23, stats.Resilience: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44957, EffectID: 3852, Name: "Greater Inscription of the Gladiator", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 30, stats.Resilience: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44129, EffectID: 3806, Name: "Lesser Inscription of the Storm", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 18, stats.MeleeCrit: 10, stats.SpellCrit: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44130, EffectID: 3807, Name: "Lesser Inscription of the Crag", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 18, stats.MP5: 5}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44131, EffectID: 3875, Name: "Lesser Inscription of the Axe", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 30, stats.RangedAttackPower: 30, stats.MeleeCrit: 10, stats.SpellCrit: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44132, EffectID: 3876, Name: "Lesser Inscription of the Pinnacle", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Dodge: 15, stats.Defense: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44874, EffectID: 3810, Name: "Greater Inscription of the Storm", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.SpellPower: 24, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44872, EffectID: 3809, Name: "Greater Inscription of the Crag", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.SpellPower: 24, stats.MP5: 8}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44871, EffectID: 3808, Name: "Greater Inscription of the Axe", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.AttackPower: 40, stats.RangedAttackPower: 40, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 44873, EffectID: 3811, Name: "Greater Inscription of the Pinnacle", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Dodge: 20, stats.Defense: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 61120, EffectID: 3838, Name: "Master's Inscription of the Storm", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 70, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder, RequiredProfession: proto.Profession_Inscription}, - {ID: 61118, EffectID: 3836, Name: "Master's Inscription of the Crag", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 70, stats.MP5: 8}, ItemType: proto.ItemType_ItemTypeShoulder, RequiredProfession: proto.Profession_Inscription}, - {ID: 61117, EffectID: 3835, Name: "Master's Inscription of the Axe", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 120, stats.RangedAttackPower: 120, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder, RequiredProfession: proto.Profession_Inscription}, - {ID: 61119, EffectID: 3837, Name: "Master's Inscription of the Pinnacle", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Dodge: 60, stats.Defense: 15}, ItemType: proto.ItemType_ItemTypeShoulder, RequiredProfession: proto.Profession_Inscription}, + {EffectID: 3793, ItemID: 44067, Name: "Inscription of Triumph", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 40, stats.RangedAttackPower: 40, stats.Resilience: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3794, ItemID: 44068, Name: "Inscription of Dominance", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 23, stats.Resilience: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3852, ItemID: 44957, Name: "Greater Inscription of the Gladiator", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 30, stats.Resilience: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3806, ItemID: 44129, Name: "Lesser Inscription of the Storm", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 18, stats.MeleeCrit: 10, stats.SpellCrit: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3807, ItemID: 44130, Name: "Lesser Inscription of the Crag", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 18, stats.MP5: 5}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3875, ItemID: 44131, Name: "Lesser Inscription of the Axe", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 30, stats.RangedAttackPower: 30, stats.MeleeCrit: 10, stats.SpellCrit: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3876, ItemID: 44132, Name: "Lesser Inscription of the Pinnacle", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Dodge: 15, stats.Defense: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3810, ItemID: 44874, Name: "Greater Inscription of the Storm", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.SpellPower: 24, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3809, ItemID: 44872, Name: "Greater Inscription of the Crag", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.SpellPower: 24, stats.MP5: 8}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3808, ItemID: 44871, Name: "Greater Inscription of the Axe", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.AttackPower: 40, stats.RangedAttackPower: 40, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3811, ItemID: 44873, Name: "Greater Inscription of the Pinnacle", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Dodge: 20, stats.Defense: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 3838, SpellID: 61120, Name: "Master's Inscription of the Storm", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 70, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder, RequiredProfession: proto.Profession_Inscription}, + {EffectID: 3836, SpellID: 61118, Name: "Master's Inscription of the Crag", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 70, stats.MP5: 8}, ItemType: proto.ItemType_ItemTypeShoulder, RequiredProfession: proto.Profession_Inscription}, + {EffectID: 3835, SpellID: 61117, Name: "Master's Inscription of the Axe", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 120, stats.RangedAttackPower: 120, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder, RequiredProfession: proto.Profession_Inscription}, + {EffectID: 3837, SpellID: 61119, Name: "Master's Inscription of the Pinnacle", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Dodge: 60, stats.Defense: 15}, ItemType: proto.ItemType_ItemTypeShoulder, RequiredProfession: proto.Profession_Inscription}, // Back - {ID: 37330, EffectID: 1262, Name: "Superior Arcane Resistance", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.ArcaneResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 37331, EffectID: 1354, Name: "Superior Fire Resistance", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.FireResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 44483, EffectID: 3230, Name: "Superior Frost Resistance", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.FrostResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 44494, EffectID: 1400, Name: "Superior Nature Resistance", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.NatureResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 44590, EffectID: 1446, Name: "Superior Shadow Resistance", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.ShadowResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 37347, EffectID: 1951, Name: "Titanweave", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Defense: 16}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 37349, EffectID: 3256, Name: "Shadow Armor", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Agility: 10}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 44471, EffectID: 3294, Name: "Mighty Armor", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Armor: 225}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 44472, EffectID: 3831, Name: "Greater Speed", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.MeleeHaste: 23, stats.SpellHaste: 23}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 44488, EffectID: 3296, Name: "Wisdom", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Spirit: 10}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 44582, EffectID: 3243, Name: "Spell Piercing", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPenetration: 35}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 60609, EffectID: 3825, Name: "Speed", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MeleeHaste: 15, stats.SpellHaste: 15}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 44500, EffectID: 983, Name: "Superior Agility", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 16}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 60663, EffectID: 1099, Name: "Major Agility", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 22}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 55002, EffectID: 3605, Name: "Flexweave Underlay", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 23}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Engineering}, - {ID: 55642, EffectID: 3722, Name: "Lightweave Embroidery", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Tailoring}, - {ID: 55769, EffectID: 3728, Name: "Darkglow Embroidery", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Tailoring}, - {ID: 55777, EffectID: 3730, Name: "Swordguard Embroidery", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Tailoring}, - {ID: 63765, EffectID: 3859, Name: "Springy Arachnoweave", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 27}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 1262, ItemID: 37330, Name: "Superior Arcane Resistance", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.ArcaneResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 1354, ItemID: 37331, Name: "Superior Fire Resistance", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.FireResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 3230, SpellID: 44483, Name: "Superior Frost Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.FrostResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 1400, SpellID: 44494, Name: "Superior Nature Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.NatureResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 1446, SpellID: 44590, Name: "Superior Shadow Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.ShadowResistance: 20}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 1951, ItemID: 37347, Name: "Titanweave", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Defense: 16}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 3256, ItemID: 37349, Name: "Shadow Armor", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Agility: 10}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 3294, ItemID: 44471, Name: "Mighty Armor", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Armor: 225}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 3831, ItemID: 44472, Name: "Greater Speed", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.MeleeHaste: 23, stats.SpellHaste: 23}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 3296, ItemID: 44488, Name: "Wisdom", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Spirit: 10}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 3243, SpellID: 44582, Name: "Spell Piercing", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPenetration: 35}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 3825, SpellID: 60609, Name: "Speed", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MeleeHaste: 15, stats.SpellHaste: 15}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 983, SpellID: 44500, Name: "Superior Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 16}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 1099, SpellID: 60663, Name: "Major Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 22}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 3605, SpellID: 55002, Name: "Flexweave Underlay", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 23}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 3722, SpellID: 55642, Name: "Lightweave Embroidery", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Tailoring}, + {EffectID: 3728, SpellID: 55769, Name: "Darkglow Embroidery", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Tailoring}, + {EffectID: 3730, SpellID: 55777, Name: "Swordguard Embroidery", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Tailoring}, + {EffectID: 3859, SpellID: 63765, Name: "Springy Arachnoweave", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 27}, ItemType: proto.ItemType_ItemTypeBack, RequiredProfession: proto.Profession_Engineering}, // Chest - {ID: 37340, EffectID: 3245, Name: "Exceptional Resilience", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Resilience: 20}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 44623, EffectID: 3252, Name: "Super Stats", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 8, stats.Strength: 8, stats.Agility: 8, stats.Intellect: 8, stats.Spirit: 8}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 44489, EffectID: 3832, Name: "Powerful Stats", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 10, stats.Strength: 10, stats.Agility: 10, stats.Intellect: 10, stats.Spirit: 10}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 27958, EffectID: 3233, Name: "Exceptional Mana", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Mana: 250}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 44492, EffectID: 3236, Name: "Mighty Health", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Health: 200}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 47900, EffectID: 3297, Name: "Super Health", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Health: 275}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 44509, EffectID: 2381, Name: "Greater Mana Restoration", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MP5: 10}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 47766, EffectID: 1953, Name: "Greater Defense", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Defense: 22}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 3245, ItemID: 37340, Name: "Exceptional Resilience", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Resilience: 20}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 3252, SpellID: 44623, Name: "Super Stats", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 8, stats.Strength: 8, stats.Agility: 8, stats.Intellect: 8, stats.Spirit: 8}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 3832, ItemID: 44489, Name: "Powerful Stats", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 10, stats.Strength: 10, stats.Agility: 10, stats.Intellect: 10, stats.Spirit: 10}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 3233, SpellID: 27958, Name: "Exceptional Mana", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Mana: 250}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 3236, SpellID: 44492, Name: "Mighty Health", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Health: 200}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 3297, SpellID: 47900, Name: "Super Health", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Health: 275}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 2381, SpellID: 44509, Name: "Greater Mana Restoration", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MP5: 10}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 1953, SpellID: 47766, Name: "Greater Defense", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Defense: 22}, ItemType: proto.ItemType_ItemTypeChest}, // Wrist - {ID: 44484, EffectID: 3845, Name: "Greater Assault", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 44498, EffectID: 2332, Name: "Superior Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 30}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 44944, EffectID: 3850, Name: "Major Stamina", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 40}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 44555, EffectID: 1119, Name: "Exceptional Intellect", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Intellect: 16}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 44593, EffectID: 1147, Name: "Major Spirit", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 18}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 44598, EffectID: 3231, Name: "Expertise", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Expertise: 15}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 44616, EffectID: 2661, Name: "Greater Stats", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 6, stats.Strength: 6, stats.Agility: 6, stats.Intellect: 6, stats.Spirit: 6}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 44635, EffectID: 2326, Name: "Greater Spellpower", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 23}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 60616, EffectID: 1600, Name: "Striking", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 38, stats.RangedAttackPower: 38}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 57683, EffectID: 3756, Name: "Fur Lining - Attack Power", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 130, stats.RangedAttackPower: 130}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 57690, EffectID: 3757, Name: "Fur Lining - Stamina", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 102}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 57691, EffectID: 3758, Name: "Fur Lining - Spell Power", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 76}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 57692, EffectID: 3759, Name: "Fur Lining - Fire Resist", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.FireResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 57694, EffectID: 3760, Name: "Fur Lining - Frost Resist", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.FrostResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 57696, EffectID: 3761, Name: "Fur Lining - Shadow Resist", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.ShadowResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 57699, EffectID: 3762, Name: "Fur Lining - Nature Resist", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.NatureResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 57701, EffectID: 3763, Name: "Fur Lining - Arcane Resist", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.ArcaneResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3845, ItemID: 44484, Name: "Greater Assault", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 2332, ItemID: 44498, Name: "Superior Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 30}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 3850, ItemID: 44944, Name: "Major Stamina", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 40}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 1119, SpellID: 44555, Name: "Exceptional Intellect", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Intellect: 16}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 1147, SpellID: 44593, Name: "Major Spirit", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 18}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 3231, SpellID: 44598, Name: "Expertise", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Expertise: 15}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 2661, SpellID: 44616, Name: "Greater Stats", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 6, stats.Strength: 6, stats.Agility: 6, stats.Intellect: 6, stats.Spirit: 6}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 2326, SpellID: 44635, Name: "Greater Spellpower", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 23}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 1600, SpellID: 60616, Name: "Striking", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 38, stats.RangedAttackPower: 38}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 3756, SpellID: 57683, Name: "Fur Lining - Attack Power", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 130, stats.RangedAttackPower: 130}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3757, SpellID: 57690, Name: "Fur Lining - Stamina", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 102}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3758, SpellID: 57691, Name: "Fur Lining - Spell Power", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 76}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3759, SpellID: 57692, Name: "Fur Lining - Fire Resist", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.FireResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3760, SpellID: 57694, Name: "Fur Lining - Frost Resist", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.FrostResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3761, SpellID: 57696, Name: "Fur Lining - Shadow Resist", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.ShadowResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3762, SpellID: 57699, Name: "Fur Lining - Nature Resist", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.NatureResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3763, SpellID: 57701, Name: "Fur Lining - Arcane Resist", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.ArcaneResistance: 70}, ItemType: proto.ItemType_ItemTypeWrist, RequiredProfession: proto.Profession_Leatherworking}, // Hands - {ID: 44485, EffectID: 3253, Name: "Armsman", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Parry: 10}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 60668, EffectID: 1603, Name: "Crusher", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 44, stats.RangedAttackPower: 44}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 44592, EffectID: 3246, Name: "Exceptional Spellpower", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 28}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 44484, EffectID: 3231, Name: "Expertise", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Expertise: 15}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 44506, EffectID: 3238, Name: "Gatherer", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 44513, EffectID: 3829, Name: "Greater Assult", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 35, stats.RangedAttackPower: 35}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 44529, EffectID: 3222, Name: "Major Agility", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 20}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 44488, EffectID: 3234, Name: "Precision", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MeleeHit: 20, stats.SpellHit: 20}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 54998, EffectID: 3603, Name: "Hand-Mounted Pyro Rocket", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeHands, RequiredProfession: proto.Profession_Engineering}, - {ID: 54999, EffectID: 3604, Name: "Hyperspeed Accelerators", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeHands, RequiredProfession: proto.Profession_Engineering}, - {ID: 63770, EffectID: 3860, Name: "Reticulated Armor Webbing", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Armor: 885}, ItemType: proto.ItemType_ItemTypeHands, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 3253, ItemID: 44485, Name: "Armsman", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Parry: 10}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 1603, SpellID: 60668, Name: "Crusher", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 44, stats.RangedAttackPower: 44}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 3246, SpellID: 44592, Name: "Exceptional Spellpower", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 28}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 3231, SpellID: 44484, Name: "Expertise", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Expertise: 15}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 3238, SpellID: 44506, Name: "Gatherer", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 3829, SpellID: 44513, Name: "Greater Assult", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 35, stats.RangedAttackPower: 35}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 3222, SpellID: 44529, Name: "Major Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 20}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 3234, SpellID: 44488, Name: "Precision", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MeleeHit: 20, stats.SpellHit: 20}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 3603, SpellID: 54998, Name: "Hand-Mounted Pyro Rocket", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeHands, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 3604, SpellID: 54999, Name: "Hyperspeed Accelerators", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeHands, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 3860, SpellID: 63770, Name: "Reticulated Armor Webbing", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Armor: 885}, ItemType: proto.ItemType_ItemTypeHands, RequiredProfession: proto.Profession_Engineering}, // Waist - {ID: 54736, EffectID: 3599, Name: "Personal Electromagnetic Pulse Generator", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWaist, RequiredProfession: proto.Profession_Engineering}, - {ID: 54793, EffectID: 3601, Name: "Frag Belt", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWaist, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 3599, SpellID: 54736, Name: "Personal Electromagnetic Pulse Generator", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWaist, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 3601, SpellID: 54793, Name: "Frag Belt", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWaist, RequiredProfession: proto.Profession_Engineering}, // Legs - {ID: 38371, EffectID: 3325, Name: "Jormungar Leg Armor", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 45, stats.Agility: 15}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 38372, EffectID: 3326, Name: "Nerubian Leg Armor", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 55, stats.RangedAttackPower: 55, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 38373, EffectID: 3822, Name: "Frosthide Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 55, stats.Agility: 22}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 38374, EffectID: 3823, Name: "Icescale Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.AttackPower: 75, stats.RangedAttackPower: 75, stats.MeleeCrit: 22, stats.SpellCrit: 22}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 44963, EffectID: 3853, Name: "Earthen Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 28, stats.Resilience: 40}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 41601, EffectID: 3718, Name: "Shining Spellthread", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Spirit: 12, stats.SpellPower: 35}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 41602, EffectID: 3719, Name: "Brilliant Spellthread", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Spirit: 20, stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 41603, EffectID: 3720, Name: "Azure Spellthread", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 20, stats.SpellPower: 35}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 41604, EffectID: 3721, Name: "Sapphire Spellthread", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 30, stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 60583, EffectID: 3327, Name: "Jormungar Leg Reinforcements", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 55, stats.Agility: 22}, ItemType: proto.ItemType_ItemTypeLegs, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 60584, EffectID: 3328, Name: "Nerubian Leg Reinforcements", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 75, stats.RangedAttackPower: 75, stats.MeleeCrit: 22, stats.SpellCrit: 22}, ItemType: proto.ItemType_ItemTypeLegs, RequiredProfession: proto.Profession_Leatherworking}, - {ID: 56034, EffectID: 3873, Name: "Master's Spellthread", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 30, stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeLegs, RequiredProfession: proto.Profession_Tailoring}, - {ID: 56039, EffectID: 3872, Name: "Sanctified Spellthread", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 20, stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeLegs, RequiredProfession: proto.Profession_Tailoring}, + {EffectID: 3325, ItemID: 38371, Name: "Jormungar Leg Armor", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 45, stats.Agility: 15}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3326, ItemID: 38372, Name: "Nerubian Leg Armor", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 55, stats.RangedAttackPower: 55, stats.MeleeCrit: 15, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3822, ItemID: 38373, Name: "Frosthide Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 55, stats.Agility: 22}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3823, ItemID: 38374, Name: "Icescale Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.AttackPower: 75, stats.RangedAttackPower: 75, stats.MeleeCrit: 22, stats.SpellCrit: 22}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3853, ItemID: 44963, Name: "Earthen Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 28, stats.Resilience: 40}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3718, ItemID: 41601, Name: "Shining Spellthread", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Spirit: 12, stats.SpellPower: 35}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3719, ItemID: 41602, Name: "Brilliant Spellthread", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Spirit: 20, stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3720, ItemID: 41603, Name: "Azure Spellthread", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 20, stats.SpellPower: 35}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3721, ItemID: 41604, Name: "Sapphire Spellthread", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 30, stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3327, SpellID: 60583, Name: "Jormungar Leg Reinforcements", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 55, stats.Agility: 22}, ItemType: proto.ItemType_ItemTypeLegs, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3328, SpellID: 60584, Name: "Nerubian Leg Reinforcements", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 75, stats.RangedAttackPower: 75, stats.MeleeCrit: 22, stats.SpellCrit: 22}, ItemType: proto.ItemType_ItemTypeLegs, RequiredProfession: proto.Profession_Leatherworking}, + {EffectID: 3873, SpellID: 56034, Name: "Master's Spellthread", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 30, stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeLegs, RequiredProfession: proto.Profession_Tailoring}, + {EffectID: 3872, SpellID: 56039, Name: "Sanctified Spellthread", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 20, stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeLegs, RequiredProfession: proto.Profession_Tailoring}, // Feet - {ID: 44490, EffectID: 1597, Name: "Greater Assault", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 32, stats.RangedAttackPower: 32}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 44491, EffectID: 3232, Name: "Tuskarr's Vitality", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 15}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 60606, EffectID: 3824, Name: "Assault", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 24, stats.RangedAttackPower: 24}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 44528, EffectID: 1075, Name: "Greater Fortitude", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 22}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 44508, EffectID: 1147, Name: "Greater Spirit", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 18}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 44584, EffectID: 3244, Name: "Greater Vitality", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MP5: 7}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 60623, EffectID: 3826, Name: "Icewalker", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MeleeHit: 12, stats.SpellHit: 12, stats.MeleeCrit: 12, stats.SpellCrit: 12}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 44589, EffectID: 983, Name: "Superior Agility", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 16}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 55016, EffectID: 3606, Name: "Nitro Boosts", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MeleeCrit: 24, stats.SpellCrit: 24}, ItemType: proto.ItemType_ItemTypeFeet, RequiredProfession: proto.Profession_Engineering}, + {EffectID: 1597, ItemID: 44490, Name: "Greater Assault", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 32, stats.RangedAttackPower: 32}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 3232, ItemID: 44491, Name: "Tuskarr's Vitality", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 15}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 3824, SpellID: 60606, Name: "Assault", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 24, stats.RangedAttackPower: 24}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 1075, SpellID: 44528, Name: "Greater Fortitude", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 22}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 1147, SpellID: 44508, Name: "Greater Spirit", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 18}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 3244, SpellID: 44584, Name: "Greater Vitality", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MP5: 7}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 3826, SpellID: 60623, Name: "Icewalker", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MeleeHit: 12, stats.SpellHit: 12, stats.MeleeCrit: 12, stats.SpellCrit: 12}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 983, SpellID: 44589, Name: "Superior Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 16}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 3606, SpellID: 55016, Name: "Nitro Boosts", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MeleeCrit: 24, stats.SpellCrit: 24}, ItemType: proto.ItemType_ItemTypeFeet, RequiredProfession: proto.Profession_Engineering}, // Weapon - {ID: 44633, EffectID: 1103, Name: "Exceptional Agility", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 26}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 44510, EffectID: 3844, Name: "Exceptional Spirit", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 45}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 37339, EffectID: 3251, Name: "Giant Slayer", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 37344, EffectID: 3239, Name: "Icebreaker", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 41976, EffectID: 3731, Name: "Titanium Weapon Chain", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.MeleeHit: 28, stats.SpellHit: 28}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 44486, EffectID: 3833, Name: "Superior Potency", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 65, stats.RangedAttackPower: 65}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 44487, EffectID: 3834, Name: "Mighty Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 63}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 44492, EffectID: 3789, Name: "Berserking", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 44494, EffectID: 3241, Name: "Lifeward", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 44495, EffectID: 3790, Name: "Black Magic", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 44496, EffectID: 3788, Name: "Accuracy", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.MeleeHit: 25, stats.SpellHit: 25, stats.MeleeCrit: 25, stats.SpellCrit: 25}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 44629, EffectID: 3830, Name: "Exceptional Spellpower", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 60621, EffectID: 1606, Name: "Greater Potency", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 53343, EffectID: 3370, Name: "Rune of Razorice", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, - {ID: 53341, EffectID: 3369, Name: "Rune of Cinderglacier", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, - {ID: 53331, EffectID: 3366, Name: "Rune of Lichbane", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, - {ID: 54447, EffectID: 3595, Name: "Rune of Spellbreaking", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, - {ID: 54446, EffectID: 3594, Name: "Rune of Swordbreaking", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, - {ID: 53344, EffectID: 3368, Name: "Rune of the Fallen Crusader", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, - {ID: 70164, EffectID: 3883, Name: "Rune of the Nerubian Carapace", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 1103, SpellID: 44633, Name: "Exceptional Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 26}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3844, SpellID: 44510, Name: "Exceptional Spirit", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 45}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3251, ItemID: 37339, Name: "Giant Slayer", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3239, ItemID: 37344, Name: "Icebreaker", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3731, ItemID: 41976, Name: "Titanium Weapon Chain", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.MeleeHit: 28, stats.SpellHit: 28}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3833, ItemID: 44486, Name: "Superior Potency", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 65, stats.RangedAttackPower: 65}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3834, ItemID: 44487, Name: "Mighty Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 63}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3789, ItemID: 44492, Name: "Berserking", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3241, ItemID: 44494, Name: "Lifeward", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3790, ItemID: 44495, Name: "Black Magic", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3788, ItemID: 44496, Name: "Accuracy", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.MeleeHit: 25, stats.SpellHit: 25, stats.MeleeCrit: 25, stats.SpellCrit: 25}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3830, SpellID: 44629, Name: "Exceptional Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 50}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 1606, SpellID: 60621, Name: "Greater Potency", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3370, SpellID: 53343, Name: "Rune of Razorice", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3369, SpellID: 53341, Name: "Rune of Cinderglacier", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3366, SpellID: 53331, Name: "Rune of Lichbane", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3595, SpellID: 54447, Name: "Rune of Spellbreaking", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3594, SpellID: 54446, Name: "Rune of Swordbreaking", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3368, SpellID: 53344, Name: "Rune of the Fallen Crusader", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3883, SpellID: 70164, Name: "Rune of the Nerubian Carapace", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, // 2H Weapon - {ID: 44473, EffectID: 3247, Name: "Scourgebane", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, - {ID: 44483, EffectID: 3827, Name: "Massacre", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 110, stats.RangedAttackPower: 110}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, - {ID: 44630, EffectID: 3828, Name: "Greater Savagery", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 85, stats.RangedAttackPower: 85}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, - {ID: 45059, EffectID: 3854, Name: "Greater Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 81}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, - {ID: 53342, EffectID: 3367, Name: "Rune of Spellshattering", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, - {ID: 53323, EffectID: 3365, Name: "Rune of Swordshattering", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, - {ID: 62158, EffectID: 3847, Name: "Rune of the Stoneskin Gargoyle", IsSpellID: true, Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3247, ItemID: 44473, Name: "Scourgebane", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, + {EffectID: 3827, ItemID: 44483, Name: "Massacre", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 110, stats.RangedAttackPower: 110}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, + {EffectID: 3828, SpellID: 44630, Name: "Greater Savagery", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 85, stats.RangedAttackPower: 85}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, + {EffectID: 3854, ItemID: 45059, Name: "Greater Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 81}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, + {EffectID: 3367, SpellID: 53342, Name: "Rune of Spellshattering", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3365, SpellID: 53323, Name: "Rune of Swordshattering", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, + {EffectID: 3847, SpellID: 62158, Name: "Rune of the Stoneskin Gargoyle", Phase: 1, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, ClassAllowlist: []proto.Class{proto.Class_ClassDeathknight}}, // Shield - {ID: 44489, EffectID: 1952, Name: "Defense", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Defense: 20}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, - {ID: 60653, EffectID: 1128, Name: "Greater Intellect", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Intellect: 25}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, - {ID: 42500, EffectID: 3748, Name: "Titanium Shield Spike", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, - {ID: 44936, EffectID: 3849, Name: "Titanium Plating", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.BlockValue: 81}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, + {EffectID: 1952, SpellID: 44489, Name: "Defense", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Defense: 20}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, + {EffectID: 1128, SpellID: 60653, Name: "Greater Intellect", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Intellect: 25}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, + {EffectID: 3748, ItemID: 42500, Name: "Titanium Shield Spike", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, + {EffectID: 3849, ItemID: 44936, Name: "Titanium Plating", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.BlockValue: 81}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, // Ring - {ID: 44645, EffectID: 3839, Name: "Assault", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 40, stats.RangedAttackPower: 40}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, - {ID: 44636, EffectID: 3840, Name: "Greater Spellpower", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 23}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, - {ID: 59636, EffectID: 3791, Name: "Stamina", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 30}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, + {EffectID: 3839, SpellID: 44645, Name: "Assault", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.AttackPower: 40, stats.RangedAttackPower: 40}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, + {EffectID: 3840, SpellID: 44636, Name: "Greater Spellpower", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 23}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, + {EffectID: 3791, SpellID: 59636, Name: "Stamina", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 30}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, // Ranged - {ID: 41146, EffectID: 3607, Name: "Sun Scope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, - {ID: 41167, EffectID: 3608, Name: "Heartseeker Scope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, - {ID: 44739, EffectID: 3843, Name: "Diamond-cut Refractor Scope", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, + {EffectID: 3607, ItemID: 41146, Name: "Sun Scope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, + {EffectID: 3608, ItemID: 41167, Name: "Heartseeker Scope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, + {EffectID: 3843, ItemID: 44739, Name: "Diamond-cut Refractor Scope", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, ///////////////////////////// // TBC ///////////////////////////// // Head - {ID: 29186, EffectID: 2999, Name: "Arcanum of the Defender", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Defense: 16, stats.Dodge: 17}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 29191, EffectID: 3002, Name: "Arcanum of Power", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPower: 22, stats.SpellHit: 14}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 29192, EffectID: 3003, Name: "Arcanum of Ferocity", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 34, stats.RangedAttackPower: 34, stats.MeleeHit: 16, stats.SpellHit: 16}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 30846, EffectID: 3096, Name: "Arcanum of the Outcast", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Strength: 17, stats.Intellect: 16}, ItemType: proto.ItemType_ItemTypeHead}, - {ID: 29193, EffectID: 3004, Name: "Arcanum of the Gladiator", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 18, stats.Resilience: 20}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 2999, ItemID: 29186, Name: "Arcanum of the Defender", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Defense: 16, stats.Dodge: 17}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3002, ItemID: 29191, Name: "Arcanum of Power", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPower: 22, stats.SpellHit: 14}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3003, ItemID: 29192, Name: "Arcanum of Ferocity", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 34, stats.RangedAttackPower: 34, stats.MeleeHit: 16, stats.SpellHit: 16}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3096, ItemID: 30846, Name: "Arcanum of the Outcast", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Strength: 17, stats.Intellect: 16}, ItemType: proto.ItemType_ItemTypeHead}, + {EffectID: 3004, ItemID: 29193, Name: "Arcanum of the Gladiator", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 18, stats.Resilience: 20}, ItemType: proto.ItemType_ItemTypeHead}, // ZG Head Enchants - {ID: 19782, EffectID: 2583, Name: "Presence of Might", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 10, stats.Defense: 10, stats.BlockValue: 15}, ItemType: proto.ItemType_ItemTypeHead, ClassAllowlist: []proto.Class{proto.Class_ClassWarrior}}, + {EffectID: 2583, ItemID: 19782, Name: "Presence of Might", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 10, stats.Defense: 10, stats.BlockValue: 15}, ItemType: proto.ItemType_ItemTypeHead, ClassAllowlist: []proto.Class{proto.Class_ClassWarrior}}, // Shoulder - {ID: 28886, EffectID: 2982, Name: "Greater Inscription of Discipline", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 18, stats.SpellCrit: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 28888, EffectID: 2986, Name: "Greater Inscription of Vengeance", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 30, stats.RangedAttackPower: 30, stats.MeleeCrit: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 28889, EffectID: 2978, Name: "Greater Inscription of Warding", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Defense: 10, stats.Dodge: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 28909, EffectID: 2995, Name: "Greater Inscription of the Orb", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 12, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 28910, EffectID: 2997, Name: "Greater Inscription of the Blade", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 20, stats.RangedAttackPower: 20, stats.MeleeCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 28911, EffectID: 2991, Name: "Greater Inscription of the Knight", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Defense: 15, stats.Dodge: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 20076, EffectID: 2605, Name: "Zandalar Signet of Mojo", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 18}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 23545, EffectID: 2721, Name: "Power of the Scourge", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.SpellPower: 15, stats.SpellCrit: 14}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 23548, EffectID: 2717, Name: "Might of the Scourge", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.AttackPower: 26, stats.RangedAttackPower: 26, stats.MeleeCrit: 14}, ItemType: proto.ItemType_ItemTypeShoulder}, - {ID: 23549, EffectID: 2716, Name: "Fortitude of the Scourge", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 16, stats.Armor: 100}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2982, ItemID: 28886, Name: "Greater Inscription of Discipline", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 18, stats.SpellCrit: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2986, ItemID: 28888, Name: "Greater Inscription of Vengeance", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 30, stats.RangedAttackPower: 30, stats.MeleeCrit: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2978, ItemID: 28889, Name: "Greater Inscription of Warding", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Defense: 10, stats.Dodge: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2995, ItemID: 28909, Name: "Greater Inscription of the Orb", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 12, stats.SpellCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2997, ItemID: 28910, Name: "Greater Inscription of the Blade", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 20, stats.RangedAttackPower: 20, stats.MeleeCrit: 15}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2991, ItemID: 28911, Name: "Greater Inscription of the Knight", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Defense: 15, stats.Dodge: 10}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2605, ItemID: 20076, Name: "Zandalar Signet of Mojo", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 18}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2721, ItemID: 23545, Name: "Power of the Scourge", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.SpellPower: 15, stats.SpellCrit: 14}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2717, ItemID: 23548, Name: "Might of the Scourge", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.AttackPower: 26, stats.RangedAttackPower: 26, stats.MeleeCrit: 14}, ItemType: proto.ItemType_ItemTypeShoulder}, + {EffectID: 2716, ItemID: 23549, Name: "Fortitude of the Scourge", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 16, stats.Armor: 100}, ItemType: proto.ItemType_ItemTypeShoulder}, // Back - {ID: 33148, EffectID: 2622, Name: "Enchant Cloak - Dodge", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Dodge: 12}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 33150, EffectID: 2621, Name: "Enchant Cloak - Subtlety", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 11206, EffectID: 849, Name: "Enchant Cloak - Lesser Agility", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Agility: 3}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 34004, EffectID: 368, Name: "Enchant Cloak - Greater Agility", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 12}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 28274, EffectID: 2938, Name: "Enchant Cloak - Spell Penetration", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPenetration: 20}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 28277, EffectID: 1441, Name: "Enchant Cloak - Greater Shadow Resistance", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.ShadowResistance: 15}, ItemType: proto.ItemType_ItemTypeBack}, - {ID: 35756, EffectID: 2648, Name: "Enchant Cloak - Steelweave", Phase: 5, Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Defense: 12}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 2622, ItemID: 33148, Name: "Enchant Cloak - Dodge", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Dodge: 12}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 2621, ItemID: 33150, Name: "Enchant Cloak - Subtlety", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 849, ItemID: 11206, Name: "Enchant Cloak - Lesser Agility", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Agility: 3}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 368, SpellID: 34004, Name: "Enchant Cloak - Greater Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 12}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 2938, ItemID: 28274, Name: "Enchant Cloak - Spell Penetration", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPenetration: 20}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 1441, ItemID: 28277, Name: "Enchant Cloak - Greater Shadow Resistance", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.ShadowResistance: 15}, ItemType: proto.ItemType_ItemTypeBack}, + {EffectID: 2648, ItemID: 35756, Name: "Enchant Cloak - Steelweave", Phase: 5, Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Defense: 12}, ItemType: proto.ItemType_ItemTypeBack}, // Chest - {ID: 27957, EffectID: 2659, Name: "Chest - Exceptional Health", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Health: 150}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 22546, EffectID: 2660, Name: "Chest - Exceptional Mana", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Mana: 150}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 24003, EffectID: 2661, Name: "Chest - Exceptional Stats", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 6, stats.Intellect: 6, stats.Spirit: 6, stats.Strength: 6, stats.Agility: 6}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 28270, EffectID: 2933, Name: "Chest - Major Resilience", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Resilience: 15}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 33990, EffectID: 1144, Name: "Chest - Major Spirit", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 15}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 33991, EffectID: 3150, Name: "Chest - Restore Mana Prime", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MP5: 6}, ItemType: proto.ItemType_ItemTypeChest}, - {ID: 35500, EffectID: 1950, Name: "Chest - Defense", Phase: 5, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Defense: 15}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 2659, SpellID: 27957, Name: "Chest - Exceptional Health", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Health: 150}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 2660, ItemID: 22546, Name: "Chest - Exceptional Mana", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Mana: 150}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 2661, ItemID: 24003, Name: "Chest - Exceptional Stats", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 6, stats.Intellect: 6, stats.Spirit: 6, stats.Strength: 6, stats.Agility: 6}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 2933, ItemID: 28270, Name: "Chest - Major Resilience", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Resilience: 15}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 1144, SpellID: 33990, Name: "Chest - Major Spirit", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Spirit: 15}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 3150, SpellID: 33991, Name: "Chest - Restore Mana Prime", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.MP5: 6}, ItemType: proto.ItemType_ItemTypeChest}, + {EffectID: 1950, ItemID: 35500, Name: "Chest - Defense", Phase: 5, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Defense: 15}, ItemType: proto.ItemType_ItemTypeChest}, // Wrist - {ID: 22533, EffectID: 2649, Name: "Bracer - Fortitude", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 12}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 22534, EffectID: 2650, Name: "Bracer - Spellpower", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPower: 15}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 34001, EffectID: 369, Name: "Bracer - Major Intellect", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Intellect: 12}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 27899, EffectID: 2647, Name: "Bracer - Brawn", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Strength: 12}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 34002, EffectID: 1593, Name: "Bracer - Assault", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 24, stats.RangedAttackPower: 24}, ItemType: proto.ItemType_ItemTypeWrist}, - {ID: 27905, EffectID: 1891, Name: "Bracer - Stats", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 4, stats.Intellect: 4, stats.Spirit: 4, stats.Strength: 4, stats.Agility: 4}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 2649, ItemID: 22533, Name: "Bracer - Fortitude", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 12}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 2650, ItemID: 22534, Name: "Bracer - Spellpower", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPower: 15}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 369, SpellID: 34001, Name: "Bracer - Major Intellect", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Intellect: 12}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 2647, SpellID: 27899, Name: "Bracer - Brawn", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Strength: 12}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 1593, SpellID: 34002, Name: "Bracer - Assault", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 24, stats.RangedAttackPower: 24}, ItemType: proto.ItemType_ItemTypeWrist}, + {EffectID: 1891, SpellID: 27905, Name: "Bracer - Stats", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 4, stats.Intellect: 4, stats.Spirit: 4, stats.Strength: 4, stats.Agility: 4}, ItemType: proto.ItemType_ItemTypeWrist}, // Hands - {ID: 28271, EffectID: 2935, Name: "Gloves - Spell Strike", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellHit: 15}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 28272, EffectID: 2937, Name: "Gloves - Major Spellpower", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPower: 20}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 33995, EffectID: 684, Name: "Gloves - Major Strength", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Strength: 15}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 33152, EffectID: 2564, Name: "Gloves - Major Agility", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Agility: 15}, ItemType: proto.ItemType_ItemTypeHands}, - {ID: 33153, EffectID: 2613, Name: "Gloves - Threat", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 2935, ItemID: 28271, Name: "Gloves - Spell Strike", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellHit: 15}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 2937, ItemID: 28272, Name: "Gloves - Major Spellpower", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPower: 20}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 684, SpellID: 33995, Name: "Gloves - Major Strength", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Strength: 15}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 2564, ItemID: 33152, Name: "Gloves - Major Agility", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Agility: 15}, ItemType: proto.ItemType_ItemTypeHands}, + {EffectID: 2613, ItemID: 33153, Name: "Gloves - Threat", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeHands}, // Legs - {ID: 24274, EffectID: 2748, Name: "Runic Spellthread", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.SpellPower: 35, stats.Stamina: 20}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 24273, EffectID: 2747, Name: "Mystic Spellthread", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 25, stats.Stamina: 15}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 29533, EffectID: 3010, Name: "Cobrahide Leg Armor", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 40, stats.RangedAttackPower: 40, stats.MeleeCrit: 10}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 29535, EffectID: 3012, Name: "Nethercobra Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50, stats.MeleeCrit: 12}, ItemType: proto.ItemType_ItemTypeLegs}, - {ID: 29536, EffectID: 3013, Name: "Nethercleft Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 40, stats.Agility: 12}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 2748, ItemID: 24274, Name: "Runic Spellthread", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.SpellPower: 35, stats.Stamina: 20}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 2747, ItemID: 24273, Name: "Mystic Spellthread", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 25, stats.Stamina: 15}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3010, ItemID: 29533, Name: "Cobrahide Leg Armor", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.AttackPower: 40, stats.RangedAttackPower: 40, stats.MeleeCrit: 10}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3012, ItemID: 29535, Name: "Nethercobra Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.AttackPower: 50, stats.RangedAttackPower: 50, stats.MeleeCrit: 12}, ItemType: proto.ItemType_ItemTypeLegs}, + {EffectID: 3013, ItemID: 29536, Name: "Nethercleft Leg Armor", Quality: proto.ItemQuality_ItemQualityEpic, Bonus: stats.Stats{stats.Stamina: 40, stats.Agility: 12}, ItemType: proto.ItemType_ItemTypeLegs}, // Feet - {ID: 16220, EffectID: 851, Name: "Enchant Boots - Spirit", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Spirit: 5}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 35297, EffectID: 2940, Name: "Enchant Boots - Boar's Speed", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 9}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 35298, EffectID: 2656, Name: "Enchant Boots - Vitality", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.MP5: 4}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 22543, EffectID: 2649, Name: "Enchant Boots - Fortitude", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 12}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 22544, EffectID: 2657, Name: "Enchant Boots - Dexterity", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Agility: 12}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 28279, EffectID: 2939, Name: "Enchant Boots - Cat's Swiftness", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Agility: 6}, ItemType: proto.ItemType_ItemTypeFeet}, - {ID: 22545, EffectID: 2658, Name: "Enchant Boots - Surefooted", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.MeleeHit: 10}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 851, ItemID: 16220, Name: "Enchant Boots - Spirit", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Spirit: 5}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 2940, ItemID: 35297, Name: "Enchant Boots - Boar's Speed", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Stamina: 9}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 2656, ItemID: 35298, Name: "Enchant Boots - Vitality", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.MP5: 4}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 2649, ItemID: 22543, Name: "Enchant Boots - Fortitude", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Stamina: 12}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 2657, ItemID: 22544, Name: "Enchant Boots - Dexterity", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Agility: 12}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 2939, ItemID: 28279, Name: "Enchant Boots - Cat's Swiftness", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.Agility: 6}, ItemType: proto.ItemType_ItemTypeFeet}, + {EffectID: 2658, ItemID: 22545, Name: "Enchant Boots - Surefooted", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.MeleeHit: 10}, ItemType: proto.ItemType_ItemTypeFeet}, // Weapon - {ID: 16250, EffectID: 1897, Name: "Superior Striking", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 22552, EffectID: 963, Name: "Major Striking", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 16252, EffectID: 1900, Name: "Crusader", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 22551, EffectID: 2666, Name: "Major Intellect", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Intellect: 30}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 22554, EffectID: 2667, Name: "Savagery", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 70, stats.RangedAttackPower: 70}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, - {ID: 22555, EffectID: 2669, Name: "Major Spellpower", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPower: 40}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 22560, EffectID: 2671, Name: "Sunfire", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 22561, EffectID: 2672, Name: "Soulfrost", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 22559, EffectID: 2673, Name: "Mongoose", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 19445, EffectID: 2564, Name: "Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 15}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 33165, EffectID: 3222, Name: "Greater Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 20}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 22556, EffectID: 2670, Name: "2H Weapon - Major Agility", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Agility: 35}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, - {ID: 33307, EffectID: 3225, Name: "Executioner", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 35498, EffectID: 3273, Name: "Deathfrost", Phase: 5, Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, - {ID: 45060, EffectID: 3855, Name: "Staff - Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 69}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, + {EffectID: 1897, ItemID: 16250, Name: "Superior Striking", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 963, ItemID: 22552, Name: "Major Striking", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 1900, ItemID: 16252, Name: "Crusader", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 2666, ItemID: 22551, Name: "Major Intellect", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Intellect: 30}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 2667, ItemID: 22554, Name: "Savagery", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.AttackPower: 70, stats.RangedAttackPower: 70}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, + {EffectID: 2669, ItemID: 22555, Name: "Major Spellpower", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.SpellPower: 40}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 2671, ItemID: 22560, Name: "Sunfire", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 2672, ItemID: 22561, Name: "Soulfrost", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 2673, ItemID: 22559, Name: "Mongoose", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 2564, ItemID: 19445, Name: "Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 15}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3222, ItemID: 33165, Name: "Greater Agility", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Agility: 20}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 2670, ItemID: 22556, Name: "2H Weapon - Major Agility", Quality: proto.ItemQuality_ItemQualityUncommon, Bonus: stats.Stats{stats.Agility: 35}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, + {EffectID: 3225, ItemID: 33307, Name: "Executioner", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3273, ItemID: 35498, Name: "Deathfrost", Phase: 5, Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeWeapon}, + {EffectID: 3855, ItemID: 45060, Name: "Staff - Spellpower", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{stats.SpellPower: 69}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, // Shield - {ID: 22539, EffectID: 2654, Name: "Intellect", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Intellect: 12}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, - {ID: 28282, EffectID: 1071, Name: "Major Stamina", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 18}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, - {ID: 44383, EffectID: 3229, Name: "Resilience", IsSpellID: true, Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Resilience: 12}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, + {EffectID: 2654, ItemID: 22539, Name: "Intellect", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Intellect: 12}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, + {EffectID: 1071, ItemID: 28282, Name: "Major Stamina", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 18}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, + {EffectID: 3229, SpellID: 44383, Name: "Resilience", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Resilience: 12}, ItemType: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeShield}, // Ring - {ID: 22535, EffectID: 2929, Name: "Striking", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, - {ID: 22536, EffectID: 2928, Name: "Spellpower", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 12}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, - {ID: 22538, EffectID: 2931, Name: "Stats", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 4, stats.Intellect: 4, stats.Spirit: 4, stats.Strength: 4, stats.Agility: 4}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, + {EffectID: 2929, ItemID: 22535, Name: "Striking", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, + {EffectID: 2928, ItemID: 22536, Name: "Spellpower", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.SpellPower: 12}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, + {EffectID: 2931, ItemID: 22538, Name: "Stats", Quality: proto.ItemQuality_ItemQualityCommon, Bonus: stats.Stats{stats.Stamina: 4, stats.Intellect: 4, stats.Spirit: 4, stats.Strength: 4, stats.Agility: 4}, ItemType: proto.ItemType_ItemTypeFinger, RequiredProfession: proto.Profession_Enchanting}, // Ranged - {ID: 18283, EffectID: 2523, Name: "Biznicks 247x128 Accurascope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, - {ID: 23765, EffectID: 2723, Name: "Khorium Scope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, - {ID: 23766, EffectID: 2724, Name: "Stabilized Eternium Scope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, + {EffectID: 2523, ItemID: 18283, Name: "Biznicks 247x128 Accurascope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, + {EffectID: 2723, ItemID: 23765, Name: "Khorium Scope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, + {EffectID: 2724, ItemID: 23766, Name: "Stabilized Eternium Scope", Quality: proto.ItemQuality_ItemQualityRare, Bonus: stats.Stats{}, ItemType: proto.ItemType_ItemTypeRanged}, } diff --git a/sim/core/items/items.go b/sim/core/items/items.go index 937f11d81c..f7e0f8ea78 100644 --- a/sim/core/items/items.go +++ b/sim/core/items/items.go @@ -15,14 +15,14 @@ var EnchantsByItemByID = map[proto.ItemType]map[int32]Enchant{} func init() { for _, v := range Enchants { - if _, ok := EnchantsByItemByID[v.ItemType][v.ID]; ok { - panic(fmt.Sprintf("Duplicate enchant ID %d", v.ID)) + if _, ok := EnchantsByItemByID[v.ItemType][v.EffectID]; ok { + panic(fmt.Sprintf("Duplicate enchant ID %d", v.EffectID)) } if EnchantsByItemByID[v.ItemType] == nil { EnchantsByItemByID[v.ItemType] = map[int32]Enchant{} } - EnchantsByItemByID[v.ItemType][v.ID] = v + EnchantsByItemByID[v.ItemType][v.EffectID] = v } for _, v := range Gems { @@ -117,7 +117,7 @@ func (item Item) ToProto() *proto.Item { func (item Item) ToItemSpecProto() *proto.ItemSpec { itemSpec := &proto.ItemSpec{ Id: item.ID, - Enchant: item.Enchant.ID, + Enchant: item.Enchant.EffectID, Gems: []int32{}, } for _, gem := range item.Gems { @@ -127,10 +127,10 @@ func (item Item) ToItemSpecProto() *proto.ItemSpec { } type Enchant struct { - ID int32 // ID of the enchant item. EffectID int32 // Used by UI to apply effect to tooltip + ItemID int32 // ID of the enchant item. + SpellID int32 // ID of the enchant spell. Name string - IsSpellID bool Quality proto.ItemQuality Bonus stats.Stats ItemType proto.ItemType // Which slot the enchant goes on. @@ -145,10 +145,10 @@ type Enchant struct { func (enchant Enchant) ToProto() *proto.Enchant { return &proto.Enchant{ - Id: enchant.ID, EffectId: enchant.EffectID, + ItemId: enchant.ItemID, + SpellId: enchant.SpellID, Name: enchant.Name, - IsSpellId: enchant.IsSpellID, Type: enchant.ItemType, EnchantType: enchant.EnchantType, Stats: enchant.Bonus[:], diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results index d42c9cc202..e2e07a180c 100644 --- a/sim/deathknight/dps/TestFrost.results +++ b/sim/deathknight/dps/TestFrost.results @@ -1,35 +1,35 @@ character_stats_results: { key: "TestFrost-CharacterStats-Default" value: { - final_stats: 1703.416 - final_stats: 589.6 - final_stats: 1718.75 - final_stats: 166.1 - final_stats: 220 + final_stats: 1716 + final_stats: 573.1 + final_stats: 1717.65 + final_stats: 174.9 + final_stats: 228.8 final_stats: 280 final_stats: 109 - final_stats: 178 - final_stats: 1378.1 - final_stats: 180 + final_stats: 307 + final_stats: 1220.1 + final_stats: 267 final_stats: 0 - final_stats: 6149.47826 - final_stats: 276.37 - final_stats: 1957.55766 - final_stats: 180 + final_stats: 6189.35472 + final_stats: 405.37 + final_stats: 1787.43742 + final_stats: 267 final_stats: 115 - final_stats: 202.9875 + final_stats: 164.9875 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 17481.7 - final_stats: 1625.8 + final_stats: 17448.7 + final_stats: 1639 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 314.81692 - final_stats: 425.854 + final_stats: 306.00675 + final_stats: 429 final_stats: 0 - final_stats: 25128.5 + final_stats: 25117.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,679 +45,679 @@ character_stats_results: { dps_results: { key: "TestFrost-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7712.12679 - tps: 4558.22026 + dps: 7778.52284 + tps: 4595.7335 } } dps_results: { key: "TestFrost-AllItems-Bandit'sInsignia-40371" value: { - dps: 7686.97688 - tps: 4550.70916 + dps: 7728.78369 + tps: 4574.18017 } } dps_results: { key: "TestFrost-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7739.74119 - tps: 4574.7889 + dps: 7799.32651 + tps: 4608.21571 } } dps_results: { key: "TestFrost-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7502.31927 - tps: 4435.50284 + dps: 7535.19113 + tps: 4451.90276 } } dps_results: { key: "TestFrost-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 6434.51206 - tps: 3804.14508 + dps: 6479.54205 + tps: 3827.87179 } } dps_results: { key: "TestFrost-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6339.2452 - tps: 3750.25694 + dps: 6335.13075 + tps: 3744.21832 } } dps_results: { key: "TestFrost-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6062.89115 - tps: 3584.5398 + dps: 6103.4879 + tps: 3604.81797 } } dps_results: { key: "TestFrost-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7706.27652 - tps: 4463.6159 + dps: 7772.5296 + tps: 4500.2948 } } dps_results: { key: "TestFrost-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7928.41601 - tps: 4687.9938 + dps: 7981.66905 + tps: 4717.62123 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7632.05831 - tps: 4517.84834 + dps: 7668.75429 + tps: 4537.77478 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7657.45875 - tps: 4533.34523 + dps: 7673.59965 + tps: 4541.22572 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 7819.54167 - tps: 4624.439 + dps: 7864.29069 + tps: 4649.01785 } } dps_results: { key: "TestFrost-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 7735.34176 - tps: 4573.91906 + dps: 7786.20377 + tps: 4602.16569 } } dps_results: { key: "TestFrost-AllItems-DarkrunedBattlegear" value: { - dps: 7179.78405 - tps: 4245.94245 + dps: 7226.03152 + tps: 4273.12658 } } dps_results: { key: "TestFrost-AllItems-DarkrunedPlate" value: { - dps: 6380.69232 - tps: 3770.27383 + dps: 6407.20954 + tps: 3782.65967 } } dps_results: { key: "TestFrost-AllItems-DeadlyGladiator'sSigilofStrife-42620" value: { - dps: 7409.91306 - tps: 4376.89203 + dps: 7460.8083 + tps: 4405.10478 } } dps_results: { key: "TestFrost-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7607.56987 - tps: 4503.15527 + dps: 7656.51375 + tps: 4530.43046 } } dps_results: { key: "TestFrost-AllItems-Defender'sCode-40257" value: { - dps: 7535.23587 - tps: 4459.75488 + dps: 7577.81402 + tps: 4483.21062 } } dps_results: { key: "TestFrost-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7746.1527 - tps: 4578.63581 + dps: 7805.15006 + tps: 4611.70984 } } dps_results: { key: "TestFrost-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-EmberSkyflareDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7739.74119 - tps: 4574.7889 + dps: 7799.32651 + tps: 4608.21571 } } dps_results: { key: "TestFrost-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7731.07785 - tps: 4569.5909 + dps: 7793.97191 + tps: 4605.00294 } } dps_results: { key: "TestFrost-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7615.25704 - tps: 4507.79004 + dps: 7641.38917 + tps: 4521.91224 } } dps_results: { key: "TestFrost-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7609.61696 - tps: 4504.38353 + dps: 7649.50544 + tps: 4526.22547 } } dps_results: { key: "TestFrost-AllItems-ForgeEmber-37660" value: { - dps: 7595.29537 - tps: 4495.79058 + dps: 7635.73396 + tps: 4517.96259 } } dps_results: { key: "TestFrost-AllItems-ForlornSkyflareDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-ForlornStarflareDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-FuriousGladiator'sSigilofStrife-42621" value: { - dps: 7410.53541 - tps: 4377.26544 + dps: 7461.49041 + tps: 4405.51405 } } dps_results: { key: "TestFrost-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7749.78758 - tps: 4588.4859 + dps: 7797.04117 + tps: 4614.74691 } } dps_results: { key: "TestFrost-AllItems-FuturesightRune-38763" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-HatefulGladiator'sSigilofStrife-42619" value: { - dps: 7408.79744 - tps: 4376.22265 + dps: 7459.5011 + tps: 4404.32046 } } dps_results: { key: "TestFrost-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7739.74119 - tps: 4574.7889 + dps: 7799.32651 + tps: 4608.21571 } } dps_results: { key: "TestFrost-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7731.07785 - tps: 4569.5909 + dps: 7793.97191 + tps: 4605.00294 } } dps_results: { key: "TestFrost-AllItems-IncisorFragment-37723" value: { - dps: 7704.09885 - tps: 4561.07266 + dps: 7754.09292 + tps: 4588.97796 } } dps_results: { key: "TestFrost-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7736.54664 - tps: 4572.87217 + dps: 7803.52062 + tps: 4610.73217 } } dps_results: { key: "TestFrost-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7656.14747 - tps: 4527.88415 + dps: 7720.321 + tps: 4564.871 } } dps_results: { key: "TestFrost-AllItems-OfferingofSacrifice-37638" value: { - dps: 7528.5396 - tps: 4455.73712 + dps: 7570.96452 + tps: 4479.10092 } } dps_results: { key: "TestFrost-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7730.7809 - tps: 4569.41273 + dps: 7797.61757 + tps: 4607.19034 } } dps_results: { key: "TestFrost-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7736.54664 - tps: 4572.87217 + dps: 7803.52062 + tps: 4610.73217 } } dps_results: { key: "TestFrost-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-PurifiedShardoftheGods" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-ReignoftheDead-47316" value: { - dps: 7527.05689 - tps: 4454.74054 + dps: 7513.78545 + tps: 4445.31969 } } dps_results: { key: "TestFrost-AllItems-ReignoftheDead-47477" value: { - dps: 7527.88247 - tps: 4455.23589 + dps: 7514.8351 + tps: 4445.94948 } } dps_results: { key: "TestFrost-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7919.47589 - tps: 4682.62972 + dps: 7974.64709 + tps: 4713.40805 } } dps_results: { key: "TestFrost-AllItems-RelentlessGladiator'sSigilofStrife-42622" value: { - dps: 7411.26149 - tps: 4377.70108 + dps: 7462.28621 + tps: 4405.99153 } } dps_results: { key: "TestFrost-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-RuneofRepulsion-40372" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-SavageGladiator'sSigilofStrife-42618" value: { - dps: 7408.57146 - tps: 4376.08707 + dps: 7459.26298 + tps: 4404.17759 } } dps_results: { key: "TestFrost-AllItems-ScourgeborneBattlegear" value: { - dps: 6889.39274 - tps: 4073.34887 + dps: 6961.72091 + tps: 4115.45783 } } dps_results: { key: "TestFrost-AllItems-ScourgebornePlate" value: { - dps: 6291.05755 - tps: 3716.55824 + dps: 6336.30201 + tps: 3740.66552 } } dps_results: { key: "TestFrost-AllItems-Scourgelord'sBattlegear" value: { - dps: 8089.35959 - tps: 4789.91803 + dps: 8167.64894 + tps: 4833.65485 } } dps_results: { key: "TestFrost-AllItems-Scourgelord'sPlate" value: { - dps: 6781.48472 - tps: 4006.72749 + dps: 6841.66512 + tps: 4039.27852 } } dps_results: { key: "TestFrost-AllItems-SealofthePantheon-36993" value: { - dps: 7534.48677 - tps: 4459.30541 + dps: 7577.29437 + tps: 4482.89883 } } dps_results: { key: "TestFrost-AllItems-ShinyShardoftheGods" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-SigilofHauntedDreams-40715" value: { - dps: 7415.64449 - tps: 4380.33088 + dps: 7471.77938 + tps: 4411.68742 } } dps_results: { key: "TestFrost-AllItems-SigilofVirulence-47673" value: { - dps: 7806.31608 - tps: 4611.54954 + dps: 7865.48499 + tps: 4644.4516 } } dps_results: { key: "TestFrost-AllItems-SigiloftheHangedMan-50459" value: { - dps: 7836.8178 - tps: 4631.59936 + dps: 7897.02648 + tps: 4665.29104 } } dps_results: { key: "TestFrost-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-SparkofLife-37657" value: { - dps: 7573.77656 - tps: 4481.99121 + dps: 7574.54724 + tps: 4480.82798 } } dps_results: { key: "TestFrost-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7629.62548 - tps: 4516.42316 + dps: 7673.8874 + tps: 4540.97779 } } dps_results: { key: "TestFrost-AllItems-StormshroudArmor" value: { - dps: 6029.87699 - tps: 3564.50644 + dps: 6085.46117 + tps: 3594.32955 } } dps_results: { key: "TestFrost-AllItems-SwiftSkyflareDiamond" value: { - dps: 7736.54664 - tps: 4572.87217 + dps: 7803.52062 + tps: 4610.73217 } } dps_results: { key: "TestFrost-AllItems-SwiftStarflareDiamond" value: { - dps: 7730.7809 - tps: 4569.41273 + dps: 7797.61757 + tps: 4607.19034 } } dps_results: { key: "TestFrost-AllItems-SwiftWindfireDiamond" value: { - dps: 7720.69086 - tps: 4563.35871 + dps: 7787.28723 + tps: 4600.99213 } } dps_results: { key: "TestFrost-AllItems-Thassarian'sBattlegear" value: { - dps: 7403.0604 - tps: 4376.07354 + dps: 7465.31915 + tps: 4413.0498 } } dps_results: { key: "TestFrost-AllItems-Thassarian'sPlate" value: { - dps: 6451.05816 - tps: 3809.48106 + dps: 6509.90193 + tps: 3843.95444 } } dps_results: { key: "TestFrost-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7656.63962 - tps: 4523.69385 + dps: 7798.84911 + tps: 4607.21035 } } dps_results: { key: "TestFrost-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7647.81157 - tps: 4527.66881 + dps: 7687.18704 + tps: 4549.62537 } } dps_results: { key: "TestFrost-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7677.78048 - tps: 4545.08105 + dps: 7670.28569 + tps: 4539.3444 } } dps_results: { key: "TestFrost-AllItems-TirelessSkyflareDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-TirelessStarflareDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7706.27652 - tps: 4554.7101 + dps: 7772.5296 + tps: 4592.13756 } } dps_results: { key: "TestFrost-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6321.64236 - tps: 3739.78648 + dps: 6371.29161 + tps: 3765.58917 } } dps_results: { key: "TestFrost-AllItems-WingedTalisman-37844" value: { - dps: 7516.26311 - tps: 4448.37122 + dps: 7558.40709 + tps: 4471.56646 } } dps_results: { key: "TestFrost-AllItems-WrathfulGladiator'sSigilofStrife-51417" value: { - dps: 7412.09129 - tps: 4378.19896 + dps: 7463.1957 + tps: 4406.53722 } } dps_results: { key: "TestFrost-Average-Default" value: { - dps: 7874.73809 - tps: 4656.19635 + dps: 7936.56817 + tps: 4691.78875 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 11113.48523 - tps: 6602.26824 + dps: 11309.72391 + tps: 6718.20083 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 5768.42204 - tps: 3394.39922 + dps: 5855.55578 + tps: 3445.52701 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 6527.03434 - tps: 3625.59273 + dps: 6677.8096 + tps: 3712.17106 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 6992.4465 - tps: 4158.23628 + dps: 6977.05673 + tps: 4148.21351 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3346.81127 - tps: 1970.55465 + dps: 3387.3562 + tps: 1994.45056 } } dps_results: { key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3612.82211 - tps: 2007.03403 + dps: 3682.88754 + tps: 2043.08166 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 11121.4342 - tps: 6603.67148 + dps: 11229.73347 + tps: 6667.08136 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 5787.7217 - tps: 3402.49628 + dps: 5846.55068 + tps: 3437.14895 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 6593.49134 - tps: 3650.88026 + dps: 6729.20856 + tps: 3728.77015 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 7008.93021 - tps: 4166.09417 + dps: 7017.47884 + tps: 4170.38605 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3352.90512 - tps: 1972.13949 + dps: 3355.90205 + tps: 1973.44543 } } dps_results: { key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3633.5849 - tps: 2010.38061 + dps: 3694.42378 + tps: 2041.72211 } } dps_results: { key: "TestFrost-SwitchInFrontOfTarget-Default" value: { - dps: 7520.53962 - tps: 4449.00238 + dps: 7448.26988 + tps: 4402.03415 } } diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results index 4d0cea0f61..87f19d9b5e 100644 --- a/sim/deathknight/dps/TestUnholy.results +++ b/sim/deathknight/dps/TestUnholy.results @@ -1,35 +1,35 @@ character_stats_results: { key: "TestUnholy-CharacterStats-Default" value: { - final_stats: 1692.06752 - final_stats: 572 - final_stats: 1712.15 - final_stats: 177.1 - final_stats: 231 + final_stats: 1767.48 + final_stats: 528 + final_stats: 1720.95 + final_stats: 174.9 + final_stats: 228.8 final_stats: 280 final_stats: 109 - final_stats: 308.696 - final_stats: 1177.28 - final_stats: 343 - final_stats: 0 - final_stats: 5715.74854 - final_stats: 328.37 - final_stats: 1743.8094 - final_stats: 343 - final_stats: 109 - final_stats: 131.9875 + final_stats: 327.696 + final_stats: 1023.28 + final_stats: 448 final_stats: 0 + final_stats: 5677.056 + final_stats: 347.37 + final_stats: 1557.48876 + final_stats: 448 + final_stats: 25 + final_stats: 207.9875 final_stats: 0 final_stats: 0 - final_stats: 17446.5 - final_stats: 1751.2 final_stats: 0 + final_stats: 17324.5 + final_stats: 1546.6 + final_stats: 31 final_stats: 0 final_stats: 0 - final_stats: 305.4194 - final_stats: 423.01688 + final_stats: 281.9256 + final_stats: 475.87 final_stats: 0 - final_stats: 25062.5 + final_stats: 25150.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,776 +45,760 @@ character_stats_results: { dps_results: { key: "TestUnholy-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 157.14598 + dps: 8112.84952 + tps: 4769.59495 + hps: 157.54264 } } dps_results: { key: "TestUnholy-AllItems-Bandit'sInsignia-40371" value: { - dps: 7721.88477 - tps: 4709.96876 - hps: 157.42276 + dps: 7801.7851 + tps: 4686.36868 + hps: 158.15697 } } dps_results: { key: "TestUnholy-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 8002.17729 - tps: 4825.43835 - hps: 155.84538 + dps: 8137.3262 + tps: 4790.07539 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 7761.83226 - tps: 4601.27525 - hps: 152.15508 + dps: 7899.34199 + tps: 4597.99935 + hps: 150.41256 } } dps_results: { key: "TestUnholy-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 6618.42572 - tps: 3922.76343 - hps: 134.40494 + dps: 6709.63881 + tps: 3943.44515 + hps: 138.79886 } } dps_results: { key: "TestUnholy-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6429.99801 - tps: 3848.29877 - hps: 132.10263 + dps: 6523.1208 + tps: 3870.02201 + hps: 130.79499 } } dps_results: { key: "TestUnholy-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6231.14065 - tps: 3711.63497 - hps: 128.54605 + dps: 6347.63263 + tps: 3729.33659 + hps: 129.1008 } } dps_results: { key: "TestUnholy-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7996.24945 - tps: 4723.58009 - hps: 154.268 + dps: 8112.84952 + tps: 4674.20305 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ChaoticSkyflareDiamond" value: { - dps: 8079.23189 - tps: 4894.7681 - hps: 155.84538 + dps: 8207.19062 + tps: 4852.67446 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7558.13008 - tps: 4602.77832 - hps: 151.42871 + dps: 7686.55649 + tps: 4609.92004 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7638.52537 - tps: 4654.17159 - hps: 155.84538 + dps: 7744.12578 + tps: 4664.2432 + hps: 156.57223 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 7856.72522 - tps: 4733.14392 - hps: 153.00609 + dps: 7992.8642 + tps: 4727.22813 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 7792.48728 - tps: 4695.09318 - hps: 153.00609 + dps: 7949.18668 + tps: 4689.00935 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-DarkrunedBattlegear" value: { - dps: 7389.87086 - tps: 4531.72088 - hps: 146.6455 + dps: 7467.11019 + tps: 4503.48369 + hps: 144.40155 } } dps_results: { key: "TestUnholy-AllItems-DarkrunedPlate" value: { - dps: 6600.464 - tps: 3915.93794 - hps: 162.24374 - } -} -dps_results: { - key: "TestUnholy-AllItems-DeadlyGladiator'sSigilofStrife-42620" - value: { - dps: 8087.20861 - tps: 4883.0131 - hps: 153.00609 + dps: 6702.01853 + tps: 3935.59009 + hps: 166.44842 } } dps_results: { key: "TestUnholy-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7524.91688 - tps: 4578.96135 - hps: 151.42871 + dps: 7665.32788 + tps: 4592.75663 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-Defender'sCode-40257" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-DestructiveSkyflareDiamond" value: { - dps: 8002.81922 - tps: 4828.94415 - hps: 155.84538 + dps: 8139.94975 + tps: 4793.05295 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 157.14598 + dps: 8112.84952 + tps: 4769.59495 + hps: 157.54264 } } dps_results: { key: "TestUnholy-AllItems-EmberSkyflareDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 8002.17729 - tps: 4825.43835 - hps: 155.84538 + dps: 8137.3262 + tps: 4790.07539 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-EnigmaticStarflareDiamond" value: { - dps: 8000.54466 - tps: 4822.44129 - hps: 155.84538 + dps: 8132.83595 + tps: 4785.0244 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7628.46386 - tps: 4659.79845 - hps: 156.16086 + dps: 7725.05226 + tps: 4649.95312 + hps: 153.08581 } } dps_results: { key: "TestUnholy-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7544.97672 - tps: 4588.29296 - hps: 153.00609 + dps: 7667.06764 + tps: 4594.59123 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ForgeEmber-37660" value: { - dps: 7533.77645 - tps: 4577.08788 - hps: 153.00609 + dps: 7648.0054 + tps: 4579.9055 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ForlornSkyflareDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ForlornStarflareDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-FuriousGladiator'sSigilofStrife-42621" value: { - dps: 8105.42029 - tps: 4896.40773 - hps: 153.00609 + dps: 8212.11708 + tps: 4851.98466 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7722.38026 - tps: 4718.4891 - hps: 153.00609 + dps: 7850.04674 + tps: 4712.33496 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-FuturesightRune-38763" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-HatefulGladiator'sSigilofStrife-42619" value: { - dps: 8041.1228 - tps: 4851.78258 - hps: 153.00609 + dps: 8145.54378 + tps: 4803.36089 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 8002.17729 - tps: 4825.43835 - hps: 155.84538 + dps: 8137.3262 + tps: 4790.07539 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ImpassiveStarflareDiamond" value: { - dps: 8000.54466 - tps: 4822.44129 - hps: 155.84538 + dps: 8132.83595 + tps: 4785.0244 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-IncisorFragment-37723" value: { - dps: 7627.43822 - tps: 4654.38498 - hps: 153.00609 + dps: 7751.04542 + tps: 4645.02832 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 8031.16239 - tps: 4846.00007 - hps: 154.268 + dps: 8148.14847 + tps: 4795.31385 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 - } -} -dps_results: { - key: "TestUnholy-AllItems-MeteoriteWhetstone-37390" - value: { - dps: 7759.09489 - tps: 4648.66909 - hps: 156.16086 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-OfferingofSacrifice-37638" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-PersistentEarthshatterDiamond" value: { - dps: 8024.51231 - tps: 4841.0438 - hps: 154.268 + dps: 8141.42486 + tps: 4790.41501 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 8031.16239 - tps: 4846.00007 - hps: 154.268 + dps: 8148.14847 + tps: 4795.31385 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 156.60636 + dps: 8112.84952 + tps: 4769.59495 + hps: 157.00412 } } dps_results: { key: "TestUnholy-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 157.14598 + dps: 8112.84952 + tps: 4769.59495 + hps: 157.54264 } } dps_results: { key: "TestUnholy-AllItems-PurifiedShardoftheGods" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ReignoftheDead-47316" value: { - dps: 7572.50749 - tps: 4606.27007 - hps: 154.58348 + dps: 7640.91566 + tps: 4572.39551 + hps: 153.7197 } } dps_results: { key: "TestUnholy-AllItems-ReignoftheDead-47477" value: { - dps: 7582.53724 - tps: 4614.30653 - hps: 154.58348 + dps: 7650.07666 + tps: 4579.76738 + hps: 153.7197 } } dps_results: { key: "TestUnholy-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 8073.82393 - tps: 4888.01267 - hps: 155.84538 + dps: 8193.08963 + tps: 4838.10088 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-RelentlessGladiator'sSigilofStrife-42622" value: { - dps: 8126.66724 - tps: 4912.0348 - hps: 153.00609 + dps: 8234.31576 + tps: 4868.1824 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-RuneofRepulsion-40372" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-SavageGladiator'sSigilofStrife-42618" value: { - dps: 8036.03156 - tps: 4847.73625 - hps: 153.00609 + dps: 8140.15608 + tps: 4799.43497 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ScourgeborneBattlegear" value: { - dps: 7030.91 - tps: 4236.3128 - hps: 144.73987 + dps: 7144.51174 + tps: 4253.80575 + hps: 146.68122 } } dps_results: { key: "TestUnholy-AllItems-ScourgebornePlate" value: { - dps: 6521.68662 - tps: 3876.70644 - hps: 148.45683 + dps: 6632.28307 + tps: 3898.66832 + hps: 152.82194 } } dps_results: { key: "TestUnholy-AllItems-Scourgelord'sBattlegear" value: { - dps: 8068.67571 - tps: 5022.25309 - hps: 170.62498 + dps: 8175.771 + tps: 5020.00341 + hps: 171.7349 } } dps_results: { key: "TestUnholy-AllItems-Scourgelord'sPlate" value: { - dps: 7255.43072 - tps: 4438.61393 - hps: 181.52959 + dps: 7377.02127 + tps: 4452.29414 + hps: 183.67736 } } dps_results: { key: "TestUnholy-AllItems-SealofthePantheon-36993" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-ShinyShardoftheGods" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-SigilofHauntedDreams-40715" value: { - dps: 8010.56286 - tps: 4829.83145 - hps: 153.00609 + dps: 8106.01191 + tps: 4776.18775 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-SigilofVirulence-47673" value: { - dps: 8383.22929 - tps: 5051.18546 - hps: 153.00609 + dps: 8472.78284 + tps: 5014.33451 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-SigiloftheHangedMan-50459" value: { - dps: 8173.95699 - tps: 4922.89948 - hps: 153.00609 + dps: 8249.10955 + tps: 4868.24014 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 173.34397 + dps: 7581.73165 + tps: 4516.89763 + hps: 175.13422 } } dps_results: { key: "TestUnholy-AllItems-SparkofLife-37657" value: { - dps: 7581.57525 - tps: 4566.48043 - hps: 152.69062 + dps: 7650.08506 + tps: 4546.51805 + hps: 157.84002 } } dps_results: { key: "TestUnholy-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7738.22622 - tps: 4660.28968 - hps: 153.63705 + dps: 7823.76274 + tps: 4637.78144 + hps: 157.84002 } } dps_results: { key: "TestUnholy-AllItems-StormshroudArmor" value: { - dps: 6145.16904 - tps: 3691.30561 - hps: 119.83337 + dps: 6230.4383 + tps: 3697.77023 + hps: 120.76521 } } dps_results: { key: "TestUnholy-AllItems-SwiftSkyflareDiamond" value: { - dps: 8031.16239 - tps: 4846.00007 - hps: 154.268 + dps: 8148.14847 + tps: 4795.31385 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-SwiftStarflareDiamond" value: { - dps: 8024.51231 - tps: 4841.0438 - hps: 154.268 + dps: 8141.42486 + tps: 4790.41501 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-SwiftWindfireDiamond" value: { - dps: 8012.87466 - tps: 4832.37034 - hps: 154.268 + dps: 8129.65855 + tps: 4781.84205 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-Thassarian'sBattlegear" value: { - dps: 7784.8886 - tps: 4772.46402 - hps: 161.0242 + dps: 7913.75915 + tps: 4786.36293 + hps: 164.89262 } } dps_results: { key: "TestUnholy-AllItems-Thassarian'sPlate" value: { - dps: 6750.15682 - tps: 4031.54216 - hps: 169.36172 + dps: 6819.6766 + tps: 4007.64075 + hps: 169.13249 } } dps_results: { key: "TestUnholy-AllItems-ThunderingSkyflareDiamond" value: { - dps: 8027.13426 - tps: 4840.86448 - hps: 153.00609 + dps: 8103.03184 + tps: 4785.81184 + hps: 158.47392 } } dps_results: { key: "TestUnholy-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7663.1512 - tps: 4686.47354 - hps: 156.16086 + dps: 7770.24378 + tps: 4667.19219 + hps: 158.15697 } } dps_results: { key: "TestUnholy-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7709.6679 - tps: 4713.81166 - hps: 154.268 + dps: 7782.54628 + tps: 4676.62231 + hps: 155.30444 } } dps_results: { key: "TestUnholy-AllItems-TirelessSkyflareDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-TirelessStarflareDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7996.24945 - tps: 4819.97968 - hps: 154.268 + dps: 8112.84952 + tps: 4769.59495 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6475.83779 - tps: 3888.92169 - hps: 134.58496 + dps: 6578.61465 + tps: 3898.52241 + hps: 133.99699 } } dps_results: { key: "TestUnholy-AllItems-WingedTalisman-37844" value: { - dps: 7458.62426 - tps: 4523.64036 - hps: 153.00609 + dps: 7581.73165 + tps: 4516.89763 + hps: 154.67055 } } dps_results: { key: "TestUnholy-AllItems-WrathfulGladiator'sSigilofStrife-51417" value: { - dps: 8150.94948 - tps: 4929.8943 - hps: 153.00609 + dps: 8259.68569 + tps: 4886.69411 + hps: 154.67055 } } dps_results: { key: "TestUnholy-Average-Default" value: { - dps: 8044.41184 - tps: 4843.24302 - hps: 154.75911 + dps: 8175.18465 + tps: 4836.71151 + hps: 155.97092 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-FullBuffs-LongMultiTarget" value: { - dps: 31121.57761 - tps: 30324.77105 - hps: 117.60312 + dps: 31304.8299 + tps: 30403.32807 + hps: 119.33981 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-FullBuffs-LongSingleTarget" value: { - dps: 7525.87151 - tps: 4625.94474 - hps: 113.52301 + dps: 7629.87238 + tps: 4587.8419 + hps: 117.89326 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-FullBuffs-ShortSingleTarget" value: { - dps: 11319.11135 - tps: 4981.79211 - hps: 120.00318 + dps: 11488.52293 + tps: 4948.29858 + hps: 120.54526 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-NoBuffs-LongMultiTarget" value: { - dps: 18740.27932 - tps: 18961.25439 - hps: 68.88 + dps: 18792.28311 + tps: 18863.33541 + hps: 67.77098 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-NoBuffs-LongSingleTarget" value: { - dps: 3752.52686 - tps: 2519.98251 - hps: 67.62 + dps: 3773.12429 + tps: 2500.01359 + hps: 68.05277 } } dps_results: { key: "TestUnholy-Settings-Human-Unholy P1 -Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4996.28074 - tps: 2461.83564 - hps: 70 + dps: 5089.22587 + tps: 2498.92924 + hps: 70.448 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-FullBuffs-LongMultiTarget" value: { - dps: 31141.76928 - tps: 30200.07393 - hps: 118.87023 + dps: 31495.58295 + tps: 30376.56927 + hps: 119.40689 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-FullBuffs-LongSingleTarget" value: { - dps: 7678.60782 - tps: 4621.32267 - hps: 116.46881 + dps: 7834.80686 + tps: 4625.5497 + hps: 117.71831 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-FullBuffs-ShortSingleTarget" value: { - dps: 11805.23083 - tps: 4967.62817 - hps: 120.07094 + dps: 11993.65101 + tps: 4999.7944 + hps: 120.61302 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-NoBuffs-LongMultiTarget" value: { - dps: 18912.76285 - tps: 19138.75365 - hps: 68.23454 + dps: 19012.79307 + tps: 18993.48854 + hps: 67.26082 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-NoBuffs-LongSingleTarget" value: { - dps: 3824.46306 - tps: 2521.20365 - hps: 67.39387 + dps: 3866.10788 + tps: 2519.33468 + hps: 67.54283 } } dps_results: { key: "TestUnholy-Settings-Orc-Unholy P1 -Basic-NoBuffs-ShortSingleTarget" value: { - dps: 5176.70808 - tps: 2454.40265 - hps: 70.056 + dps: 5316.98117 + tps: 2530.6147 + hps: 70.504 } } dps_results: { key: "TestUnholy-SwitchInFrontOfTarget-Default" value: { - dps: 7618.87797 - tps: 4591.19495 - hps: 154.268 + dps: 7836.53115 + tps: 4652.48518 + hps: 153.7197 } } diff --git a/sim/deathknight/dps/presets.go b/sim/deathknight/dps/presets.go index 1a5ed16890..80047a3336 100644 --- a/sim/deathknight/dps/presets.go +++ b/sim/deathknight/dps/presets.go @@ -123,185 +123,185 @@ var FullConsumes = &proto.Consumes{ } var UnholyDwP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ -{ - "id": 44006, - "enchant": 44879, - "gems": [ - 41400, - 49110 - ] + { + "id": 44006, + "enchant": 3817, + "gems": [ + 41398, + 42702 + ] }, { - "id": 39421 + "id": 39421 }, { - "id": 40557, - "enchant": 44871, - "gems": [ - 39996 - ] + "id": 40557, + "enchant": 3808, + "gems": [ + 39996 + ] }, { - "id": 40403, - "enchant": 44472 + "id": 40403, + "enchant": 3831 }, { - "id": 40550, - "enchant": 44623, - "gems": [ - 42142, - 39996 - ] + "id": 40550, + "enchant": 3832, + "gems": [ + 42142, + 39996 + ] }, { - "id": 40330, - "enchant": 60616, - "gems": [ - 39996, - 0 - ] + "id": 40330, + "enchant": 3845, + "gems": [ + 39996, + 0 + ] }, { - "id": 40552, - "enchant": 54999, - "gems": [ - 39996, - 0 - ] + "id": 40347, + "enchant": 3604, + "gems": [ + 39996, + 0 + ] }, { - "id": 40278, - "gems": [ - 42142, - 42142 - ] + "id": 40278, + "gems": [ + 42142, + 42142 + ] }, { - "id": 40556, - "enchant": 38374, - "gems": [ - 39996, - 39996 - ] + "id": 40294, + "enchant": 3823 }, { - "id": 40591, - "enchant": 55016 + "id": 39706, + "enchant": 3606, + "gems": [ + 39996 + ] }, { - "id": 40717 + "id": 39401 }, { - "id": 40075 + "id": 40075 }, { - "id": 40684 + "id": 37390 }, { - "id": 42987 + "id": 42987 }, { - "id": 40189, - "enchant": 53344 + "id": 40402, + "enchant": 3368 }, { - "id": 40491, - "enchant": 44495 + "id": 40491, + "enchant": 3368 }, { - "id": 40867 + "id": 42620 } ]}`) var FrostP1Gear = items.EquipmentSpecFromJsonString(`{ "items": [ -{ - "id": 44006, - "enchant": 44879, - "gems": [ - 41398, - 40022 - ] -}, -{ - "id": 44664, - "gems": [ - 39996 - ] -}, -{ - "id": 40557, - "enchant": 44871, - "gems": [ - 39996 - ] -}, -{ - "id": 40403, - "enchant": 55002 -}, -{ - "id": 40550, - "enchant": 44623, - "gems": [ - 42142, - 39996 - ] -}, -{ - "id": 40330, - "enchant": 60616, - "gems": [ - 39996, - 0 - ] -}, -{ - "id": 40552, - "enchant": 54999, - "gems": [ - 39996, - 0 - ] -}, -{ - "id": 40317, - "gems": [ - 42142 - ] -}, -{ - "id": 40556, - "enchant": 38374, - "gems": [ - 42142, - 39996 - ] -}, -{ - "id": 40591, - "enchant": 55016 -}, -{ - "id": 39401 -}, -{ - "id": 40075 -}, -{ - "id": 40684 -}, -{ - "id": 42987 -}, -{ - "id": 40189, - "enchant": 53343 -}, -{ - "id": 40189, - "enchant": 53344 -}, -{ - "id": 40207 -} + { + "id": 44006, + "enchant": 3817, + "gems": [ + 41398, + 42702 + ] + }, + { + "id": 44664, + "gems": [ + 39996 + ] + }, + { + "id": 40557, + "enchant": 3808, + "gems": [ + 39996 + ] + }, + { + "id": 40403, + "enchant": 3831 + }, + { + "id": 40550, + "enchant": 3832, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 40330, + "enchant": 3845, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40552, + "enchant": 3604, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40278, + "gems": [ + 39996, + 42142 + ] + }, + { + "id": 40556, + "enchant": 3823, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 40591, + "enchant": 3606 + }, + { + "id": 39401 + }, + { + "id": 40075 + }, + { + "id": 40256 + }, + { + "id": 42987 + }, + { + "id": 40189, + "enchant": 3370 + }, + { + "id": 40189, + "enchant": 3368 + }, + { + "id": 40207 + } ]}`) diff --git a/sim/deathknight/items.go b/sim/deathknight/items.go index e91991e354..93a6e00006 100644 --- a/sim/deathknight/items.go +++ b/sim/deathknight/items.go @@ -306,11 +306,11 @@ func (dk *Deathknight) sigilOfTheUnfalteringKnight() *core.Aura { func init() { // Rune of Cinderglacier - core.NewEnchantEffect(53341, func(agent core.Agent) { + core.NewEnchantEffect(3369, func(agent core.Agent) { character := agent.GetCharacter() - mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.ID == 53341 - oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.ID == 53341 + mh := character.Equip[proto.ItemSlot_ItemSlotMainHand].Enchant.EffectID == 3369 + oh := character.Equip[proto.ItemSlot_ItemSlotOffHand].Enchant.EffectID == 3369 if !mh && !oh { return } diff --git a/sim/deathknight/tank/presets.go b/sim/deathknight/tank/presets.go index 9ea8a6ca37..741fdfe652 100644 --- a/sim/deathknight/tank/presets.go +++ b/sim/deathknight/tank/presets.go @@ -102,96 +102,96 @@ var Glyphs = &proto.Glyphs{ } var BloodP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40565, - "enchant": 67839, - "gems": [ - 41380, - 36767 - ] - }, - { - "id": 40387 - }, - { - "id": 39704, - "enchant": 44957, - "gems": [ - 40008 - ] - }, - { - "id": 40252, - "enchant": 55002 - }, - { - "id": 40559, - "gems": [ - 40008, - 40022 - ] - }, - { - "id": 40306, - "enchant": 44944, - "gems": [ - 40008, - 0 - ] - }, - { - "id": 40563, - "enchant": 63770, - "gems": [ - 40008, - 0 - ] - }, - { - "id": 39759, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 40567, - "enchant": 38373, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 40297, - "enchant": 44491 - }, - { - "id": 40718 - }, - { - "id": 40107 - }, - { - "id": 44063, - "gems": [ - 36767, - 36767 - ] - }, - { - "id": 42341, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 40406, - "enchant": 62158 - }, - {}, - { - "id": 40207 - } - ]}`) + { + "id": 40565, + "enchant": 3878, + "gems": [ + 41380, + 36767 + ] + }, + { + "id": 40387 + }, + { + "id": 39704, + "enchant": 3852, + "gems": [ + 40008 + ] + }, + { + "id": 40252, + "enchant": 3605 + }, + { + "id": 40559, + "gems": [ + 40008, + 40022 + ] + }, + { + "id": 40306, + "enchant": 3850, + "gems": [ + 40008, + 0 + ] + }, + { + "id": 40563, + "enchant": 3860, + "gems": [ + 40008, + 0 + ] + }, + { + "id": 39759, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 40567, + "enchant": 3822, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 40297, + "enchant": 3232 + }, + { + "id": 40718 + }, + { + "id": 40107 + }, + { + "id": 44063, + "gems": [ + 36767, + 36767 + ] + }, + { + "id": 42341, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 40406, + "enchant": 3847 + }, + {}, + { + "id": 40207 + } +]}`) diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 9a0a368674..b066e02026 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -3,25 +3,25 @@ character_stats_results: { value: { final_stats: 373.626 final_stats: 355.674 - final_stats: 1330.131 - final_stats: 1289.739 - final_stats: 748.374 - final_stats: 2630.28088 + final_stats: 1309.935 + final_stats: 1294.6758 + final_stats: 623.832 + final_stats: 2685.5107 final_stats: 128 final_stats: 367.928 - final_stats: 1235.485 - final_stats: 480 + final_stats: 1269.84489 + final_stats: 503 final_stats: 0 final_stats: 1555.6772 final_stats: 263 - final_stats: 1196.91256 - final_stats: 480 + final_stats: 1229.91256 + final_stats: 503 final_stats: 0 final_stats: 0 - final_stats: 22562.085 + final_stats: 22636.137 final_stats: 0 final_stats: 0 - final_stats: 6375.848 + final_stats: 6557.848 final_stats: 755.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 341.26905 final_stats: 0 final_stats: 0 - final_stats: 20537.91 + final_stats: 20335.95 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,658 +45,658 @@ character_stats_results: { dps_results: { key: "TestBalance-AllItems-AshtongueTalismanofEquilibrium-32486" value: { - dps: 7075.4529 - tps: 6916.31531 + dps: 7260.9986 + tps: 7102.33771 } } dps_results: { key: "TestBalance-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-Bandit'sInsignia-40371" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7130.38996 - tps: 6971.6579 + dps: 7312.2951 + tps: 7153.90239 } } dps_results: { key: "TestBalance-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5561.56879 - tps: 5401.42565 + dps: 5663.39341 + tps: 5502.61567 } } dps_results: { key: "TestBalance-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7132.16114 - tps: 6832.83615 + dps: 7331.02686 + tps: 7028.34146 } } dps_results: { key: "TestBalance-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7326.75658 - tps: 7166.78616 + dps: 7515.61104 + tps: 7356.11732 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7165.15244 - tps: 7011.29436 + dps: 7326.02655 + tps: 7171.10418 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7150.3102 - tps: 6994.49156 + dps: 7343.75446 + tps: 7187.64903 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 7088.2995 - tps: 6936.84285 + dps: 7231.54472 + tps: 7077.27264 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 7088.2995 - tps: 6936.84285 + dps: 7231.54472 + tps: 7077.27264 } } dps_results: { key: "TestBalance-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 7142.11272 - tps: 6989.39256 + dps: 7285.75523 + tps: 7130.22166 } } dps_results: { key: "TestBalance-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 7232.62527 - tps: 7072.65485 + dps: 7421.3121 + tps: 7261.81838 } } dps_results: { key: "TestBalance-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7024.27266 - tps: 6866.45186 + dps: 7226.56772 + tps: 7069.21911 } } dps_results: { key: "TestBalance-AllItems-Defender'sCode-40257" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7134.32886 - tps: 6974.43365 + dps: 7322.26949 + tps: 7162.97602 } } dps_results: { key: "TestBalance-AllItems-DreamwalkerBattlegear" value: { - dps: 4136.07093 - tps: 3970.0475 + dps: 4113.82876 + tps: 3946.90366 } } dps_results: { key: "TestBalance-AllItems-DreamwalkerGarb" value: { - dps: 5966.09748 - tps: 5799.34347 + dps: 6033.85762 + tps: 5869.93094 } } dps_results: { key: "TestBalance-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-EmberSkyflareDiamond" value: { - dps: 7158.24374 - tps: 6997.68654 + dps: 7345.30088 + tps: 7185.03417 } } dps_results: { key: "TestBalance-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7130.38996 - tps: 6970.41954 + dps: 7312.2951 + tps: 7152.80138 } } dps_results: { key: "TestBalance-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7126.59208 - tps: 6966.46541 + dps: 7307.56249 + tps: 7148.0408 } } dps_results: { key: "TestBalance-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7148.05959 - tps: 6992.49204 + dps: 7322.75897 + tps: 7167.35028 } } dps_results: { key: "TestBalance-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7339.13849 - tps: 7183.25584 + dps: 7524.91795 + tps: 7368.41345 } } dps_results: { key: "TestBalance-AllItems-ForgeEmber-37660" value: { - dps: 7291.63904 - tps: 7136.28333 + dps: 7459.98625 + tps: 7303.92451 } } dps_results: { key: "TestBalance-AllItems-ForlornSkyflareDiamond" value: { - dps: 7132.16114 - tps: 6970.08515 + dps: 7331.02686 + tps: 7169.52178 } } dps_results: { key: "TestBalance-AllItems-ForlornStarflareDiamond" value: { - dps: 7123.66493 - tps: 6961.79715 + dps: 7322.39159 + tps: 7161.09471 } } dps_results: { key: "TestBalance-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-FuturesightRune-38763" value: { - dps: 7124.06995 - tps: 6959.77154 + dps: 7309.95081 + tps: 7146.12909 } } dps_results: { key: "TestBalance-AllItems-Gladiator'sSanctuary" value: { - dps: 4456.82852 - tps: 4296.98721 + dps: 4454.75051 + tps: 4294.49162 } } dps_results: { key: "TestBalance-AllItems-Gladiator'sWildhide" value: { - dps: 6739.82709 - tps: 6560.15318 + dps: 6736.67263 + tps: 6558.5556 } } dps_results: { key: "TestBalance-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 7232.62527 - tps: 7072.65485 + dps: 7421.3121 + tps: 7261.81838 } } dps_results: { key: "TestBalance-AllItems-IdoloftheCorruptor-45509" value: { - dps: 7232.62527 - tps: 7072.65485 + dps: 7421.3121 + tps: 7261.81838 } } dps_results: { key: "TestBalance-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 7538.35658 - tps: 7387.13349 + dps: 7681.29601 + tps: 7528.55382 } } dps_results: { key: "TestBalance-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 7299.84026 - tps: 7142.21136 + dps: 7499.57229 + tps: 7341.99545 } } dps_results: { key: "TestBalance-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 7232.62527 - tps: 7072.65485 + dps: 7421.3121 + tps: 7261.81838 } } dps_results: { key: "TestBalance-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 7232.62527 - tps: 7072.65485 + dps: 7421.3121 + tps: 7261.81838 } } dps_results: { key: "TestBalance-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7130.38996 - tps: 6970.41954 + dps: 7312.2951 + tps: 7152.80138 } } dps_results: { key: "TestBalance-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7126.59208 - tps: 6966.46541 + dps: 7307.56249 + tps: 7148.0408 } } dps_results: { key: "TestBalance-AllItems-IncisorFragment-37723" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7115.65796 - tps: 6962.09339 + dps: 7302.07675 + tps: 7148.33741 } } dps_results: { key: "TestBalance-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-LasherweaveBattlegear" value: { - dps: 4160.43435 - tps: 3995.14768 + dps: 4192.90733 + tps: 4027.21076 } } dps_results: { key: "TestBalance-AllItems-LasherweaveRegalia" value: { - dps: 8049.30097 - tps: 7894.47432 + dps: 8165.34573 + tps: 8013.60453 } } dps_results: { key: "TestBalance-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7091.09201 - tps: 6931.70213 + dps: 7276.61673 + tps: 7117.70354 } } dps_results: { key: "TestBalance-AllItems-Malfurion'sBattlegear" value: { - dps: 4688.54471 - tps: 4531.05932 + dps: 4676.98448 + tps: 4518.88512 } } dps_results: { key: "TestBalance-AllItems-Malfurion'sRegalia" value: { - dps: 6664.07564 - tps: 6497.9687 + dps: 6712.13957 + tps: 6547.99888 } } dps_results: { key: "TestBalance-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7112.10029 - tps: 6956.74458 + dps: 7278.20491 + tps: 7122.14318 } } dps_results: { key: "TestBalance-AllItems-NightsongBattlegear" value: { - dps: 4256.89728 - tps: 4092.43472 + dps: 4309.8446 + tps: 4145.68555 } } dps_results: { key: "TestBalance-AllItems-NightsongGarb" value: { - dps: 6440.54964 - tps: 6275.9739 + dps: 6507.37014 + tps: 6345.28665 } } dps_results: { key: "TestBalance-AllItems-OfferingofSacrifice-37638" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-PurifiedShardoftheGods" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-ReignoftheDead-47316" value: { - dps: 7487.31998 - tps: 7322.66037 + dps: 7631.54641 + tps: 7465.19807 } } dps_results: { key: "TestBalance-AllItems-ReignoftheDead-47477" value: { - dps: 7547.64462 - tps: 7382.23546 + dps: 7693.02497 + tps: 7525.92708 } } dps_results: { key: "TestBalance-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7283.48974 - tps: 7122.45479 + dps: 7489.25319 + tps: 7328.78914 } } dps_results: { key: "TestBalance-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7089.68009 - tps: 6928.57495 + dps: 7287.8505 + tps: 7127.11617 } } dps_results: { key: "TestBalance-AllItems-RuneofRepulsion-40372" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-Runetotem'sBattlegear" value: { - dps: 4688.54471 - tps: 4531.05932 + dps: 4676.98448 + tps: 4518.88512 } } dps_results: { key: "TestBalance-AllItems-Runetotem'sRegalia" value: { - dps: 6664.07564 - tps: 6497.9687 + dps: 6712.13957 + tps: 6547.99888 } } dps_results: { key: "TestBalance-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 7232.62527 - tps: 7072.65485 + dps: 7421.3121 + tps: 7261.81838 } } dps_results: { key: "TestBalance-AllItems-SealofthePantheon-36993" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-ShinyShardoftheGods" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-SparkofLife-37657" value: { - dps: 7091.54385 - tps: 6934.58016 + dps: 7226.53298 + tps: 7068.19786 } } dps_results: { key: "TestBalance-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-StormshroudArmor" value: { - dps: 4920.62764 - tps: 4758.28937 + dps: 4826.9373 + tps: 4660.93727 } } dps_results: { key: "TestBalance-AllItems-SwiftSkyflareDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-SwiftStarflareDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-SwiftWindfireDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-ThunderheartHarness" value: { - dps: 3251.5197 - tps: 3089.42966 + dps: 3253.19144 + tps: 3089.6034 } } dps_results: { key: "TestBalance-AllItems-ThunderheartRegalia" value: { - dps: 5001.99461 - tps: 4847.64796 + dps: 5062.66047 + tps: 4907.53192 } } dps_results: { key: "TestBalance-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7089.68009 - tps: 6928.64514 + dps: 7287.8505 + tps: 7127.38645 } } dps_results: { key: "TestBalance-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6988.67296 - tps: 6829.53537 + dps: 7172.75058 + tps: 7014.0897 } } dps_results: { key: "TestBalance-AllItems-TirelessSkyflareDiamond" value: { - dps: 7132.16114 - tps: 6970.08515 + dps: 7331.02686 + tps: 7169.52178 } } dps_results: { key: "TestBalance-AllItems-TirelessStarflareDiamond" value: { - dps: 7123.66493 - tps: 6961.79715 + dps: 7322.39159 + tps: 7161.09471 } } dps_results: { key: "TestBalance-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7123.66493 - tps: 6961.79715 + dps: 7322.39159 + tps: 7161.09471 } } dps_results: { key: "TestBalance-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7132.16114 - tps: 6970.08515 + dps: 7331.02686 + tps: 7169.52178 } } dps_results: { key: "TestBalance-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 4853.89478 - tps: 4689.91262 + dps: 4846.67071 + tps: 4680.90637 } } dps_results: { key: "TestBalance-AllItems-WingedTalisman-37844" value: { - dps: 7136.37815 - tps: 6962.83257 + dps: 7322.16721 + tps: 7149.09834 } } dps_results: { key: "TestBalance-Average-Default" value: { - dps: 7401.62418 - tps: 7244.13647 + dps: 7572.4413 + tps: 7414.50672 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-FullBuffs-LongMultiTarget" value: { - dps: 9314.79149 - tps: 11324.69264 + dps: 9548.61679 + tps: 11604.63828 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-FullBuffs-LongSingleTarget" value: { - dps: 7057.17295 - tps: 6897.54634 + dps: 7218.97416 + tps: 7059.21431 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-FullBuffs-ShortSingleTarget" value: { - dps: 8058.74016 - tps: 7529.18444 + dps: 8332.49414 + tps: 7800.05118 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-NoBuffs-LongMultiTarget" value: { - dps: 3924.54774 - tps: 4587.66811 + dps: 3853.34898 + tps: 4450.65732 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-NoBuffs-LongSingleTarget" value: { - dps: 2445.55908 - tps: 2360.55369 + dps: 2383.28293 + tps: 2291.05277 } } dps_results: { key: "TestBalance-Settings-Tauren-P1-Starfire-NoBuffs-ShortSingleTarget" value: { - dps: 4406.69191 - tps: 4146.02362 + dps: 4522.44334 + tps: 4259.67999 } } dps_results: { key: "TestBalance-SwitchInFrontOfTarget-Default" value: { - dps: 7295.53084 - tps: 7166.78616 + dps: 7484.12536 + tps: 7356.11732 } } diff --git a/sim/druid/balance/presets.go b/sim/druid/balance/presets.go index e06a9d828e..36d1552c24 100644 --- a/sim/druid/balance/presets.go +++ b/sim/druid/balance/presets.go @@ -86,10 +86,10 @@ var PlayerOptionsAOE = &proto.Player_BalanceDruid{ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40467, - "enchant": 44877, + "enchant": 3820, "gems": [ 41285, - 39998 + 42144 ] }, { @@ -100,26 +100,29 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40470, - "enchant": 44874, + "enchant": 3810, "gems": [ - 39998 + 42144 ] }, { - "id": 40405, - "enchant": 44472 + "id": 44005, + "enchant": 3859, + "gems": [ + 40026 + ] }, { "id": 40469, - "enchant": 44489, + "enchant": 3832, "gems": [ - 39998, - 40026 + 42144, + 39998 ] }, { "id": 44008, - "enchant": 44498, + "enchant": 2332, "gems": [ 39998, 0 @@ -127,7 +130,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40466, - "enchant": 54999, + "enchant": 3604, "gems": [ 39998, 0 @@ -135,18 +138,18 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40561, - "enchant": 54793, + "enchant": 3601, "gems": [ 39998 ] }, { "id": 40560, - "enchant": 41602 + "enchant": 3719 }, { - "id": 40558, - "enchant": 55016 + "id": 40519, + "enchant": 3606 }, { "id": 40399 @@ -162,7 +165,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40395, - "enchant": 44487 + "enchant": 3834 }, { "id": 40192 diff --git a/sim/druid/feral/presets.go b/sim/druid/feral/presets.go index 467d4cd869..580e419a2c 100644 --- a/sim/druid/feral/presets.go +++ b/sim/druid/feral/presets.go @@ -74,7 +74,7 @@ var FullConsumes = &proto.Consumes{ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40473, - "enchant": 44879, + "enchant": 3817, "gems": [ 41398, 39996 @@ -88,25 +88,25 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40494, - "enchant": 44871, + "enchant": 3808, "gems": [ 39996 ] }, { "id": 40403, - "enchant": 55002 + "enchant": 3605 }, { "id": 40539, - "enchant": 44489, + "enchant": 3832, "gems": [ 39996 ] }, { "id": 39765, - "enchant": 44484, + "enchant": 3845, "gems": [ 39996, 0 @@ -114,7 +114,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40541, - "enchant": 54999, + "enchant": 3604, "gems": [ 0 ] @@ -127,7 +127,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 44011, - "enchant": 38374, + "enchant": 3823, "gems": [ 39996, 49110 @@ -135,7 +135,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40243, - "enchant": 55016, + "enchant": 3606, "gems": [ 40014 ] @@ -154,7 +154,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40388, - "enchant": 44492 + "enchant": 3789 }, {}, { diff --git a/sim/druid/tank/presets.go b/sim/druid/tank/presets.go index da23001207..9de1d39cbe 100644 --- a/sim/druid/tank/presets.go +++ b/sim/druid/tank/presets.go @@ -52,7 +52,7 @@ var FullConsumes = &proto.Consumes{ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 34404, - "enchant": 29193, + "enchant": 3004, "gems": [ 32212, 25896 @@ -63,7 +63,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 34392, - "enchant": 28911, + "enchant": 2991, "gems": [ 32200, 32200 @@ -71,11 +71,11 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 34190, - "enchant": 34004 + "enchant": 368 }, { "id": 34211, - "enchant": 24003, + "enchant": 2661, "gems": [ 32200, 32200, @@ -84,7 +84,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 34444, - "enchant": 22533, + "enchant": 2649, "gems": [ 32200, 0 @@ -92,7 +92,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 34408, - "enchant": 33153, + "enchant": 2613, "gems": [ 32200, 32200, @@ -107,7 +107,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 34385, - "enchant": 29536, + "enchant": 3013, "gems": [ 32200, 32200, @@ -116,18 +116,18 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 34573, - "enchant": 35297, + "enchant": 2940, "gems": [ 32200 ] }, { "id": 34213, - "enchant": 22538 + "enchant": 2931 }, { "id": 34361, - "enchant": 22538 + "enchant": 2931 }, { "id": 32501 @@ -137,7 +137,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 30883, - "enchant": 22556 + "enchant": 2670 }, {}, { diff --git a/sim/hunter/TestHunter.results b/sim/hunter/TestHunter.results index 7b4996a139..bbeee54469 100644 --- a/sim/hunter/TestHunter.results +++ b/sim/hunter/TestHunter.results @@ -1,35 +1,35 @@ character_stats_results: { key: "TestHunter-CharacterStats-Default" value: { - final_stats: 345.4 - final_stats: 1713.712 - final_stats: 1506.45 - final_stats: 599.456 - final_stats: 262.9 + final_stats: 358.6 + final_stats: 1816.672 + final_stats: 1453.65 + final_stats: 613.184 + final_stats: 276.1 final_stats: 280 final_stats: 109 - final_stats: 238 - final_stats: 1108.67615 + final_stats: 232 + final_stats: 1188.45766 final_stats: 225 final_stats: 0 - final_stats: 5610.1232 - final_stats: 336.37 - final_stats: 2047.01368 + final_stats: 5760.9992 + final_stats: 330.37 + final_stats: 2179.73867 final_stats: 225 final_stats: 68 final_stats: 0 - final_stats: 13757.84 + final_stats: 13963.76 final_stats: 0 final_stats: 0 - final_stats: 13440.924 - final_stats: 5900.5848 + final_stats: 13646.844 + final_stats: 6052.0416 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 22388.5 + final_stats: 21860.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,875 +45,882 @@ character_stats_results: { dps_results: { key: "TestHunter-AllItems-Ahn'KaharBloodHunter'sBattlegear" value: { - dps: 7397.69767 - tps: 6416.55337 + dps: 7455.52347 + tps: 6477.24902 } } dps_results: { key: "TestHunter-AllItems-AshtongueTalismanofSwiftness-32487" value: { - dps: 6575.47874 - tps: 5573.00047 + dps: 6709.30083 + tps: 5705.77342 } } dps_results: { key: "TestHunter-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-Bandit'sInsignia-40371" value: { - dps: 6684.16823 - tps: 5675.26924 + dps: 6820.12988 + tps: 5810.22442 } } dps_results: { key: "TestHunter-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6640.37626 - tps: 5631.02783 + dps: 6769.23785 + tps: 5761.7449 } } dps_results: { key: "TestHunter-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 6540.25647 - tps: 5545.60101 + dps: 6678.68199 + tps: 5683.7721 } } dps_results: { key: "TestHunter-AllItems-BlackBowoftheBetrayer-32336" value: { - dps: 6233.23363 - tps: 5226.23801 + dps: 6380.31668 + tps: 5375.3281 } } dps_results: { key: "TestHunter-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5718.81053 - tps: 4852.59875 + dps: 5801.46196 + tps: 4939.62695 } } dps_results: { key: "TestHunter-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5498.21834 - tps: 4648.7498 + dps: 5587.0009 + tps: 4739.57661 } } dps_results: { key: "TestHunter-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6614.68143 - tps: 5494.77507 + dps: 6735.80842 + tps: 5612.41092 } } dps_results: { key: "TestHunter-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6770.58249 - tps: 5762.00789 + dps: 6891.42777 + tps: 5881.50624 } } dps_results: { key: "TestHunter-AllItems-CryptstalkerBattlegear" value: { - dps: 6167.82179 - tps: 5204.11719 + dps: 6230.05805 + tps: 5268.51937 } } dps_results: { key: "TestHunter-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6629.89779 - tps: 5633.2326 + dps: 6767.91783 + tps: 5769.01935 } } dps_results: { key: "TestHunter-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6670.6931 - tps: 5674.28609 + dps: 6802.05852 + tps: 5803.70529 } } dps_results: { key: "TestHunter-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 6651.11363 - tps: 5647.38461 + dps: 6789.566 + tps: 5784.65641 } } dps_results: { key: "TestHunter-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 6653.93091 - tps: 5650.2103 + dps: 6791.09396 + tps: 5786.18436 } } dps_results: { key: "TestHunter-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6601.97983 - tps: 5604.90027 + dps: 6742.63999 + tps: 5744.40133 } } dps_results: { key: "TestHunter-AllItems-Defender'sCode-40257" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6646.31231 - tps: 5637.73771 + dps: 6757.98309 + tps: 5748.06119 } } dps_results: { key: "TestHunter-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-EmberSkyflareDiamond" value: { - dps: 6615.76094 - tps: 5605.2716 + dps: 6736.12415 + tps: 5726.85286 } } dps_results: { key: "TestHunter-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6640.21003 - tps: 5631.63543 + dps: 6754.98816 + tps: 5745.06664 } } dps_results: { key: "TestHunter-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6634.91453 - tps: 5626.3351 + dps: 6749.8851 + tps: 5739.97914 } } dps_results: { key: "TestHunter-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6678.94354 - tps: 5682.57244 + dps: 6817.02815 + tps: 5818.71621 } } dps_results: { key: "TestHunter-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6611.41082 - tps: 5615.11199 + dps: 6746.621 + tps: 5748.32755 } } dps_results: { key: "TestHunter-AllItems-ForgeEmber-37660" value: { - dps: 6600.93528 - tps: 5603.9613 + dps: 6727.81459 + tps: 5729.53805 } } dps_results: { key: "TestHunter-AllItems-ForlornSkyflareDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-ForlornStarflareDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 + } +} +dps_results: { + key: "TestHunter-AllItems-FuryoftheFiveFlights-40431" + value: { + dps: 6840.71166 + tps: 5823.21029 } } dps_results: { key: "TestHunter-AllItems-FuturesightRune-38763" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-Gladiator'sPursuit" value: { - dps: 7009.93933 - tps: 6054.44481 + dps: 7089.33954 + tps: 6137.34138 } } dps_results: { key: "TestHunter-AllItems-Gronnstalker'sArmor" value: { - dps: 5225.54899 - tps: 4393.71529 + dps: 5277.37781 + tps: 4447.69197 } } dps_results: { key: "TestHunter-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6640.21003 - tps: 5631.63543 + dps: 6754.98816 + tps: 5745.06664 } } dps_results: { key: "TestHunter-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6634.91453 - tps: 5626.3351 + dps: 6749.8851 + tps: 5739.97914 } } dps_results: { key: "TestHunter-AllItems-IncisorFragment-37723" value: { - dps: 6675.15874 - tps: 5668.90652 + dps: 6811.32547 + tps: 5804.03081 } } dps_results: { key: "TestHunter-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6812.62535 - tps: 5810.85217 + dps: 6933.88411 + tps: 5931.53349 } } dps_results: { key: "TestHunter-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6638.70316 - tps: 5627.40728 + dps: 6760.2957 + tps: 5747.919 } } dps_results: { key: "TestHunter-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6528.75866 - tps: 5531.72893 + dps: 6659.36235 + tps: 5661.2845 } } dps_results: { key: "TestHunter-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6660.45593 - tps: 5662.8913 + dps: 6812.13896 + tps: 5817.77055 } } dps_results: { key: "TestHunter-AllItems-OfferingofSacrifice-37638" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6634.12759 - tps: 5623.32982 + dps: 6755.63146 + tps: 5743.75296 } } dps_results: { key: "TestHunter-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6638.70316 - tps: 5627.40728 + dps: 6760.2957 + tps: 5747.919 } } dps_results: { key: "TestHunter-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-PurifiedShardoftheGods" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-ReignoftheDead-47316" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-ReignoftheDead-47477" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6772.87093 - tps: 5762.79588 + dps: 6898.1791 + tps: 5886.91591 } } dps_results: { key: "TestHunter-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6603.5357 - tps: 5594.18603 + dps: 6742.56807 + tps: 5734.90974 } } dps_results: { key: "TestHunter-AllItems-RuneofRepulsion-40372" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-ScourgestalkerBattlegear" value: { - dps: 6432.84681 - tps: 5468.57414 + dps: 6500.74264 + tps: 5539.71364 } } dps_results: { key: "TestHunter-AllItems-SealofthePantheon-36993" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-ShinyShardoftheGods" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-SparkofLife-37657" value: { - dps: 6763.06315 - tps: 5761.13724 + dps: 6913.30828 + tps: 5909.21199 } } dps_results: { key: "TestHunter-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6617.21407 - tps: 5609.72126 + dps: 6751.24703 + tps: 5742.6884 } } dps_results: { key: "TestHunter-AllItems-StormshroudArmor" value: { - dps: 5312.97208 - tps: 4473.30836 + dps: 5402.36165 + tps: 4565.77024 } } dps_results: { key: "TestHunter-AllItems-SwiftSkyflareDiamond" value: { - dps: 6638.70316 - tps: 5627.40728 + dps: 6760.2957 + tps: 5747.919 } } dps_results: { key: "TestHunter-AllItems-SwiftStarflareDiamond" value: { - dps: 6634.12759 - tps: 5623.32982 + dps: 6755.63146 + tps: 5743.75296 } } dps_results: { key: "TestHunter-AllItems-SwiftWindfireDiamond" value: { - dps: 6626.12035 - tps: 5616.19427 + dps: 6747.46903 + tps: 5736.4624 } } dps_results: { key: "TestHunter-AllItems-TheFistsofFury" value: { - dps: 6461.66808 - tps: 5471.52866 + dps: 6590.76038 + tps: 5600.79855 } } dps_results: { key: "TestHunter-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6677.39306 - tps: 5667.91597 + dps: 6821.46764 + tps: 5810.09984 } } dps_results: { key: "TestHunter-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6524.94912 - tps: 5527.91098 + dps: 6658.10029 + tps: 5660.02244 } } dps_results: { key: "TestHunter-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6524.94912 - tps: 5527.91098 + dps: 6658.10029 + tps: 5660.02244 } } dps_results: { key: "TestHunter-AllItems-TirelessSkyflareDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-TirelessStarflareDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6614.68143 - tps: 5606.00062 + dps: 6735.80842 + tps: 5726.0473 } } dps_results: { key: "TestHunter-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5663.61207 - tps: 4799.98538 + dps: 5736.57143 + tps: 4876.48528 } } dps_results: { key: "TestHunter-AllItems-Windrunner'sPursuit" value: { - dps: 6835.75225 - tps: 5839.53664 + dps: 6892.53137 + tps: 5900.2969 } } dps_results: { key: "TestHunter-AllItems-WingedTalisman-37844" value: { - dps: 6524.68924 - tps: 5527.6511 + dps: 6657.85008 + tps: 5659.77222 } } dps_results: { key: "TestHunter-AllItems-Zod'sRepeatingLongbow-50034" value: { - dps: 7324.7212 - tps: 6321.29652 + dps: 7470.43756 + tps: 6464.10618 } } dps_results: { key: "TestHunter-AllItems-Zod'sRepeatingLongbow-50638" value: { - dps: 7514.46517 - tps: 6506.81801 + dps: 7670.71536 + tps: 6664.31092 } } dps_results: { key: "TestHunter-Average-Default" value: { - dps: 6783.47253 - tps: 5779.83979 + dps: 6924.64007 + tps: 5920.41632 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-AOE-FullBuffs-LongMultiTarget" value: { - dps: 16713.19161 - tps: 16630.40237 + dps: 16892.12552 + tps: 16824.57671 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-AOE-FullBuffs-LongSingleTarget" value: { - dps: 6895.21486 - tps: 5808.56142 + dps: 7038.52543 + tps: 5955.42755 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 7683.84618 - tps: 6420.77234 + dps: 7866.58153 + tps: 6600.52879 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-AOE-NoBuffs-LongMultiTarget" value: { - dps: 9396.397 - tps: 10480.16967 + dps: 9516.70156 + tps: 10596.34837 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-AOE-NoBuffs-LongSingleTarget" value: { - dps: 3397.76395 - tps: 3046.44592 + dps: 3476.05816 + tps: 3126.2939 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 4095.34175 - tps: 3650.87792 + dps: 4188.27241 + tps: 3743.36226 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-BM-FullBuffs-LongMultiTarget" value: { - dps: 6207.80676 - tps: 4726.20029 + dps: 6287.55064 + tps: 4801.28163 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-BM-FullBuffs-LongSingleTarget" value: { - dps: 6207.80676 - tps: 3792.96898 + dps: 6287.55064 + tps: 3874.18029 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-BM-FullBuffs-ShortSingleTarget" value: { - dps: 7584.47832 - tps: 4622.50714 + dps: 7732.55942 + tps: 4756.9111 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-BM-NoBuffs-LongMultiTarget" value: { - dps: 3003.06865 - tps: 3674.03065 + dps: 3038.38591 + tps: 3702.63928 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-BM-NoBuffs-LongSingleTarget" value: { - dps: 3003.06865 - tps: 2172.02963 + dps: 3038.38591 + tps: 2205.09737 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-BM-NoBuffs-ShortSingleTarget" value: { - dps: 3527.96685 - tps: 2525.11997 + dps: 3657.36217 + tps: 2641.96717 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-Marksman-FullBuffs-LongMultiTarget" value: { - dps: 6458.49769 - tps: 6352.0061 + dps: 6608.69773 + tps: 6488.41641 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-Marksman-FullBuffs-LongSingleTarget" value: { - dps: 6458.49769 - tps: 5501.70422 + dps: 6608.69773 + tps: 5650.42873 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-Marksman-FullBuffs-ShortSingleTarget" value: { - dps: 7556.86943 - tps: 6453.59216 + dps: 7716.83676 + tps: 6609.62215 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-Marksman-NoBuffs-LongMultiTarget" value: { - dps: 3454.39891 - tps: 4579.05514 + dps: 3521.16577 + tps: 4644.71762 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-Marksman-NoBuffs-LongSingleTarget" value: { - dps: 3454.39891 - tps: 3117.43732 + dps: 3521.16577 + tps: 3185.89525 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-Marksman-NoBuffs-ShortSingleTarget" value: { - dps: 4240.91293 - tps: 3791.06833 + dps: 4390.69202 + tps: 3935.46215 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-SV-FullBuffs-LongMultiTarget" value: { - dps: 6831.29352 - tps: 6725.38521 + dps: 6958.9477 + tps: 6871.27738 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-SV-FullBuffs-LongSingleTarget" value: { - dps: 6831.29352 - tps: 5738.99747 + dps: 6958.9477 + tps: 5869.49541 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-SV-FullBuffs-ShortSingleTarget" value: { - dps: 7615.28317 - tps: 6354.64208 + dps: 7797.38524 + tps: 6533.89405 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-SV-NoBuffs-LongMultiTarget" value: { - dps: 3379.77993 - tps: 4536.75906 + dps: 3457.48683 + tps: 4612.20713 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-SV-NoBuffs-LongSingleTarget" value: { - dps: 3379.77993 - tps: 3030.80186 + dps: 3457.48683 + tps: 3110.09361 } } dps_results: { key: "TestHunter-Settings-Dwarf-P1-SV-NoBuffs-ShortSingleTarget" value: { - dps: 4057.24391 - tps: 3603.98991 + dps: 4130.32853 + tps: 3678.34161 } } dps_results: { key: "TestHunter-Settings-Orc-P1-AOE-FullBuffs-LongMultiTarget" value: { - dps: 16799.79672 - tps: 16650.56581 + dps: 16993.72831 + tps: 16860.37111 } } dps_results: { key: "TestHunter-Settings-Orc-P1-AOE-FullBuffs-LongSingleTarget" value: { - dps: 6946.48512 - tps: 5799.14924 + dps: 7083.04235 + tps: 5939.83198 } } dps_results: { key: "TestHunter-Settings-Orc-P1-AOE-FullBuffs-ShortSingleTarget" value: { - dps: 7787.50214 - tps: 6450.28878 + dps: 7950.28191 + tps: 6609.63858 } } dps_results: { key: "TestHunter-Settings-Orc-P1-AOE-NoBuffs-LongMultiTarget" value: { - dps: 9441.30416 - tps: 10504.07391 + dps: 9559.86907 + tps: 10616.77235 } } dps_results: { key: "TestHunter-Settings-Orc-P1-AOE-NoBuffs-LongSingleTarget" value: { - dps: 3416.34046 - tps: 3042.07056 + dps: 3486.35439 + tps: 3113.8414 } } dps_results: { key: "TestHunter-Settings-Orc-P1-AOE-NoBuffs-ShortSingleTarget" value: { - dps: 4131.1136 - tps: 3659.28699 + dps: 4239.29478 + tps: 3767.3323 } } dps_results: { key: "TestHunter-Settings-Orc-P1-BM-FullBuffs-LongMultiTarget" value: { - dps: 6327.32512 - tps: 4711.2569 + dps: 6413.88856 + tps: 4791.07289 } } dps_results: { key: "TestHunter-Settings-Orc-P1-BM-FullBuffs-LongSingleTarget" value: { - dps: 6327.32512 - tps: 3784.29846 + dps: 6413.88856 + tps: 3870.38718 } } dps_results: { key: "TestHunter-Settings-Orc-P1-BM-FullBuffs-ShortSingleTarget" value: { - dps: 7773.49255 - tps: 4638.67463 + dps: 7921.61958 + tps: 4770.13229 } } dps_results: { key: "TestHunter-Settings-Orc-P1-BM-NoBuffs-LongMultiTarget" value: { - dps: 3031.39843 - tps: 3651.77864 + dps: 3085.49264 + tps: 3699.2552 } } dps_results: { key: "TestHunter-Settings-Orc-P1-BM-NoBuffs-LongSingleTarget" value: { - dps: 3031.39843 - tps: 2150.93103 + dps: 3085.49264 + tps: 2198.95549 } } dps_results: { key: "TestHunter-Settings-Orc-P1-BM-NoBuffs-ShortSingleTarget" value: { - dps: 3589.27592 - tps: 2524.1893 + dps: 3668.23844 + tps: 2598.10967 } } dps_results: { key: "TestHunter-Settings-Orc-P1-Marksman-FullBuffs-LongMultiTarget" value: { - dps: 6506.43918 - tps: 6346.6892 + dps: 6635.6706 + tps: 6466.67756 } } dps_results: { key: "TestHunter-Settings-Orc-P1-Marksman-FullBuffs-LongSingleTarget" value: { - dps: 6506.43918 - tps: 5496.30759 + dps: 6635.6706 + tps: 5624.58379 } } dps_results: { key: "TestHunter-Settings-Orc-P1-Marksman-FullBuffs-ShortSingleTarget" value: { - dps: 7627.07323 - tps: 6457.5971 + dps: 7774.77525 + tps: 6601.32881 } } dps_results: { key: "TestHunter-Settings-Orc-P1-Marksman-NoBuffs-LongMultiTarget" value: { - dps: 3457.35668 - tps: 4563.91965 + dps: 3548.09657 + tps: 4645.19089 } } dps_results: { key: "TestHunter-Settings-Orc-P1-Marksman-NoBuffs-LongSingleTarget" value: { - dps: 3457.35668 - tps: 3097.92038 + dps: 3548.09657 + tps: 3187.93445 } } dps_results: { key: "TestHunter-Settings-Orc-P1-Marksman-NoBuffs-ShortSingleTarget" value: { - dps: 4270.5338 - tps: 3792.53979 + dps: 4421.32658 + tps: 3938.69206 } } dps_results: { key: "TestHunter-Settings-Orc-P1-SV-FullBuffs-LongMultiTarget" value: { - dps: 6866.20432 - tps: 6698.34481 + dps: 7012.33645 + tps: 6857.11498 } } dps_results: { key: "TestHunter-Settings-Orc-P1-SV-FullBuffs-LongSingleTarget" value: { - dps: 6866.20432 - tps: 5713.54153 + dps: 7012.33645 + tps: 5862.25899 } } dps_results: { key: "TestHunter-Settings-Orc-P1-SV-FullBuffs-ShortSingleTarget" value: { - dps: 7697.17357 - tps: 6362.5509 + dps: 7887.03362 + tps: 6549.18662 } } dps_results: { key: "TestHunter-Settings-Orc-P1-SV-NoBuffs-LongMultiTarget" value: { - dps: 3392.72053 - tps: 4529.85616 + dps: 3467.28667 + tps: 4604.59766 } } dps_results: { key: "TestHunter-Settings-Orc-P1-SV-NoBuffs-LongSingleTarget" value: { - dps: 3392.72053 - tps: 3020.85735 + dps: 3467.28667 + tps: 3097.30287 } } dps_results: { key: "TestHunter-Settings-Orc-P1-SV-NoBuffs-ShortSingleTarget" value: { - dps: 4069.9471 - tps: 3590.07913 + dps: 4170.16284 + tps: 3690.84168 } } dps_results: { key: "TestHunter-SwitchInFrontOfTarget-Default" value: { - dps: 6733.86777 - tps: 5784.29168 + dps: 6874.81088 + tps: 5926.70726 } } diff --git a/sim/hunter/presets.go b/sim/hunter/presets.go index 5406e44416..1a6b381ff4 100644 --- a/sim/hunter/presets.go +++ b/sim/hunter/presets.go @@ -182,69 +182,70 @@ var FullConsumes = &proto.Consumes{ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40505, - "enchant": 44879, + "enchant": 3817, "gems": [ 41398, - 40023 + 42143 ] }, { "id": 44664, "gems": [ - 40023 + 42143 ] }, { "id": 40507, - "enchant": 44871, + "enchant": 3808, "gems": [ 39997 ] }, { "id": 40403, - "enchant": 55002 + "enchant": 3605 }, { "id": 43998, - "enchant": 44623, + "enchant": 3832, "gems": [ - 39997, - 40023 + 42143, + 39997 ] }, { "id": 40282, - "enchant": 60616, + "enchant": 3845, "gems": [ - 40086, + 39997, 0 ] }, { "id": 40541, - "enchant": 54999, + "enchant": 3604, "gems": [ 0 ] }, { "id": 39762, + "enchant": 3601, "gems": [ 39997 ] }, { "id": 40331, - "enchant": 38374, + "enchant": 3823, "gems": [ 39997, - 40023 + 49110 ] }, { "id": 40549, - "enchant": 55016 + "enchant": 3606 }, { "id": 40074 @@ -253,17 +254,18 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ "id": 40474 }, { - "id": 40431 + "id": 40684 }, { "id": 44253 }, { "id": 40388, - "enchant": 44630 + "enchant": 3827 }, + {}, { "id": 40385, - "enchant": 41167 + "enchant": 3608 } ]}`) diff --git a/sim/mage/presets.go b/sim/mage/presets.go index 750e4362c4..a1733f52b3 100644 --- a/sim/mage/presets.go +++ b/sim/mage/presets.go @@ -185,98 +185,97 @@ var FullArcaneConsumes = FullFireConsumes var P1ArcaneGear = items.EquipmentSpecFromJsonString(`{"items": [ { - "id": 40416, - "enchant": 44877, - "gems": [ - 41285, - 39998 - ] + "id": 40416, + "enchant": 3820, + "gems": [ + 41285, + 39998 + ] }, { - "id": 44661, - "gems": [ - 40026 - ] + "id": 44661, + "gems": [ + 40026 + ] }, { - "id": 40419, - "enchant": 44874, - "gems": [ - 40051 - ] + "id": 40419, + "enchant": 3810, + "gems": [ + 40051 + ] }, { - "id": 44005, - "enchant": 55642, - "gems": [ - 40026 - ] + "id": 44005, + "enchant": 3722, + "gems": [ + 40026 + ] }, { - "id": 44002, - "enchant": 44489, - "gems": [ - 39998, - 39998 - ] + "id": 44002, + "enchant": 3832, + "gems": [ + 39998, + 39998 + ] }, { - "id": 44008, - "enchant": 44498, - "gems": [ - 39998, - 0 - ] + "id": 44008, + "enchant": 2332, + "gems": [ + 39998, + 0 + ] }, { - "id": 40415, - "enchant": 54999, - "gems": [ - 39998, - 0 - ] + "id": 40415, + "enchant": 3604, + "gems": [ + 39998, + 0 + ] }, { - "id": 40561, - "gems": [ - 39998 - ] + "id": 40561, + "gems": [ + 39998 + ] }, { - "id": 40417, - "enchant": 41602, - "gems": [ - 39998, - 40051 - ] + "id": 40417, + "enchant": 3719, + "gems": [ + 39998, + 40051 + ] }, { - "id": 40558, - "enchant": 55016 + "id": 40558, + "enchant": 3606 }, { - "id": 40719 + "id": 40719 }, { - "id": 40399 + "id": 40399 }, { - "id": 39229 + "id": 39229 }, { - "id": 40255 + "id": 40255 }, { - "id": 40396, - "enchant": 44487 + "id": 40396, + "enchant": 3834 }, { - "id": 40273 + "id": 40273 }, { - "id": 39426 + "id": 39426 } - ] -}`) +]}`) var P1FrostGear = P1ArcaneGear var P1FireGear = P1ArcaneGear diff --git a/sim/paladin/protection/presets.go b/sim/paladin/protection/presets.go index 68c158f868..02f2246836 100644 --- a/sim/paladin/protection/presets.go +++ b/sim/paladin/protection/presets.go @@ -62,95 +62,95 @@ var FullConsumes = &proto.Consumes{ } var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40581, - "enchant": 44878, - "gems": [ - 41396, - 36767 - ] - }, - { - "id": 40387 - }, - { - "id": 40584, - "enchant": 44957, - "gems": [ - 49110 - ] - }, - { - "id": 40410, - "enchant": 55002 - }, - { - "id": 40579, - "enchant": 44489, - "gems": [ - 36767, - 40022 - ] - }, - { - "id": 39764, - "enchant": 44944, - "gems": [ - 0 - ] - }, - { - "id": 40580, - "enchant": 63770, - "gems": [ - 40008, - 0 - ] - }, - { - "id": 39759, - "enchant": 54793, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 40589, - "enchant": 38373 - }, - { - "id": 39717, - "enchant": 55016, - "gems": [ - 40089 - ] - }, - { - "id": 40718 - }, - { - "id": 40107 - }, - { - "id": 44063, - "gems": [ - 36767, - 40089 - ] - }, - { - "id": 37220 - }, - { - "id": 40345, - "enchant": 44496 - }, - { - "id": 40400, - "enchant": 44936 - }, - { - "id": 40707 - } - ]}`) + { + "id": 40581, + "enchant": 3818, + "gems": [ + 41396, + 36767 + ] + }, + { + "id": 40387 + }, + { + "id": 40584, + "enchant": 3852, + "gems": [ + 49110 + ] + }, + { + "id": 40410, + "enchant": 3605 + }, + { + "id": 40579, + "enchant": 3832, + "gems": [ + 36767, + 40022 + ] + }, + { + "id": 39764, + "enchant": 3850, + "gems": [ + 0 + ] + }, + { + "id": 40580, + "enchant": 3860, + "gems": [ + 40008, + 0 + ] + }, + { + "id": 39759, + "enchant": 3601, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 40589, + "enchant": 3822 + }, + { + "id": 39717, + "enchant": 3606, + "gems": [ + 40089 + ] + }, + { + "id": 40718 + }, + { + "id": 40107 + }, + { + "id": 44063, + "gems": [ + 36767, + 40089 + ] + }, + { + "id": 37220 + }, + { + "id": 40345, + "enchant": 3788 + }, + { + "id": 40400, + "enchant": 3849 + }, + { + "id": 40707 + } +]}`) diff --git a/sim/paladin/retribution/presets.go b/sim/paladin/retribution/presets.go index 6ed3fa8c84..75312a692d 100644 --- a/sim/paladin/retribution/presets.go +++ b/sim/paladin/retribution/presets.go @@ -77,7 +77,7 @@ var FullConsumes = &proto.Consumes{ var Phase1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40576, - "enchant": 44879, + "enchant": 3817, "gems": [ 41398, 40037 @@ -91,18 +91,18 @@ var Phase1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40578, - "enchant": 44871, + "enchant": 3808, "gems": [ 49110 ] }, { "id": 40403, - "enchant": 55002 + "enchant": 3605 }, { "id": 40574, - "enchant": 44489, + "enchant": 3832, "gems": [ 42142, 39996 @@ -110,14 +110,14 @@ var Phase1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40186, - "enchant": 44484, + "enchant": 3845, "gems": [ 0 ] }, { "id": 40541, - "enchant": 54999, + "enchant": 3604, "gems": [ 0 ] @@ -130,7 +130,7 @@ var Phase1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40577, - "enchant": 38374, + "enchant": 3823, "gems": [ 42142, 40038 @@ -138,7 +138,7 @@ var Phase1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 39701, - "enchant": 55016 + "enchant": 3606 }, { "id": 40075 @@ -154,7 +154,7 @@ var Phase1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40384, - "enchant": 44492 + "enchant": 3789 }, {}, { diff --git a/sim/priest/healing/presets.go b/sim/priest/healing/presets.go index d6137bf82e..2c919334ec 100644 --- a/sim/priest/healing/presets.go +++ b/sim/priest/healing/presets.go @@ -113,7 +113,7 @@ var PlayerOptionsHoly = &proto.Player_HealingPriest{ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40456, - "enchant": 44876, + "enchant": 3819, "gems": [ 41401, 39998 @@ -127,32 +127,32 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40450, - "enchant": 44872, + "enchant": 3809, "gems": [ 42144 ] }, { "id": 40724, - "enchant": 63765 + "enchant": 3859 }, { "id": 40194, - "enchant": 44489, + "enchant": 3832, "gems": [ 42144 ] }, { "id": 40741, - "enchant": 44498, + "enchant": 2332, "gems": [ 0 ] }, { "id": 40445, - "enchant": 44592, + "enchant": 3246, "gems": [ 42144, 0 @@ -160,7 +160,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40271, - "enchant": 54793, + "enchant": 3601, "gems": [ 40027, 39998 @@ -168,7 +168,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40398, - "enchant": 41602, + "enchant": 3719, "gems": [ 39998, 39998 @@ -176,7 +176,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40236, - "enchant": 55016 + "enchant": 3606 }, { "id": 40108 @@ -192,7 +192,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40395, - "enchant": 44487 + "enchant": 3834 }, { "id": 40350 diff --git a/sim/priest/shadow/presets.go b/sim/priest/shadow/presets.go index 8c65ca7c07..679ce46e1b 100644 --- a/sim/priest/shadow/presets.go +++ b/sim/priest/shadow/presets.go @@ -83,7 +83,7 @@ var PlayerOptionsIdeal = &proto.Player_ShadowPriest{ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40562, - "enchant": 44877, + "enchant": 3820, "gems": [ 41285, 39998 @@ -97,21 +97,21 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40459, - "enchant": 44874, + "enchant": 3810, "gems": [ 39998 ] }, { "id": 44005, - "enchant": 55642, + "enchant": 3722, "gems": [ 40026 ] }, { "id": 44002, - "enchant": 33990, + "enchant": 1144, "gems": [ 39998, 39998 @@ -119,7 +119,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 44008, - "enchant": 44498, + "enchant": 2332, "gems": [ 39998, 0 @@ -127,7 +127,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40454, - "enchant": 54999, + "enchant": 3604, "gems": [ 40049, 0 @@ -141,11 +141,11 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40560, - "enchant": 41602 + "enchant": 3719 }, { "id": 40558, - "enchant": 55016 + "enchant": 3606 }, { "id": 40719 @@ -161,7 +161,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40395, - "enchant": 44487 + "enchant": 3834 }, { "id": 40273 diff --git a/sim/priest/smite/TestSmite.results b/sim/priest/smite/TestSmite.results index f07d79d2bd..048f214d0e 100644 --- a/sim/priest/smite/TestSmite.results +++ b/sim/priest/smite/TestSmite.results @@ -3,25 +3,25 @@ character_stats_results: { value: { final_stats: 293.7 final_stats: 299.2 - final_stats: 1357.356 - final_stats: 1230.845 - final_stats: 557.0565 - final_stats: 2697.26413 + final_stats: 1444.3 + final_stats: 1350.9441 + final_stats: 723.5613 + final_stats: 2937.89033 final_stats: 128 - final_stats: 500 - final_stats: 1324.25696 - final_stats: 489 + final_stats: 346 + final_stats: 1035.33945 + final_stats: 625 final_stats: 0 final_stats: 843.7 - final_stats: 500 - final_stats: 790.55 - final_stats: 489 + final_stats: 346 + final_stats: 468.55 + final_stats: 625 final_stats: 0 final_stats: 0 - final_stats: 22045.675 + final_stats: 23847.1615 final_stats: 0 final_stats: 0 - final_stats: 8930.9 + final_stats: 8943.9 final_stats: 843.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 20533.56 + final_stats: 21403 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,581 +45,574 @@ character_stats_results: { dps_results: { key: "TestSmite-AllItems-AbsolutionRegalia" value: { - dps: 2140.23405 - tps: 1839.53113 + dps: 2360.97864 + tps: 2018.46677 } } dps_results: { key: "TestSmite-AllItems-AshtongueTalismanofAcumen-32490" value: { - dps: 2892.58605 - tps: 2459.99221 + dps: 3401.2681 + tps: 2883.36752 } } dps_results: { key: "TestSmite-AllItems-AustereEarthsiegeDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-Bandit'sInsignia-40371" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 2996.62048 - tps: 2555.04068 + dps: 3500.17321 + tps: 2965.1016 } } dps_results: { key: "TestSmite-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 2352.14375 - tps: 2010.90599 + dps: 2676.67448 + tps: 2282.02723 } } dps_results: { key: "TestSmite-AllItems-BracingEarthsiegeDiamond" value: { - dps: 2992.97843 - tps: 2502.16278 + dps: 3483.56512 + tps: 2892.17269 } } dps_results: { key: "TestSmite-AllItems-ChaoticSkyflareDiamond" value: { - dps: 3005.99074 - tps: 2562.41541 + dps: 3496.72949 + tps: 2962.74861 } } dps_results: { key: "TestSmite-AllItems-CrimsonAcolyte'sRaiment" value: { - dps: 3290.55687 - tps: 2800.45114 + dps: 3556.76528 + tps: 3013.5276 } } dps_results: { key: "TestSmite-AllItems-CrimsonAcolyte'sRegalia" value: { - dps: 3020.27046 - tps: 2571.56672 + dps: 3446.8942 + tps: 2921.22609 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 2873.33999 - tps: 2443.36503 + dps: 3385.44987 + tps: 2869.81146 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Death-42990" value: { - dps: 2932.93232 - tps: 2502.73158 + dps: 3444.41379 + tps: 2927.58046 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 2758.87383 - tps: 2347.18938 + dps: 3209.15284 + tps: 2718.13012 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 2758.87383 - tps: 2347.18938 + dps: 3209.15284 + tps: 2718.13012 } } dps_results: { key: "TestSmite-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 2846.34792 - tps: 2416.68801 + dps: 3303.07549 + tps: 2793.90074 } } dps_results: { key: "TestSmite-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 2863.82369 - tps: 2435.15104 + dps: 3371.11507 + tps: 2858.53342 } } dps_results: { key: "TestSmite-AllItems-Defender'sCode-40257" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-DestructiveSkyflareDiamond" value: { - dps: 2975.94448 - tps: 2537.77608 + dps: 3464.66918 + tps: 2936.187 } } dps_results: { key: "TestSmite-AllItems-EffulgentSkyflareDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-EmberSkyflareDiamond" value: { - dps: 3014.10335 - tps: 2569.25185 + dps: 3513.57959 + tps: 2975.23511 } } dps_results: { key: "TestSmite-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 2976.03327 - tps: 2537.60166 + dps: 3464.96963 + tps: 2936.5039 } } dps_results: { key: "TestSmite-AllItems-EnigmaticStarflareDiamond" value: { - dps: 2976.03327 - tps: 2537.60166 + dps: 3459.53039 + tps: 2931.68885 } } dps_results: { key: "TestSmite-AllItems-EternalEarthsiegeDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 2913.81339 - tps: 2485.75801 + dps: 3423.43627 + tps: 2912.42916 } } dps_results: { key: "TestSmite-AllItems-EyeoftheBroodmother-45308" value: { - dps: 2961.99606 - tps: 2515.63077 + dps: 3484.84537 + tps: 2951.92842 } } dps_results: { key: "TestSmite-AllItems-ForgeEmber-37660" value: { - dps: 2926.61845 - tps: 2488.35722 + dps: 3446.94458 + tps: 2922.80541 } } dps_results: { key: "TestSmite-AllItems-ForlornSkyflareDiamond" value: { - dps: 2992.97843 - tps: 2551.94485 + dps: 3483.56512 + tps: 2950.00062 } } dps_results: { key: "TestSmite-AllItems-ForlornStarflareDiamond" value: { - dps: 2989.18404 - tps: 2548.81984 + dps: 3479.67751 + tps: 2946.80276 } } dps_results: { key: "TestSmite-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-FuturesightRune-38763" value: { - dps: 2914.73396 - tps: 2477.33074 + dps: 3385.66169 + tps: 2869.39532 } } dps_results: { key: "TestSmite-AllItems-GarbofFaith" value: { - dps: 2688.80023 - tps: 2300.29874 + dps: 3010.05993 + tps: 2564.0394 } } dps_results: { key: "TestSmite-AllItems-Gladiator'sInvestiture" value: { - dps: 3370.4124 - tps: 2866.43478 + dps: 3629.48368 + tps: 3079.10505 } } dps_results: { key: "TestSmite-AllItems-Gladiator'sRaiment" value: { - dps: 2985.87875 - tps: 2547.12516 - } -} -dps_results: { - key: "TestSmite-AllItems-IllustrationoftheDragonSoul-40432" - value: { - dps: 2995.58637 - tps: 2543.99244 + dps: 3263.06653 + tps: 2769.81194 } } dps_results: { key: "TestSmite-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 2976.03327 - tps: 2537.60166 + dps: 3464.96963 + tps: 2936.5039 } } dps_results: { key: "TestSmite-AllItems-ImpassiveStarflareDiamond" value: { - dps: 2976.03327 - tps: 2537.60166 + dps: 3459.53039 + tps: 2931.68885 } } dps_results: { key: "TestSmite-AllItems-IncisorFragment-37723" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 3054.93532 - tps: 2607.39238 + dps: 3578.26025 + tps: 3032.29292 } } dps_results: { key: "TestSmite-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-MajesticDragonFigurine-40430" value: { - dps: 3043.43459 - tps: 2586.45531 + dps: 3582.05066 + tps: 3029.01175 } } dps_results: { key: "TestSmite-AllItems-MeteoriteWhetstone-37390" value: { - dps: 2868.91783 - tps: 2439.1938 + dps: 3382.5936 + tps: 2868.30433 } } dps_results: { key: "TestSmite-AllItems-OfferingofSacrifice-37638" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-PersistentEarthshatterDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-PurifiedShardoftheGods" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-RegaliaofFaith" value: { - dps: 2717.52502 - tps: 2324.25414 + dps: 3000.96533 + tps: 2558.93246 } } dps_results: { key: "TestSmite-AllItems-ReignoftheDead-47316" value: { - dps: 3105.92289 - tps: 2655.48168 + dps: 3578.08589 + tps: 3050.00882 } } dps_results: { key: "TestSmite-AllItems-ReignoftheDead-47477" value: { - dps: 3134.89142 - tps: 2682.10753 + dps: 3606.94351 + tps: 3076.37633 } } dps_results: { key: "TestSmite-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 3003.8291 - tps: 2561.01757 + dps: 3495.52273 + tps: 2959.91864 } } dps_results: { key: "TestSmite-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 2978.66067 - tps: 2538.47897 + dps: 3481.42155 + tps: 2947.49549 } } dps_results: { key: "TestSmite-AllItems-RuneofRepulsion-40372" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-SanctificationGarb" value: { - dps: 2820.60003 - tps: 2409.59071 + dps: 3157.93433 + tps: 2689.1634 } } dps_results: { key: "TestSmite-AllItems-SanctificationRegalia" value: { - dps: 2862.06577 - tps: 2444.04958 + dps: 3137.29805 + tps: 2668.14297 } } dps_results: { key: "TestSmite-AllItems-SealofthePantheon-36993" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-ShinyShardoftheGods" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3361.20904 + tps: 2850.22476 } } dps_results: { key: "TestSmite-AllItems-SparkofLife-37657" value: { - dps: 2885.76868 - tps: 2453.96732 + dps: 3386.55793 + tps: 2868.92806 } } dps_results: { key: "TestSmite-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3384.39971 + tps: 2871.13376 } } dps_results: { key: "TestSmite-AllItems-SwiftSkyflareDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-SwiftStarflareDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-SwiftWindfireDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-ThunderingSkyflareDiamond" value: { - dps: 2974.00646 - tps: 2536.31978 + dps: 3464.12704 + tps: 2934.01132 } } dps_results: { key: "TestSmite-AllItems-TinyAbominationinaJar-50351" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3384.39971 + tps: 2871.13376 } } dps_results: { key: "TestSmite-AllItems-TinyAbominationinaJar-50706" value: { - dps: 2854.46339 - tps: 2428.21344 + dps: 3384.39971 + tps: 2871.13376 } } dps_results: { key: "TestSmite-AllItems-TirelessSkyflareDiamond" value: { - dps: 2992.97843 - tps: 2551.94485 + dps: 3483.56512 + tps: 2950.00062 } } dps_results: { key: "TestSmite-AllItems-TirelessStarflareDiamond" value: { - dps: 2989.18404 - tps: 2548.81984 + dps: 3479.67751 + tps: 2946.80276 } } dps_results: { key: "TestSmite-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 2989.18404 - tps: 2548.81984 + dps: 3479.67751 + tps: 2946.80276 } } dps_results: { key: "TestSmite-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 2992.97843 - tps: 2551.94485 + dps: 3483.56512 + tps: 2950.00062 } } dps_results: { key: "TestSmite-AllItems-VestmentsofAbsolution" value: { - dps: 2076.98628 - tps: 1782.41972 + dps: 2279.14279 + tps: 1948.5768 } } dps_results: { key: "TestSmite-AllItems-WingedTalisman-37844" value: { - dps: 2907.92399 - tps: 2473.83745 + dps: 3417.65338 + tps: 2898.21783 } } dps_results: { key: "TestSmite-AllItems-Zabra'sRaiment" value: { - dps: 3013.82461 - tps: 2571.35177 + dps: 3305.95852 + tps: 2807.3047 } } dps_results: { key: "TestSmite-AllItems-Zabra'sRegalia" value: { - dps: 2937.48787 - tps: 2509.27922 + dps: 3465.86848 + tps: 2939.85965 } } dps_results: { key: "TestSmite-Average-Default" value: { - dps: 2981.903 - tps: 2542.26486 + dps: 3533.53586 + tps: 2993.0726 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 2748.95418 - tps: 3548.58876 + dps: 3225.32342 + tps: 3866.49618 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 2748.95418 - tps: 2355.44807 + dps: 3225.32342 + tps: 2743.88931 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 3706.00124 - tps: 3176.45241 + dps: 4213.03385 + tps: 3625.46677 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 877.24551 - tps: 1221.62791 + dps: 1073.43868 + tps: 1362.94443 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 877.24551 - tps: 760.57727 + dps: 1073.43868 + tps: 922.27007 } } dps_results: { key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 2270.99886 - tps: 1836.13939 + dps: 2587.92407 + tps: 2070.27906 } } dps_results: { key: "TestSmite-SwitchInFrontOfTarget-Default" value: { - dps: 2962.73804 - tps: 2537.77608 + dps: 3498.7481 + tps: 2975.23511 } } diff --git a/sim/priest/smite/presets.go b/sim/priest/smite/presets.go index 6133f56abf..67c75c14b4 100644 --- a/sim/priest/smite/presets.go +++ b/sim/priest/smite/presets.go @@ -68,74 +68,86 @@ var PlayerOptionsBasic = &proto.Player_SmitePriest{ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40562, - "enchant": 44877, + "enchant": 3820, "gems": [ - 41307, - 40049 + 41333, + 42144 ] }, { - "id": 40374 + "id": 44661, + "gems": [ + 39998 + ] }, { - "id": 40555, - "enchant": 44874 + "id": 40459, + "enchant": 3810, + "gems": [ + 42144 + ] }, { - "id": 41610, - "enchant": 63765 + "id": 44005, + "enchant": 3859, + "gems": [ + 42144 + ] }, { - "id": 40526, - "enchant": 33990, + "id": 40234, + "enchant": 1144, "gems": [ - 40049 + 39998, + 39998 ] }, { - "id": 40325, - "enchant": 44498, + "id": 44008, + "enchant": 2332, "gems": [ + 39998, 0 ] }, { "id": 40454, - "enchant": 44592, + "enchant": 3604, "gems": [ 40049, 0 ] }, { - "id": 40301, + "id": 40561, + "enchant": 3601, "gems": [ - 40049 + 39998 ] }, { "id": 40560, - "enchant": 41602 + "enchant": 3719 }, { - "id": 40246, - "enchant": 60623 + "id": 40558, + "enchant": 3826 }, { - "id": 40399 + "id": 40719 }, { - "id": 39389 + "id": 40399 }, { - "id": 42129 + "id": 40255 }, { - "id": 40382 + "id": 40432 }, { "id": 40395, - "enchant": 44487 + "enchant": 3834 }, { "id": 40273 diff --git a/sim/rogue/presets.go b/sim/rogue/presets.go index 6738330dd9..33aed6fe1e 100644 --- a/sim/rogue/presets.go +++ b/sim/rogue/presets.go @@ -361,7 +361,7 @@ var FullConsumes = &proto.Consumes{ var PreRaidGear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 42550, - "enchant": 44879, + "enchant": 3817, "gems": [ 41398, 40058 @@ -372,15 +372,15 @@ var PreRaidGear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 43481, - "enchant": 44871 + "enchant": 3808 }, { "id": 38614, - "enchant": 55002 + "enchant": 3605 }, { "id": 39558, - "enchant": 44489, + "enchant": 3832, "gems": [ 40003, 42702 @@ -388,7 +388,7 @@ var PreRaidGear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 34448, - "enchant": 44484, + "enchant": 3845, "gems": [ 40003, 0 @@ -396,7 +396,7 @@ var PreRaidGear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 39560, - "enchant": 54999, + "enchant": 3604, "gems": [ 40058, 0 @@ -411,11 +411,11 @@ var PreRaidGear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 37644, - "enchant": 38374 + "enchant": 3823 }, { "id": 34575, - "enchant": 55016, + "enchant": 3606, "gems": [ 40003 ] @@ -434,11 +434,11 @@ var PreRaidGear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 37856, - "enchant": 44492 + "enchant": 3789 }, { "id": 37667, - "enchant": 44492 + "enchant": 3789 }, { "id": 43612 @@ -448,7 +448,7 @@ var PreRaidGear = items.EquipmentSpecFromJsonString(`{"items": [ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40499, - "enchant": 44879, + "enchant": 3817, "gems": [ 41398, 42702 @@ -462,25 +462,25 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40502, - "enchant": 44871, + "enchant": 3808, "gems": [ 36766 ] }, { "id": 40403, - "enchant": 55002 + "enchant": 3605 }, { "id": 40539, - "enchant": 44489, + "enchant": 3832, "gems": [ 36766 ] }, { "id": 39765, - "enchant": 44484, + "enchant": 3845, "gems": [ 40003, 0 @@ -488,7 +488,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40496, - "enchant": 54999, + "enchant": 3604, "gems": [ 40058, 0 @@ -502,7 +502,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40500, - "enchant": 38374, + "enchant": 3823, "gems": [ 40003, 40003 @@ -510,7 +510,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 39701, - "enchant": 55016 + "enchant": 3606 }, { "id": 40074 @@ -526,11 +526,11 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 39714, - "enchant": 44492 + "enchant": 3789 }, { "id": 40386, - "enchant": 44492 + "enchant": 3789 }, { "id": 40385 @@ -539,7 +539,7 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ var GearWithoutRED = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 37293, - "enchant": 44879, + "enchant": 3817, "gems": [ 41339, 40088 @@ -550,18 +550,18 @@ var GearWithoutRED = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 37139, - "enchant": 44871, + "enchant": 3808, "gems": [ 36766 ] }, { "id": 36947, - "enchant": 55002 + "enchant": 3605 }, { "id": 37165, - "enchant": 44489, + "enchant": 3832, "gems": [ 40044, 36766 @@ -569,14 +569,14 @@ var GearWithoutRED = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 44203, - "enchant": 44484, + "enchant": 3845, "gems": [ 0 ] }, { "id": 37409, - "enchant": 54999, + "enchant": 3604, "gems": [ 0 ] @@ -590,11 +590,11 @@ var GearWithoutRED = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 37644, - "enchant": 38374 + "enchant": 3823 }, { "id": 44297, - "enchant": 55016 + "enchant": 3606 }, { "id": 43251, @@ -613,11 +613,11 @@ var GearWithoutRED = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 37693, - "enchant": 44492 + "enchant": 3789 }, { "id": 37856, - "enchant": 44492 + "enchant": 3789 }, { "id": 37191 @@ -626,7 +626,7 @@ var GearWithoutRED = items.EquipmentSpecFromJsonString(`{"items": [ var GearWithRED = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 37293, - "enchant": 44879, + "enchant": 3817, "gems": [ 41398, 40088 @@ -637,18 +637,18 @@ var GearWithRED = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 37139, - "enchant": 44871, + "enchant": 3808, "gems": [ 36766 ] }, { "id": 36947, - "enchant": 55002 + "enchant": 3605 }, { "id": 37165, - "enchant": 44489, + "enchant": 3832, "gems": [ 40044, 36766 @@ -656,14 +656,14 @@ var GearWithRED = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 44203, - "enchant": 44484, + "enchant": 3845, "gems": [ 0 ] }, { "id": 37409, - "enchant": 54999, + "enchant": 3604, "gems": [ 0 ] @@ -677,11 +677,11 @@ var GearWithRED = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 37644, - "enchant": 38374 + "enchant": 3823 }, { "id": 44297, - "enchant": 55016 + "enchant": 3606 }, { "id": 43251, @@ -700,11 +700,11 @@ var GearWithRED = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 37693, - "enchant": 44492 + "enchant": 3789 }, { "id": 37856, - "enchant": 44492 + "enchant": 3789 }, { "id": 37191 @@ -713,7 +713,7 @@ var GearWithRED = items.EquipmentSpecFromJsonString(`{"items": [ var MutilateP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 29044, - "enchant": 29192, + "enchant": 3003, "gems": [ 32409, 24061 @@ -724,7 +724,7 @@ var MutilateP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 27797, - "enchant": 28888, + "enchant": 2986, "gems": [ 24061, 24055 @@ -732,11 +732,11 @@ var MutilateP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 28672, - "enchant": 34004 + "enchant": 368 }, { "id": 29045, - "enchant": 24003, + "enchant": 2661, "gems": [ 24061, 24051, @@ -745,7 +745,7 @@ var MutilateP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 29246, - "enchant": 34002 + "enchant": 1593 }, { "id": 27531, @@ -759,7 +759,7 @@ var MutilateP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 28741, - "enchant": 29535, + "enchant": 3012, "gems": [ 24051, 24051, @@ -768,7 +768,7 @@ var MutilateP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 28545, - "enchant": 28279, + "enchant": 2939, "gems": [ 24061, 24051 @@ -788,11 +788,11 @@ var MutilateP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 28768, - "enchant": 22559 + "enchant": 2673 }, { "id": 29182, - "enchant": 22559 + "enchant": 2673 }, { "id": 28772 diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index b359545abd..33e271c6a2 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1,27 +1,27 @@ character_stats_results: { key: "TestElemental-CharacterStats-Default" value: { - final_stats: 393.8 - final_stats: 344.3 - final_stats: 1491.05 - final_stats: 1138.5 - final_stats: 355.3 - final_stats: 2512 - final_stats: 372.62 - final_stats: 209 - final_stats: 1285.1632 - final_stats: 534 + final_stats: 396 + final_stats: 346.5 + final_stats: 1395.35 + final_stats: 1141.8 + final_stats: 335.5 + final_stats: 2493 + final_stats: 373.016 + final_stats: 294 + final_stats: 1072.07222 + final_stats: 675 final_stats: 0 - final_stats: 1672.11 - final_stats: 209 - final_stats: 1194.36486 - final_stats: 534 + final_stats: 1676.95 + final_stats: 294 + final_stats: 981.57737 + final_stats: 675 final_stats: 0 final_stats: 0 - final_stats: 21193.5 + final_stats: 21243 final_stats: 0 final_stats: 0 - final_stats: 18987.1 + final_stats: 16372.5 final_stats: 755.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 21669.5 + final_stats: 20712.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -48,12 +48,12 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.17701 + weights: 0.18569 weights: 0 - weights: 1.04058 + weights: 1.08073 weights: 0 - weights: 1.97395 - weights: 0.55751 + weights: 0 + weights: 0.64377 weights: 0 weights: 0 weights: 0 @@ -89,826 +89,826 @@ stat_weights_results: { dps_results: { key: "TestElemental-AllItems-AshtongueTalismanofVision-32491" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-AustereEarthsiegeDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-Bandit'sInsignia-40371" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 4064.0457 - tps: 3125.65778 + dps: 4598.80985 + tps: 3494.86625 } } dps_results: { key: "TestElemental-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 3921.14218 - tps: 3026.18199 + dps: 4418.42426 + tps: 3374.4754 } } dps_results: { key: "TestElemental-AllItems-Bizuri'sTotemofShatteredIce-50458" value: { - dps: 4328.0022 - tps: 3317.48805 + dps: 4747.99326 + tps: 3607.98251 } } dps_results: { key: "TestElemental-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 3301.29712 - tps: 2563.25508 + dps: 3683.53743 + tps: 2846.45081 } } dps_results: { key: "TestElemental-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 3449.17293 - tps: 2676.3701 + dps: 3835.56923 + tps: 2963.06357 } } dps_results: { key: "TestElemental-AllItems-BracingEarthsiegeDiamond" value: { - dps: 4078.80665 - tps: 3074.77165 + dps: 4612.90463 + tps: 3436.18467 } } dps_results: { key: "TestElemental-AllItems-ChaoticSkyflareDiamond" value: { - dps: 4180.56596 - tps: 3216.07715 + dps: 4719.54971 + tps: 3587.71785 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 4063.31389 - tps: 3123.25679 + dps: 4492.54726 + tps: 3436.92839 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Death-42990" value: { - dps: 4096.72682 - tps: 3165.21057 + dps: 4522.11498 + tps: 3458.00294 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 4015.86324 - tps: 3084.38833 + dps: 4442.67077 + tps: 3401.20793 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 4015.86324 - tps: 3084.38833 + dps: 4442.67077 + tps: 3401.20793 } } dps_results: { key: "TestElemental-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 4015.86324 - tps: 3084.38833 + dps: 4442.67077 + tps: 3401.20793 } } dps_results: { key: "TestElemental-AllItems-DeadlyGladiator'sTotemofSurvival-42602" value: { - dps: 4191.72442 - tps: 3222.36102 + dps: 4632.05262 + tps: 3527.56455 } } dps_results: { key: "TestElemental-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 4025.87406 - tps: 3096.70489 + dps: 4441.14043 + tps: 3399.79105 } } dps_results: { key: "TestElemental-AllItems-Defender'sCode-40257" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-DestructiveSkyflareDiamond" value: { - dps: 4067.4174 - tps: 3127.87424 + dps: 4601.38408 + tps: 3496.99577 } } dps_results: { key: "TestElemental-AllItems-EarthshatterBattlegear" value: { - dps: 3163.98957 - tps: 2446.64128 + dps: 3573.50918 + tps: 2737.78307 } } dps_results: { key: "TestElemental-AllItems-EarthshatterGarb" value: { - dps: 3641.40681 - tps: 2806.95067 + dps: 4039.17146 + tps: 3088.63754 } } dps_results: { key: "TestElemental-AllItems-EffulgentSkyflareDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-EmberSkyflareDiamond" value: { - dps: 4080.96409 - tps: 3138.55754 + dps: 4618.3945 + tps: 3509.67284 } } dps_results: { key: "TestElemental-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 4064.0457 - tps: 3125.57884 + dps: 4598.80985 + tps: 3494.93823 } } dps_results: { key: "TestElemental-AllItems-EnigmaticStarflareDiamond" value: { - dps: 4061.32107 - tps: 3123.58204 + dps: 4596.05783 + tps: 3492.73899 } } dps_results: { key: "TestElemental-AllItems-EternalEarthsiegeDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 4077.87994 - tps: 3146.44762 + dps: 4514.22856 + tps: 3451.72931 } } dps_results: { key: "TestElemental-AllItems-EyeoftheBroodmother-45308" value: { - dps: 4188.33563 - tps: 3216.89621 + dps: 4615.32288 + tps: 3529.90968 } } dps_results: { key: "TestElemental-AllItems-ForgeEmber-37660" value: { - dps: 4147.15514 - tps: 3187.47293 + dps: 4572.70357 + tps: 3498.66166 } } dps_results: { key: "TestElemental-AllItems-ForlornSkyflareDiamond" value: { - dps: 4078.80665 - tps: 3136.86769 + dps: 4612.90463 + tps: 3505.61793 } } dps_results: { key: "TestElemental-AllItems-ForlornStarflareDiamond" value: { - dps: 4073.77381 - tps: 3133.07379 + dps: 4607.69247 + tps: 3501.72301 } } dps_results: { key: "TestElemental-AllItems-FrostWitch'sBattlegear" value: { - dps: 3410.03265 - tps: 2623.55571 + dps: 3825.50204 + tps: 2916.92778 } } dps_results: { key: "TestElemental-AllItems-FrostWitch'sRegalia" value: { - dps: 4410.62436 - tps: 3353.77534 + dps: 4561.46034 + tps: 3448.3791 } } dps_results: { key: "TestElemental-AllItems-FuriousGladiator'sTotemofSurvival-42603" value: { - dps: 4200.8631 - tps: 3229.18666 + dps: 4642.31801 + tps: 3535.13074 } } dps_results: { key: "TestElemental-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-FuturesightRune-38763" value: { - dps: 4072.03525 - tps: 3131.85577 + dps: 4486.33427 + tps: 3435.21975 } } dps_results: { key: "TestElemental-AllItems-Gladiator'sEarthshaker" value: { - dps: 3135.23829 - tps: 2426.93609 + dps: 3529.63589 + tps: 2730.60528 } } dps_results: { key: "TestElemental-AllItems-Gladiator'sWartide" value: { - dps: 3777.87829 - tps: 2921.24707 + dps: 4167.33728 + tps: 3217.83604 } } dps_results: { key: "TestElemental-AllItems-HatefulGladiator'sTotemofSurvival-42601" value: { - dps: 4168.27119 - tps: 3204.87239 - } -} -dps_results: { - key: "TestElemental-AllItems-IllustrationoftheDragonSoul-40432" - value: { - dps: 4210.64661 - tps: 3236.19772 + dps: 4603.62068 + tps: 3506.75465 } } dps_results: { key: "TestElemental-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 4064.0457 - tps: 3125.57884 + dps: 4598.80985 + tps: 3494.93823 } } dps_results: { key: "TestElemental-AllItems-ImpassiveStarflareDiamond" value: { - dps: 4061.32107 - tps: 3123.58204 + dps: 4596.05783 + tps: 3492.73899 } } dps_results: { key: "TestElemental-AllItems-IncisorFragment-37723" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 4055.78625 - tps: 3127.24225 + dps: 4592.30013 + tps: 3498.32218 } } dps_results: { key: "TestElemental-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-MajesticDragonFigurine-40430" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-MeteoriteWhetstone-37390" value: { - dps: 4050.88756 - tps: 3114.62992 + dps: 4476.2088 + tps: 3425.82026 } } dps_results: { key: "TestElemental-AllItems-OfferingofSacrifice-37638" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-PersistentEarthshatterDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-PurifiedShardoftheGods" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-ReignoftheDead-47316" value: { - dps: 4319.05374 - tps: 3365.41326 + dps: 4768.75895 + tps: 3691.05257 } } dps_results: { key: "TestElemental-AllItems-ReignoftheDead-47477" value: { - dps: 4361.04552 - tps: 3402.92304 + dps: 4810.81277 + tps: 3728.47232 } } dps_results: { key: "TestElemental-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 4169.2264 - tps: 3207.70034 + dps: 4706.50676 + tps: 3578.12759 } } dps_results: { key: "TestElemental-AllItems-RelentlessGladiator'sTotemofSurvival-42604" value: { - dps: 4211.96007 - tps: 3237.47494 + dps: 4654.78312 + tps: 3544.31824 } } dps_results: { key: "TestElemental-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 4053.64244 - tps: 3118.02792 + dps: 4586.84383 + tps: 3486.09824 } } dps_results: { key: "TestElemental-AllItems-RuneofRepulsion-40372" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-SavageGladiator'sTotemofSurvival-42594" value: { - dps: 4164.68407 - tps: 3202.18859 + dps: 4599.92794 + tps: 3504.00932 } } dps_results: { key: "TestElemental-AllItems-SealofthePantheon-36993" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-ShinyShardoftheGods" value: { - dps: 4008.79548 - tps: 3084.17493 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 4000.73372 - tps: 3077.50553 + dps: 4421.91985 + tps: 3386.71522 } } dps_results: { key: "TestElemental-AllItems-SkycallTotem-33506" value: { - dps: 4129.78315 - tps: 3175.5209 + dps: 4411.069 + tps: 3359.24887 } } dps_results: { key: "TestElemental-AllItems-SkyshatterHarness" value: { - dps: 2774.33634 - tps: 2154.22398 + dps: 3013.32098 + tps: 2326.10867 } } dps_results: { key: "TestElemental-AllItems-SkyshatterRegalia" value: { - dps: 3293.24702 - tps: 2542.89897 + dps: 3564.16811 + tps: 2741.87974 } } dps_results: { key: "TestElemental-AllItems-SparkofLife-37657" value: { - dps: 4052.55508 - tps: 3115.70147 + dps: 4484.47411 + tps: 3434.08869 } } dps_results: { key: "TestElemental-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 4111.80218 - tps: 3156.04196 + dps: 4536.57807 + tps: 3459.68848 } } dps_results: { key: "TestElemental-AllItems-Stonebreaker'sTotem-33507" value: { - dps: 4145.02684 - tps: 3189.90072 + dps: 4580.72567 + tps: 3489.73363 } } dps_results: { key: "TestElemental-AllItems-StormshroudArmor" value: { - dps: 3228.32214 - tps: 2514.73136 + dps: 3608.86711 + tps: 2784.01846 } } dps_results: { key: "TestElemental-AllItems-SwiftSkyflareDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-SwiftStarflareDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-SwiftWindfireDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-TheFistsofFury" value: { - dps: 3606.24872 - tps: 2784.11387 + dps: 4096.95176 + tps: 3117.95452 } } dps_results: { key: "TestElemental-AllItems-Thrall'sBattlegear" value: { - dps: 3468.95419 - tps: 2675.17234 + dps: 3781.17759 + tps: 2896.39418 } } dps_results: { key: "TestElemental-AllItems-Thrall'sRegalia" value: { - dps: 4175.80034 - tps: 3194.50327 + dps: 4519.51435 + tps: 3448.68506 } } dps_results: { key: "TestElemental-AllItems-ThunderingSkyflareDiamond" value: { - dps: 4053.64244 - tps: 3117.8982 + dps: 4586.84383 + tps: 3486.14334 } } dps_results: { key: "TestElemental-AllItems-TidefuryRaiment" value: { - dps: 3082.52577 - tps: 2398.14856 + dps: 3442.62579 + tps: 2655.92631 } } dps_results: { key: "TestElemental-AllItems-TinyAbominationinaJar-50351" value: { - dps: 4160.96624 - tps: 3182.65296 + dps: 4563.02717 + tps: 3470.70753 } } dps_results: { key: "TestElemental-AllItems-TinyAbominationinaJar-50706" value: { - dps: 4160.96624 - tps: 3182.65296 + dps: 4563.02717 + tps: 3470.70753 } } dps_results: { key: "TestElemental-AllItems-TirelessSkyflareDiamond" value: { - dps: 4078.80665 - tps: 3136.86769 + dps: 4612.90463 + tps: 3505.61793 } } dps_results: { key: "TestElemental-AllItems-TirelessStarflareDiamond" value: { - dps: 4073.77381 - tps: 3133.07379 + dps: 4607.69247 + tps: 3501.72301 } } dps_results: { key: "TestElemental-AllItems-TotemofElectrifyingWind-47666" value: { - dps: 4300.99459 - tps: 3298.72118 + dps: 4728.63993 + tps: 3592.55297 } } dps_results: { key: "TestElemental-AllItems-TotemoftheAvalanche-50463" value: { - dps: 4144.24037 - tps: 3186.24797 + dps: 4580.72567 + tps: 3489.73363 + } +} +dps_results: { + key: "TestElemental-AllItems-TotemoftheElementalPlane-40708" + value: { + dps: 4436.50011 + tps: 3386.85402 } } dps_results: { key: "TestElemental-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 4073.77381 - tps: 3133.07379 + dps: 4607.69247 + tps: 3501.72301 } } dps_results: { key: "TestElemental-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 4078.80665 - tps: 3136.86769 + dps: 4612.90463 + tps: 3505.61793 } } dps_results: { key: "TestElemental-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 3272.78705 - tps: 2543.1404 + dps: 3618.94806 + tps: 2799.68912 } } dps_results: { key: "TestElemental-AllItems-WingedTalisman-37844" value: { - dps: 4082.50288 - tps: 3139.65776 + dps: 4496.10328 + tps: 3442.50928 } } dps_results: { key: "TestElemental-AllItems-WorldbreakerBattlegear" value: { - dps: 3298.24498 - tps: 2545.59979 + dps: 3695.74407 + tps: 2823.24417 } } dps_results: { key: "TestElemental-AllItems-WorldbreakerGarb" value: { - dps: 3871.85559 - tps: 3009.5364 + dps: 4313.92187 + tps: 3326.54256 } } dps_results: { key: "TestElemental-AllItems-WrathfulGladiator'sTotemofSurvival-51513" value: { - dps: 4223.7098 - tps: 3246.25076 + dps: 4667.98148 + tps: 3554.04619 } } dps_results: { key: "TestElemental-Average-Default" value: { - dps: 4226.87179 - tps: 3246.0414 + dps: 4795.64834 + tps: 3643.75723 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-FullBuffs-LongMultiTarget" value: { - dps: 6485.49281 - tps: 5982.29015 + dps: 6931.05228 + tps: 6325.92807 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-FullBuffs-LongSingleTarget" value: { - dps: 4170.95531 - tps: 3207.42859 + dps: 4419.75832 + tps: 3367.70177 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-FullBuffs-ShortSingleTarget" value: { - dps: 4767.92736 - tps: 3692.14013 + dps: 5065.48411 + tps: 3872.30637 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-NoBuffs-LongMultiTarget" value: { - dps: 2078.14008 - tps: 1688.0494 + dps: 2251.37778 + tps: 1822.03777 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-NoBuffs-LongSingleTarget" value: { - dps: 1754.25693 - tps: 1374.7757 + dps: 1912.14978 + tps: 1484.59809 } } dps_results: { key: "TestElemental-Settings-Orc-P1-Adaptive-NoBuffs-ShortSingleTarget" value: { - dps: 3463.25426 - tps: 2643.12762 + dps: 3627.14228 + tps: 2743.77409 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 8353.72719 - tps: 5919.12619 + dps: 8816.68094 + tps: 6150.04634 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 4591.29977 - tps: 3164.98063 + dps: 4906.40887 + tps: 3345.29903 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 5803.35328 - tps: 3500.99274 + dps: 6181.94155 + tps: 3687.73254 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 3827.50901 - tps: 1641.45091 + dps: 4130.09492 + tps: 1760.10056 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 2109.72378 - tps: 1349.83496 + dps: 2280.12899 + tps: 1440.18675 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 4388.59843 - tps: 2586.84863 + dps: 4624.83952 + tps: 2649.86655 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-FullBuffs-LongMultiTarget" value: { - dps: 6461.71907 - tps: 5962.83001 + dps: 7180.96459 + tps: 6538.35281 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-FullBuffs-LongSingleTarget" value: { - dps: 4180.56596 - tps: 3216.07715 + dps: 4719.54971 + tps: 3587.71785 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-FullBuffs-ShortSingleTarget" value: { - dps: 4768.07005 - tps: 3693.51723 + dps: 5429.00969 + tps: 4158.05941 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-NoBuffs-LongMultiTarget" value: { - dps: 2052.11884 - tps: 1673.24377 + dps: 2215.07554 + tps: 1795.75193 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-NoBuffs-LongSingleTarget" value: { - dps: 1740.91585 - tps: 1368.48624 + dps: 1876.16637 + tps: 1463.39854 } } dps_results: { key: "TestElemental-Settings-Troll-P1-Adaptive-NoBuffs-ShortSingleTarget" value: { - dps: 3441.51297 - tps: 2636.60145 + dps: 3878.70114 + tps: 2940.4787 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 8142.05327 - tps: 5867.5319 + dps: 9057.30529 + tps: 6481.77786 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 4554.31368 - tps: 3168.92298 + dps: 5146.886 + tps: 3543.94534 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 5666.86401 - tps: 3480.56459 + dps: 6448.18647 + tps: 3964.37059 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 3638.30356 - tps: 1598.77349 + dps: 3977.14773 + tps: 1732.89528 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 2037.65198 - tps: 1325.31584 + dps: 2228.45482 + tps: 1427.38311 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 4233.32377 - tps: 2525.68506 + dps: 4825.54364 + tps: 2869.92393 } } dps_results: { key: "TestElemental-SwitchInFrontOfTarget-Default" value: { - dps: 4180.56596 - tps: 3216.07715 + dps: 4719.54971 + tps: 3587.71785 } } diff --git a/sim/shaman/elemental/presets.go b/sim/shaman/elemental/presets.go index c91a636157..2500ffbd75 100644 --- a/sim/shaman/elemental/presets.go +++ b/sim/shaman/elemental/presets.go @@ -69,102 +69,90 @@ var FullConsumes = &proto.Consumes{ DefaultConjured: proto.Conjured_ConjuredDarkRune, } -var P1Gear = items.EquipmentSpecFromJsonString(`{ -"items": [ +var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { - "id": 40516, - "enchant": 44877, - "gems": [ - 41285, - 40025 - ] + "id": 40516, + "enchant": 3820, + "gems": [ + 41285, + 40027 + ] }, { - "id": 44661, - "gems": [ - 40027 - ] + "id": 44661, + "gems": [ + 39998 + ] }, { - "id": 40518, - "enchant": 44874, - "gems": [ - 39998 - ] + "id": 40286, + "enchant": 3810 }, { - "id": 44005, - "enchant": 44472, - "gems": [ - 40025 - ] + "id": 44005, + "enchant": 3722, + "gems": [ + 40027 + ] }, { - "id": 40514, - "enchant": 44623, - "gems": [ - 39998, - 40025 - ] + "id": 40514, + "enchant": 3832, + "gems": [ + 42144, + 42144 + ] }, { - "id": 40324, - "enchant": 44498, - "gems": [ - 40025, - 0 - ] + "id": 40324, + "enchant": 2332, + "gems": [ + 42144, + 0 + ] }, { - "id": 40302, - "enchant": 54999, - "gems": [ - 0 - ] + "id": 40302, + "enchant": 3246, + "gems": [ + 0 + ] }, { - "id": 40327, - "gems": [ - 39998 - ] + "id": 40301, + "gems": [ + 40014 + ] }, { - "id": 40517, - "enchant": 41602, - "gems": [ - 40049, - 40027 - ] + "id": 40560, + "enchant": 3721 }, { - "id": 40237, - "enchant": 60623, - "gems": [ - 40025 - ] + "id": 40519, + "enchant": 3826 }, { - "id": 40399 + "id": 37694 }, { - "id": 48957 + "id": 40399 }, { - "id": 40255 + "id": 40432 }, { - "id": 39229 + "id": 40255 }, { - "id": 40395, - "enchant": 44487 + "id": 40395, + "enchant": 3834 }, { - "id": 40401, - "enchant": 60653 + "id": 40401, + "enchant": 1128 }, { - "id": 40708 + "id": 40267 } - ] -}`) +]}`) diff --git a/sim/shaman/enhancement/presets.go b/sim/shaman/enhancement/presets.go index fec7b2c0c5..57c9b7a426 100644 --- a/sim/shaman/enhancement/presets.go +++ b/sim/shaman/enhancement/presets.go @@ -103,97 +103,97 @@ var FullConsumes = &proto.Consumes{ } var Phase1Gear = items.EquipmentSpecFromJsonString(`{"items": [ - { - "id": 40543, - "enchant": 44879, - "gems": [ - 41398, - 40014 - ] - }, - { - "id": 44661, - "gems": [ - 40014 - ] - }, - { - "id": 40524, - "enchant": 44871, - "gems": [ - 40014 - ] - }, - { - "id": 40403, - "enchant": 55002 - }, - { - "id": 40523, - "enchant": 44489, - "gems": [ - 40003, - 40014 - ] - }, - { - "id": 40282, - "enchant": 44484, - "gems": [ - 42702, - 0 - ] - }, - { - "id": 40520, - "enchant": 54999, - "gems": [ - 42154, - 0 - ] - }, - { - "id": 40275, - "gems": [ - 42156 - ] - }, - { - "id": 40522, - "enchant": 38374, - "gems": [ - 39999, - 42156 - ] - }, - { - "id": 40367, - "enchant": 55016, - "gems": [ - 40058 - ] - }, - { - "id": 40474 - }, - { - "id": 40074 - }, - { - "id": 40684 - }, - { - "id": 37390 - }, - { - "id": 39763, - "enchant": 44492 - }, - { - "id": 39468, - "enchant": 44492 - }, - { - "id": 40322 - } - ]}`) + { + "id": 40543, + "enchant": 3817, + "gems": [ + 41398, + 40014 + ] + }, + { + "id": 44661, + "gems": [ + 40014 + ] + }, + { + "id": 40524, + "enchant": 3808, + "gems": [ + 40014 + ] + }, + { + "id": 40403, + "enchant": 3605 + }, + { + "id": 40523, + "enchant": 3832, + "gems": [ + 40003, + 40014 + ] + }, + { + "id": 40282, + "enchant": 3845, + "gems": [ + 42702, + 0 + ] + }, + { + "id": 40520, + "enchant": 3604, + "gems": [ + 42154, + 0 + ] + }, + { + "id": 40275, + "gems": [ + 42156 + ] + }, + { + "id": 40522, + "enchant": 3823, + "gems": [ + 39999, + 42156 + ] + }, + { + "id": 40367, + "enchant": 3606, + "gems": [ + 40058 + ] + }, + { + "id": 40474 + }, + { + "id": 40074 + }, + { + "id": 40684 + }, + { + "id": 37390 + }, + { + "id": 39763, + "enchant": 3789 + }, + { + "id": 39468, + "enchant": 3789 + }, + { + "id": 40322 + } +]}`) diff --git a/sim/warlock/TestWarlock.results b/sim/warlock/TestWarlock.results index 7910cfc6e3..8a7a078314 100644 --- a/sim/warlock/TestWarlock.results +++ b/sim/warlock/TestWarlock.results @@ -1,27 +1,27 @@ character_stats_results: { key: "TestWarlock-CharacterStats-Default" value: { - final_stats: 328.9 final_stats: 331.1 - final_stats: 1470.15 - final_stats: 1152.8 - final_stats: 765.6 - final_stats: 2831.68 + final_stats: 333.3 + final_stats: 1472.35 + final_stats: 1155 + final_stats: 767.8 + final_stats: 2832.34 final_stats: 109 final_stats: 368.696 - final_stats: 865.00955 + final_stats: 865.61556 final_stats: 722 final_stats: 0 - final_stats: 1205.49 + final_stats: 1207.91 final_stats: 290 final_stats: 469.55 final_stats: 662 final_stats: 0 final_stats: 0 - final_stats: 20868 + final_stats: 20901 final_stats: 0 final_stats: 0 - final_stats: 5463.7 + final_stats: 5468.1 final_stats: 843.7 final_stats: 0 final_stats: 0 @@ -29,7 +29,7 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 21865.5 + final_stats: 21887.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,36 +45,36 @@ character_stats_results: { dps_results: { key: "TestWarlock-AllItems-AshtongueTalismanofShadows-32493" value: { - dps: 7012.70299 - tps: 6284.62683 + dps: 7008.30987 + tps: 6279.98141 } } dps_results: { key: "TestWarlock-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6886.89344 - tps: 6146.49578 + dps: 6887.47466 + tps: 6146.96079 } } dps_results: { key: "TestWarlock-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6912.03681 - tps: 6168.12335 + dps: 6934.08685 + tps: 6190.89725 } } dps_results: { key: "TestWarlock-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6974.43439 - tps: 6234.03673 + dps: 6975.17309 + tps: 6234.65922 } } dps_results: { @@ -94,57 +94,57 @@ dps_results: { dps_results: { key: "TestWarlock-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6891.43462 - tps: 6151.03696 + dps: 6891.1514 + tps: 6150.63753 } } dps_results: { key: "TestWarlock-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-EmberSkyflareDiamond" value: { - dps: 6912.03681 - tps: 6168.12335 + dps: 6934.08685 + tps: 6190.89725 } } dps_results: { key: "TestWarlock-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6886.89344 - tps: 6146.49578 + dps: 6887.47466 + tps: 6146.96079 } } dps_results: { key: "TestWarlock-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6884.58982 - tps: 6144.19216 + dps: 6883.36024 + tps: 6142.84636 } } dps_results: { key: "TestWarlock-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-ForlornSkyflareDiamond" value: { - dps: 6912.03681 - tps: 6168.12335 + dps: 6934.08685 + tps: 6190.89725 } } dps_results: { key: "TestWarlock-AllItems-ForlornStarflareDiamond" value: { - dps: 6905.39945 - tps: 6161.57761 + dps: 6920.191 + tps: 6178.04369 } } dps_results: { @@ -164,29 +164,29 @@ dps_results: { dps_results: { key: "TestWarlock-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6886.89344 - tps: 6146.49578 + dps: 6887.47466 + tps: 6146.96079 } } dps_results: { key: "TestWarlock-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6884.58982 - tps: 6144.19216 + dps: 6883.36024 + tps: 6142.84636 } } dps_results: { key: "TestWarlock-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6865.35283 - tps: 6122.66879 + dps: 6882.68625 + tps: 6138.9641 } } dps_results: { key: "TestWarlock-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { @@ -199,15 +199,15 @@ dps_results: { dps_results: { key: "TestWarlock-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { @@ -220,224 +220,224 @@ dps_results: { dps_results: { key: "TestWarlock-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6962.55286 - tps: 6222.15521 + dps: 6962.55601 + tps: 6222.04213 } } dps_results: { key: "TestWarlock-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6866.80873 - tps: 6122.92812 + dps: 6861.40239 + tps: 6117.773 } } dps_results: { key: "TestWarlock-AllItems-SwiftSkyflareDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-SwiftStarflareDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-SwiftWindfireDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6875.99295 - tps: 6135.5953 + dps: 6875.89935 + tps: 6135.38548 } } dps_results: { key: "TestWarlock-AllItems-TirelessSkyflareDiamond" value: { - dps: 6912.03681 - tps: 6168.12335 + dps: 6934.08685 + tps: 6190.89725 } } dps_results: { key: "TestWarlock-AllItems-TirelessStarflareDiamond" value: { - dps: 6905.39945 - tps: 6161.57761 + dps: 6920.191 + tps: 6178.04369 } } dps_results: { key: "TestWarlock-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6905.39945 - tps: 6161.57761 + dps: 6920.191 + tps: 6178.04369 } } dps_results: { key: "TestWarlock-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6912.03681 - tps: 6168.12335 + dps: 6934.08685 + tps: 6190.89725 } } dps_results: { key: "TestWarlock-Average-Default" value: { - dps: 7047.6391 - tps: 6309.0734 + dps: 7050.86011 + tps: 6312.22527 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-FullBuffs-LongMultiTarget" value: { - dps: 6076.9965 - tps: 7108.05442 + dps: 6075.47369 + tps: 7111.243 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-FullBuffs-LongSingleTarget" value: { - dps: 6076.9965 - tps: 5361.85217 + dps: 6075.47369 + tps: 5359.30225 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-FullBuffs-ShortSingleTarget" value: { - dps: 6234.1552 - tps: 5421.57818 + dps: 6239.33863 + tps: 5426.74608 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-NoBuffs-LongMultiTarget" value: { - dps: 3605.37675 - tps: 5425.20608 + dps: 3597.13955 + tps: 5428.24543 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-NoBuffs-LongSingleTarget" value: { - dps: 3605.37675 - tps: 3367.70252 + dps: 3597.13955 + tps: 3360.62419 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Affliction Warlock-NoBuffs-ShortSingleTarget" value: { - dps: 3347.37389 - tps: 3002.13241 + dps: 3347.98983 + tps: 3002.70098 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-FullBuffs-LongMultiTarget" value: { - dps: 9981.4979 - tps: 11010.94393 + dps: 9981.59502 + tps: 10999.61773 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-FullBuffs-LongSingleTarget" value: { - dps: 6318.5484 - tps: 5360.55858 + dps: 6319.81158 + tps: 5361.47576 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-FullBuffs-ShortSingleTarget" value: { - dps: 7176.28231 - tps: 6019.51117 + dps: 7187.08582 + tps: 6030.22503 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-NoBuffs-LongMultiTarget" value: { - dps: 7054.35183 - tps: 9168.03737 + dps: 7055.04563 + tps: 9168.98544 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-NoBuffs-LongSingleTarget" value: { - dps: 3722.58719 - tps: 3454.71897 + dps: 3721.39337 + tps: 3453.50859 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Demonology Warlock-NoBuffs-ShortSingleTarget" value: { - dps: 3662.74451 - tps: 3293.783 + dps: 3663.52285 + tps: 3294.49446 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Destro Warlock-FullBuffs-LongMultiTarget" value: { - dps: 5738.37629 - tps: 6152.44437 + dps: 5735.52086 + tps: 6155.43676 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Destro Warlock-FullBuffs-LongSingleTarget" value: { - dps: 5738.37629 - tps: 4245.06698 + dps: 5735.52086 + tps: 4243.00245 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Destro Warlock-FullBuffs-ShortSingleTarget" value: { - dps: 6192.59458 - tps: 4498.82002 + dps: 6193.5767 + tps: 4499.69016 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Destro Warlock-NoBuffs-LongMultiTarget" value: { - dps: 2974.857 - tps: 4434.84307 + dps: 2974.72112 + tps: 4428.47085 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Destro Warlock-NoBuffs-LongSingleTarget" value: { - dps: 2974.857 - tps: 2417.25919 + dps: 2974.72112 + tps: 2416.1688 } } dps_results: { key: "TestWarlock-Settings-Orc-P1-Destro Warlock-NoBuffs-ShortSingleTarget" value: { - dps: 3051.24572 - tps: 2218.44478 + dps: 3051.76848 + tps: 2218.8812 } } dps_results: { key: "TestWarlock-SwitchInFrontOfTarget-Default" value: { - dps: 6938.02784 - tps: 6234.03673 + dps: 6938.77264 + tps: 6234.65922 } } diff --git a/sim/warlock/presets.go b/sim/warlock/presets.go index 4774f2b023..320f4194ce 100644 --- a/sim/warlock/presets.go +++ b/sim/warlock/presets.go @@ -178,189 +178,93 @@ var FullConsumes = &proto.Consumes{ Food: proto.Food_FoodFishFeast, } -var P1Gear = items.EquipmentSpecFromJsonString(` - {"items": [ - { - "id": 40421, - "enchant": 44877, - "gems": [ - 41285, - 40051 - ] - }, - { - "id": 44661, - "gems": [ - 40026 - ] - }, - { - "id": 40424, - "enchant": 44874, - "gems": [ - 39998 - ] - }, - { - "id": 44005, - "enchant": 55642, - "gems": [ - 40026 - ] - }, - { - "id": 40423, - "enchant": 44623, - "gems": [ - 39998, - 40051 - ] - }, - { - "id": 44008, - "enchant": 44498, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40420, - "enchant": 54999, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40561, - "gems": [ - 39998 - ] - }, - { - "id": 40560, - "enchant": 41602 - }, - { - "id": 40558, - "enchant": 55016 - }, - { - "id": 40399 - }, - { - "id": 40719 - }, - { - "id": 40432 - }, - { - "id": 40255 - }, - { - "id": 40396, - "enchant": 44487 - }, - { - "id": 39766 - }, - { - "id": 39712 - } - ] - } -`) - -var Phase4Gear = items.EquipmentSpecFromJsonString(`{"items": [ +var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { - "id": 31051, - "enchant": 29191, + "id": 40421, + "enchant": 3820, "gems": [ - 34220, - 32218 + 41285, + 40051 ] }, { - "id": 33281 - }, - { - "id": 31054, - "enchant": 28886, + "id": 44661, "gems": [ - 32215, - 32218 + 40026 ] }, { - "id": 32524, - "enchant": 33150 - }, - { - "id": 30107, - "enchant": 24003, + "id": 40424, + "enchant": 3810, "gems": [ - 32196, - 32196, - 32196 + 39998 ] }, { - "id": 32586, - "enchant": 22534 + "id": 44005, + "enchant": 3722, + "gems": [ + 40026 + ] }, { - "id": 31050, - "enchant": 28272, + "id": 40423, + "enchant": 3832, "gems": [ - 32196 + 39998, + 40051 ] }, { - "id": 30888, + "id": 44008, + "enchant": 2332, "gems": [ - 32196, - 32196 + 39998, + 0 ] }, { - "id": 31053, - "enchant": 24274, + "id": 40420, + "enchant": 3604, "gems": [ - 32196 + 39998, + 0 ] }, { - "id": 32239, - "enchant": 35297, + "id": 40561, "gems": [ - 32218, - 32215 + 39998 ] }, { - "id": 32527, - "enchant": 22536 + "id": 40560, + "enchant": 3719 }, { - "id": 33497, - "enchant": 22536 + "id": 40558, + "enchant": 3606 }, { - "id": 32483 + "id": 40399 }, { - "id": 33829 + "id": 40719 }, { - "id": 32374, - "enchant": 22561 + "id": 40432 }, - {}, { - "id": 33192, - "gems": [ - 32215 - ] + "id": 40255 + }, + { + "id": 40396, + "enchant": 3834 + }, + { + "id": 39766 + }, + { + "id": 39712 } ]}`) diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results index fa59988936..462f4a92c1 100644 --- a/sim/warrior/dps/TestArms.results +++ b/sim/warrior/dps/TestArms.results @@ -1,35 +1,35 @@ character_stats_results: { key: "TestArms-CharacterStats-Default" value: { - final_stats: 1496.352 - final_stats: 811.8 - final_stats: 1874.95 - final_stats: 180.4 - final_stats: 234.3 + final_stats: 1244.672 + final_stats: 1001 + final_stats: 1889.25 + final_stats: 176 + final_stats: 229.9 final_stats: 280 final_stats: 109 - final_stats: 221 - final_stats: 1262.55 - final_stats: 145 + final_stats: 141 + final_stats: 1145.55 + final_stats: 243 final_stats: 0 - final_stats: 6783.10246 - final_stats: 221 - final_stats: 2234.77689 - final_stats: 145 - final_stats: 233 - final_stats: 249.7775 + final_stats: 6760.10757 + final_stats: 141 + final_stats: 2256.75564 + final_stats: 243 + final_stats: 253 + final_stats: 281.7775 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 16839.1 - final_stats: 2323.2 + final_stats: 13831.5 + final_stats: 2945.8 final_stats: 0 final_stats: 0 - final_stats: 748.176 - final_stats: 433.4594 + final_stats: 622.336 + final_stats: 534.48245 final_stats: 0 final_stats: 0 - final_stats: 28390.5 + final_stats: 28533.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,630 +45,630 @@ character_stats_results: { dps_results: { key: "TestArms-AllItems-AshtongueTalismanofValor-32485" value: { - dps: 8039.1643 - tps: 6570.45043 + dps: 7887.04128 + tps: 6449.30305 } } dps_results: { key: "TestArms-AllItems-AustereEarthsiegeDiamond" value: { - dps: 8244.87835 - tps: 6751.12735 + dps: 8171.66922 + tps: 6681.52588 } } dps_results: { key: "TestArms-AllItems-Bandit'sInsignia-40371" value: { - dps: 8148.07661 - tps: 6658.34464 + dps: 8114.90412 + tps: 6632.81631 } } dps_results: { key: "TestArms-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 8274.21678 - tps: 6772.65259 + dps: 8206.50885 + tps: 6709.73734 } } dps_results: { key: "TestArms-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 8077.59717 - tps: 6602.99129 + dps: 8067.0684 + tps: 6602.40683 } } dps_results: { key: "TestArms-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 6878.85817 - tps: 5632.46434 + dps: 6967.58148 + tps: 5684.52881 } } dps_results: { key: "TestArms-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 6881.04785 - tps: 5633.96383 + dps: 6957.68664 + tps: 5679.98825 } } dps_results: { key: "TestArms-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6472.95212 - tps: 5296.55473 + dps: 6593.93597 + tps: 5389.40411 } } dps_results: { key: "TestArms-AllItems-BracingEarthsiegeDiamond" value: { - dps: 8236.66851 - tps: 6608.72553 + dps: 8164.86462 + tps: 6542.72587 } } dps_results: { key: "TestArms-AllItems-ChaoticSkyflareDiamond" value: { - dps: 8424.47045 - tps: 6900.22773 + dps: 8405.48463 + tps: 6872.35978 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 8163.99077 - tps: 6678.49441 + dps: 8007.56443 + tps: 6547.50603 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Death-42990" value: { - dps: 8182.04634 - tps: 6691.59701 + dps: 8036.51662 + tps: 6570.15365 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 8121.14796 - tps: 6642.12668 + dps: 7985.07089 + tps: 6529.87234 } } dps_results: { key: "TestArms-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 8141.73263 - tps: 6661.3273 + dps: 8009.34637 + tps: 6548.60096 } } dps_results: { key: "TestArms-AllItems-Defender'sCode-40257" value: { - dps: 7999.56401 - tps: 6538.25621 + dps: 7865.09332 + tps: 6431.18726 } } dps_results: { key: "TestArms-AllItems-DestructiveSkyflareDiamond" value: { - dps: 8282.08447 - tps: 6779.0388 + dps: 8229.62075 + tps: 6728.55833 } } dps_results: { key: "TestArms-AllItems-DreadnaughtBattlegear" value: { - dps: 7308.83267 - tps: 5980.86746 + dps: 7429.5222 + tps: 6081.60511 } } dps_results: { key: "TestArms-AllItems-EffulgentSkyflareDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-EmberSkyflareDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 8274.21678 - tps: 6772.65259 + dps: 8206.50885 + tps: 6709.73734 } } dps_results: { key: "TestArms-AllItems-EnigmaticStarflareDiamond" value: { - dps: 8274.85568 - tps: 6775.04945 + dps: 8194.22608 + tps: 6699.52624 } } dps_results: { key: "TestArms-AllItems-EternalEarthsiegeDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 8200.60602 - tps: 6708.09213 + dps: 8053.33939 + tps: 6584.55346 } } dps_results: { key: "TestArms-AllItems-EyeoftheBroodmother-45308" value: { - dps: 8133.98177 - tps: 6655.81992 + dps: 7987.22497 + tps: 6531.50496 } } dps_results: { key: "TestArms-AllItems-ForgeEmber-37660" value: { - dps: 8115.09045 - tps: 6638.95442 + dps: 7980.63547 + tps: 6525.82897 } } dps_results: { key: "TestArms-AllItems-ForlornSkyflareDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-ForlornStarflareDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 8239.54938 - tps: 6733.57798 + dps: 8173.5725 + tps: 6678.4077 } } dps_results: { key: "TestArms-AllItems-FuturesightRune-38763" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-Gladiator'sBattlegear" value: { - dps: 7928.406 - tps: 6471.11432 + dps: 8083.80768 + tps: 6566.69349 } } dps_results: { key: "TestArms-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 8274.21678 - tps: 6772.65259 + dps: 8206.50885 + tps: 6709.73734 } } dps_results: { key: "TestArms-AllItems-ImpassiveStarflareDiamond" value: { - dps: 8274.85568 - tps: 6775.04945 + dps: 8194.22608 + tps: 6699.52624 } } dps_results: { key: "TestArms-AllItems-IncisorFragment-37723" value: { - dps: 8233.00353 - tps: 6732.83478 + dps: 8101.60467 + tps: 6626.09215 } } dps_results: { key: "TestArms-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 8291.64288 - tps: 6789.34166 + dps: 8203.18045 + tps: 6707.19417 } } dps_results: { key: "TestArms-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-MeteoriteWhetstone-37390" value: { - dps: 8192.89422 - tps: 6702.95826 + dps: 8098.8145 + tps: 6624.8367 } } dps_results: { key: "TestArms-AllItems-OfferingofSacrifice-37638" value: { - dps: 7987.24356 - tps: 6528.18232 + dps: 7858.74932 + tps: 6425.62031 } } dps_results: { key: "TestArms-AllItems-OnslaughtArmor" value: { - dps: 5530.8072 - tps: 4521.09168 + dps: 5561.48047 + tps: 4538.81085 } } dps_results: { key: "TestArms-AllItems-OnslaughtBattlegear" value: { - dps: 6381.00522 - tps: 5213.2815 + dps: 6448.64708 + tps: 5251.6543 } } dps_results: { key: "TestArms-AllItems-PersistentEarthshatterDiamond" value: { - dps: 8281.98564 - tps: 6781.80114 + dps: 8202.81193 + tps: 6708.27968 } } dps_results: { key: "TestArms-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 8291.64288 - tps: 6789.34166 + dps: 8203.18045 + tps: 6707.19417 } } dps_results: { key: "TestArms-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-PurifiedShardoftheGods" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-ReignoftheDead-47316" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-ReignoftheDead-47477" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 8420.00527 - tps: 6896.38114 + dps: 8416.53672 + tps: 6881.33012 } } dps_results: { key: "TestArms-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-RuneofRepulsion-40372" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-SealofthePantheon-36993" value: { - dps: 8025.94225 - tps: 6560.4018 + dps: 7884.66847 + tps: 6447.4636 } } dps_results: { key: "TestArms-AllItems-ShinyShardoftheGods" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-SiegebreakerBattlegear" value: { - dps: 7648.04743 - tps: 6256.77727 + dps: 7852.52008 + tps: 6422.47048 } } dps_results: { key: "TestArms-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-SparkofLife-37657" value: { - dps: 8108.48214 - tps: 6632.84953 + dps: 7949.34174 + tps: 6502.53142 } } dps_results: { key: "TestArms-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 8193.54117 - tps: 6699.69739 + dps: 8210.67677 + tps: 6714.02173 } } dps_results: { key: "TestArms-AllItems-StormshroudArmor" value: { - dps: 6398.81649 - tps: 5232.80486 + dps: 6564.80478 + tps: 5358.6026 } } dps_results: { key: "TestArms-AllItems-SwiftSkyflareDiamond" value: { - dps: 8291.64288 - tps: 6789.34166 + dps: 8203.18045 + tps: 6707.19417 } } dps_results: { key: "TestArms-AllItems-SwiftStarflareDiamond" value: { - dps: 8281.98564 - tps: 6781.80114 + dps: 8202.81193 + tps: 6708.27968 } } dps_results: { key: "TestArms-AllItems-SwiftWindfireDiamond" value: { - dps: 8280.49476 - tps: 6780.77588 + dps: 8184.16559 + tps: 6691.18323 } } dps_results: { key: "TestArms-AllItems-TheFistsofFury" value: { - dps: 4852.69984 - tps: 4054.24606 + dps: 4827.49728 + tps: 4029.6384 } } dps_results: { key: "TestArms-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5173.3995 - tps: 4313.87761 + dps: 5104.33697 + tps: 4258.54339 } } dps_results: { key: "TestArms-AllItems-ThunderingSkyflareDiamond" value: { - dps: 8327.28898 - tps: 6817.96379 + dps: 8288.45016 + tps: 6784.15081 } } dps_results: { key: "TestArms-AllItems-TinyAbominationinaJar-50351" value: { - dps: 8438.83242 - tps: 6900.0751 + dps: 8397.02818 + tps: 6864.91299 } } dps_results: { key: "TestArms-AllItems-TinyAbominationinaJar-50706" value: { - dps: 8471.32696 - tps: 6926.56466 + dps: 8442.7238 + tps: 6899.88407 } } dps_results: { key: "TestArms-AllItems-TirelessSkyflareDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-TirelessStarflareDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 8236.66851 - tps: 6743.44455 + dps: 8164.86462 + tps: 6676.14407 } } dps_results: { key: "TestArms-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6834.00662 - tps: 5591.62563 + dps: 6905.97673 + tps: 5642.31308 } } dps_results: { key: "TestArms-AllItems-WingedTalisman-37844" value: { - dps: 7979.9688 - tps: 6523.57935 + dps: 7870.78936 + tps: 6435.45377 } } dps_results: { key: "TestArms-AllItems-Wrynn'sBattlegear" value: { - dps: 8086.3699 - tps: 6608.07906 + dps: 8251.76245 + tps: 6731.96247 } } dps_results: { key: "TestArms-AllItems-YmirjarLord'sBattlegear" value: { - dps: 8472.80288 - tps: 6947.63798 + dps: 8694.86852 + tps: 7112.36503 } } dps_results: { key: "TestArms-Average-Default" value: { - dps: 8468.23276 - tps: 6930.69906 + dps: 8413.32194 + tps: 6884.16993 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 11069.30687 - tps: 9490.34039 + dps: 11005.09717 + tps: 9380.76188 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 8372.96047 - tps: 6853.28195 + dps: 8390.18961 + tps: 6860.58765 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 9009.86427 - tps: 7448.53702 + dps: 9152.92168 + tps: 7552.54403 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 6338.45453 - tps: 5563.56026 + dps: 6285.52962 + tps: 5458.00474 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 4442.08428 - tps: 3642.72413 + dps: 4457.61728 + tps: 3651.93563 } } dps_results: { key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4469.77114 - tps: 3692.65502 + dps: 4452.77098 + tps: 3678.65405 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 11149.62368 - tps: 9558.46794 + dps: 11055.74969 + tps: 9421.83344 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 8420.00527 - tps: 6896.38114 + dps: 8405.48463 + tps: 6872.35978 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 9095.72628 - tps: 7523.87382 + dps: 9241.25266 + tps: 7627.90486 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 6403.82257 - tps: 5620.58674 + dps: 6375.53828 + tps: 5528.38341 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 4537.42088 - tps: 3719.52983 + dps: 4484.89841 + tps: 3673.79536 } } dps_results: { key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 4550.56875 - tps: 3764.31473 + dps: 4518.65004 + tps: 3729.40402 } } dps_results: { key: "TestArms-SwitchInFrontOfTarget-Default" value: { - dps: 7843.00658 - tps: 6407.28597 + dps: 7830.75952 + tps: 6399.02212 } } diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results index af025e8593..78879078cf 100644 --- a/sim/warrior/dps/TestFury.results +++ b/sim/warrior/dps/TestFury.results @@ -1,35 +1,35 @@ character_stats_results: { key: "TestFury-CharacterStats-Default" value: { - final_stats: 1438.8 - final_stats: 811.8 - final_stats: 1874.95 - final_stats: 180.4 - final_stats: 234.3 + final_stats: 1196.8 + final_stats: 1001 + final_stats: 1889.25 + final_stats: 176 + final_stats: 229.9 final_stats: 280 final_stats: 109 - final_stats: 221 - final_stats: 1262.55 - final_stats: 145 + final_stats: 141 + final_stats: 1145.55 + final_stats: 243 final_stats: 0 - final_stats: 6656.48806 - final_stats: 319.37 - final_stats: 2234.77689 - final_stats: 145 - final_stats: 233 - final_stats: 216.9875 + final_stats: 6654.78917 + final_stats: 239.37 + final_stats: 2256.75564 + final_stats: 243 + final_stats: 253 + final_stats: 248.9875 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 16839.1 - final_stats: 2323.2 + final_stats: 13831.5 + final_stats: 2945.8 final_stats: 0 final_stats: 0 - final_stats: 719.4 - final_stats: 433.4594 + final_stats: 598.4 + final_stats: 534.48245 final_stats: 0 final_stats: 0 - final_stats: 28390.5 + final_stats: 28533.5 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,630 +45,630 @@ character_stats_results: { dps_results: { key: "TestFury-AllItems-AshtongueTalismanofValor-32485" value: { - dps: 6607.10388 - tps: 4863.19449 + dps: 6540.25845 + tps: 4809.31556 } } dps_results: { key: "TestFury-AllItems-AustereEarthsiegeDiamond" value: { - dps: 6672.5339 - tps: 4912.23099 + dps: 6739.91752 + tps: 4956.44064 } } dps_results: { key: "TestFury-AllItems-Bandit'sInsignia-40371" value: { - dps: 6771.13407 - tps: 4978.46015 + dps: 6726.44488 + tps: 4944.97566 } } dps_results: { key: "TestFury-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 6734.09994 - tps: 4956.51718 + dps: 6783.41278 + tps: 4987.71772 } } dps_results: { key: "TestFury-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 6504.61936 - tps: 4789.90719 + dps: 6567.48357 + tps: 4835.05797 } } dps_results: { key: "TestFury-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 5337.96848 - tps: 3944.38182 + dps: 5396.41951 + tps: 3985.26083 } } dps_results: { key: "TestFury-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 5303.90819 - tps: 3916.5057 + dps: 5328.92453 + tps: 3938.18296 } } dps_results: { key: "TestFury-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 5035.26176 - tps: 3721.96987 + dps: 5046.04486 + tps: 3733.201 } } dps_results: { key: "TestFury-AllItems-BracingEarthsiegeDiamond" value: { - dps: 6687.55211 - tps: 4824.54467 + dps: 6743.865 + tps: 4861.31746 } } dps_results: { key: "TestFury-AllItems-ChaoticSkyflareDiamond" value: { - dps: 6839.41356 - tps: 5031.64046 + dps: 6854.41758 + tps: 5040.80522 } } dps_results: { key: "TestFury-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 6706.84076 - tps: 4936.80879 + dps: 6665.30809 + tps: 4898.04731 } } dps_results: { key: "TestFury-AllItems-DarkmoonCard:Death-42990" value: { - dps: 6724.00401 - tps: 4948.77973 + dps: 6700.63005 + tps: 4924.33607 } } dps_results: { key: "TestFury-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 6647.88817 - tps: 4892.75789 + dps: 6625.3983 + tps: 4872.05741 } } dps_results: { key: "TestFury-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 6673.94586 - tps: 4912.06979 + dps: 6613.33517 + tps: 4866.36941 } } dps_results: { key: "TestFury-AllItems-Defender'sCode-40257" value: { - dps: 6571.34077 - tps: 4838.25726 + dps: 6526.78032 + tps: 4799.61936 } } dps_results: { key: "TestFury-AllItems-DestructiveSkyflareDiamond" value: { - dps: 6737.97624 - tps: 4960.12934 + dps: 6808.68422 + tps: 5008.11147 } } dps_results: { key: "TestFury-AllItems-DreadnaughtBattlegear" value: { - dps: 5892.31753 - tps: 4346.89974 + dps: 5861.2516 + tps: 4325.76174 } } dps_results: { key: "TestFury-AllItems-EffulgentSkyflareDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-EmberSkyflareDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 6734.09994 - tps: 4956.51718 + dps: 6783.41278 + tps: 4987.71772 } } dps_results: { key: "TestFury-AllItems-EnigmaticStarflareDiamond" value: { - dps: 6729.65041 - tps: 4953.78957 + dps: 6772.58141 + tps: 4980.97927 } } dps_results: { key: "TestFury-AllItems-EternalEarthsiegeDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 6736.56464 - tps: 4957.75054 + dps: 6712.53757 + tps: 4933.12466 } } dps_results: { key: "TestFury-AllItems-EyeoftheBroodmother-45308" value: { - dps: 6679.95823 - tps: 4918.0062 + dps: 6654.56245 + tps: 4892.60717 } } dps_results: { key: "TestFury-AllItems-ForgeEmber-37660" value: { - dps: 6667.41535 - tps: 4906.38586 + dps: 6623.02913 + tps: 4870.59294 } } dps_results: { key: "TestFury-AllItems-ForlornSkyflareDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-ForlornStarflareDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 6787.21333 - tps: 4993.04875 + dps: 6694.66424 + tps: 4923.00168 } } dps_results: { key: "TestFury-AllItems-FuturesightRune-38763" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-Gladiator'sBattlegear" value: { - dps: 6492.99667 - tps: 4777.17646 + dps: 6428.44572 + tps: 4726.12155 } } dps_results: { key: "TestFury-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 6734.09994 - tps: 4956.51718 + dps: 6783.41278 + tps: 4987.71772 } } dps_results: { key: "TestFury-AllItems-ImpassiveStarflareDiamond" value: { - dps: 6729.65041 - tps: 4953.78957 + dps: 6772.58141 + tps: 4980.97927 } } dps_results: { key: "TestFury-AllItems-IncisorFragment-37723" value: { - dps: 6764.67905 - tps: 4976.84694 + dps: 6753.07238 + tps: 4963.46329 } } dps_results: { key: "TestFury-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 6706.32836 - tps: 4935.27566 + dps: 6783.69132 + tps: 4988.46813 } } dps_results: { key: "TestFury-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-MajesticDragonFigurine-40430" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-MeteoriteWhetstone-37390" value: { - dps: 6792.82435 - tps: 4996.65085 + dps: 6706.40751 + tps: 4928.80131 } } dps_results: { key: "TestFury-AllItems-OfferingofSacrifice-37638" value: { - dps: 6564.31435 - tps: 4835.15277 + dps: 6501.22455 + tps: 4780.75785 } } dps_results: { key: "TestFury-AllItems-OnslaughtArmor" value: { - dps: 4061.35126 - tps: 3014.98245 + dps: 4079.2916 + tps: 3028.67159 } } dps_results: { key: "TestFury-AllItems-OnslaughtBattlegear" value: { - dps: 4903.70859 - tps: 3627.65429 + dps: 4912.95653 + tps: 3634.18245 } } dps_results: { key: "TestFury-AllItems-PersistentEarthshatterDiamond" value: { - dps: 6705.05822 - tps: 4934.03927 + dps: 6751.72431 + tps: 4964.76889 } } dps_results: { key: "TestFury-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 6706.32836 - tps: 4935.27566 + dps: 6783.69132 + tps: 4988.46813 } } dps_results: { key: "TestFury-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-PurifiedShardoftheGods" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-ReignoftheDead-47316" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-ReignoftheDead-47477" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 6831.87151 - tps: 5026.61121 + dps: 6870.12562 + tps: 5053.41847 } } dps_results: { key: "TestFury-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-RuneofRepulsion-40372" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-SealofthePantheon-36993" value: { - dps: 6614.60136 - tps: 4868.85402 + dps: 6476.99317 + tps: 4762.83748 } } dps_results: { key: "TestFury-AllItems-ShinyShardoftheGods" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-SiegebreakerBattlegear" value: { - dps: 6197.72861 - tps: 4565.30251 + dps: 6185.20073 + tps: 4556.11947 } } dps_results: { key: "TestFury-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-SparkofLife-37657" value: { - dps: 6633.58145 - tps: 4880.6176 + dps: 6601.92481 + tps: 4852.25636 } } dps_results: { key: "TestFury-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 6719.63429 - tps: 4946.98759 + dps: 6761.73335 + tps: 4973.34832 } } dps_results: { key: "TestFury-AllItems-StormshroudArmor" value: { - dps: 4953.7481 - tps: 3668.18905 + dps: 4984.80828 + tps: 3685.49837 } } dps_results: { key: "TestFury-AllItems-SwiftSkyflareDiamond" value: { - dps: 6706.32836 - tps: 4935.27566 + dps: 6783.69132 + tps: 4988.46813 } } dps_results: { key: "TestFury-AllItems-SwiftStarflareDiamond" value: { - dps: 6705.05822 - tps: 4934.03927 + dps: 6751.72431 + tps: 4964.76889 } } dps_results: { key: "TestFury-AllItems-SwiftWindfireDiamond" value: { - dps: 6655.16655 - tps: 4899.52762 + dps: 6726.12428 + tps: 4946.12379 } } dps_results: { key: "TestFury-AllItems-TheFistsofFury" value: { - dps: 5057.14242 - tps: 3734.4068 + dps: 5071.59702 + tps: 3743.04556 } } dps_results: { key: "TestFury-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 5303.1446 - tps: 3915.21642 + dps: 5356.89991 + tps: 3948.94623 } } dps_results: { key: "TestFury-AllItems-ThunderingSkyflareDiamond" value: { - dps: 6744.64369 - tps: 4962.52489 + dps: 6724.54609 + tps: 4946.89302 } } dps_results: { key: "TestFury-AllItems-TinyAbominationinaJar-50351" value: { - dps: 6794.10124 - tps: 4998.01571 + dps: 6877.79952 + tps: 5058.6391 } } dps_results: { key: "TestFury-AllItems-TinyAbominationinaJar-50706" value: { - dps: 6888.01416 - tps: 5067.7949 + dps: 6906.14499 + tps: 5080.00198 } } dps_results: { key: "TestFury-AllItems-TirelessSkyflareDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-TirelessStarflareDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 6687.55211 - tps: 4922.788 + dps: 6743.865 + tps: 4960.34377 } } dps_results: { key: "TestFury-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 5290.14272 - tps: 3906.40106 + dps: 5343.85482 + tps: 3945.41124 } } dps_results: { key: "TestFury-AllItems-WingedTalisman-37844" value: { - dps: 6598.06924 - tps: 4857.83334 + dps: 6480.06987 + tps: 4766.33725 } } dps_results: { key: "TestFury-AllItems-Wrynn'sBattlegear" value: { - dps: 6597.6386 - tps: 4852.02614 + dps: 6544.26735 + tps: 4814.63309 } } dps_results: { key: "TestFury-AllItems-YmirjarLord'sBattlegear" value: { - dps: 7135.17175 - tps: 5254.81618 + dps: 7123.37743 + tps: 5245.57167 } } dps_results: { key: "TestFury-Average-Default" value: { - dps: 6882.56049 - tps: 5064.68217 + dps: 6923.65271 + tps: 5091.48649 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 8762.48183 - tps: 6873.34012 + dps: 8849.74308 + tps: 6879.86518 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6666.16426 - tps: 4889.9628 + dps: 6811.90977 + tps: 5008.12625 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 7978.9617 - tps: 5837.07334 + dps: 8055.03965 + tps: 5913.98123 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 4731.22506 - tps: 3891.68369 + dps: 4751.39632 + tps: 3844.11646 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3298.19825 - tps: 2449.36903 + dps: 3309.08674 + tps: 2462.81988 } } dps_results: { key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3460.05212 - tps: 2571.81705 + dps: 3572.12974 + tps: 2656.23064 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 8893.27989 - tps: 6996.01394 + dps: 8923.33988 + tps: 6939.37177 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 6831.87151 - tps: 5026.61121 + dps: 6854.41758 + tps: 5040.80522 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 8084.48554 - tps: 5937.23253 + dps: 8192.16763 + tps: 6019.23953 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 4841.23675 - tps: 3989.06818 + dps: 4866.86365 + tps: 3929.48871 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 3325.56877 - tps: 2478.6994 + dps: 3312.88546 + tps: 2465.33807 } } dps_results: { key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 3567.86262 - tps: 2660.76556 + dps: 3508.87443 + tps: 2611.38249 } } dps_results: { key: "TestFury-SwitchInFrontOfTarget-Default" value: { - dps: 6273.89649 - tps: 4622.821 + dps: 6342.54228 + tps: 4667.6783 } } diff --git a/sim/warrior/dps/presets.go b/sim/warrior/dps/presets.go index ed2f80cc8b..2b03ed6da0 100644 --- a/sim/warrior/dps/presets.go +++ b/sim/warrior/dps/presets.go @@ -141,11 +141,11 @@ var FullConsumes = &proto.Consumes{ var FuryP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { - "id": 40528, - "enchant": 44879, + "id": 44006, + "enchant": 3817, "gems": [ - 41398, - 39996 + 41285, + 42702 ] }, { @@ -156,63 +156,63 @@ var FuryP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40530, - "enchant": 44871, + "enchant": 3808, "gems": [ - 40058 + 40037 ] }, { "id": 40403, - "enchant": 55002 + "enchant": 3605 }, { - "id": 40525, - "enchant": 44489, + "id": 40539, + "enchant": 3832, "gems": [ - 42142, - 49110 + 42142 ] }, { - "id": 40733, - "enchant": 44484, + "id": 39765, + "enchant": 3845, "gems": [ + 39996, 0 ] }, { "id": 40541, - "enchant": 54999, + "enchant": 3604, "gems": [ 0 ] }, { - "id": 40317, + "id": 40205, "gems": [ 42142 ] }, { "id": 40529, - "enchant": 38374, + "enchant": 3823, "gems": [ 39996, - 39996 + 40022 ] }, { "id": 40591, - "enchant": 55016 + "enchant": 3606 }, { "id": 43993, "gems": [ - 39996 + 42142 ] }, { - "id": 40075 + "id": 40717 }, { "id": 42987 @@ -222,11 +222,11 @@ var FuryP1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40384, - "enchant": 44492 + "enchant": 3789 }, { "id": 40384, - "enchant": 44492 + "enchant": 3789 }, { "id": 40385 diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results index 4615a4ed2f..10eed5340d 100644 --- a/sim/warrior/protection/TestProtectionWarrior.results +++ b/sim/warrior/protection/TestProtectionWarrior.results @@ -2,34 +2,34 @@ character_stats_results: { key: "TestProtectionWarrior-CharacterStats-Default" value: { final_stats: 1506.472 - final_stats: 460.9 - final_stats: 2859.1255 - final_stats: 196.9 - final_stats: 250.8 + final_stats: 449.9 + final_stats: 2818.3375 + final_stats: 185.9 + final_stats: 239.8 final_stats: 280 final_stats: 109 - final_stats: 169 - final_stats: 229.55 + final_stats: 226 + final_stats: 254.55 final_stats: 0 final_stats: 0 - final_stats: 5665.45479 - final_stats: 169 - final_stats: 806.28978 + final_stats: 5653.2839 + final_stats: 226 + final_stats: 823.20962 final_stats: 0 final_stats: 0 - final_stats: 318.1725 + final_stats: 304.1725 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 30832.9 + final_stats: 30434.58 final_stats: 755.7 - final_stats: 670 - final_stats: 182.95 - final_stats: 1286.236 - final_stats: 444.09687 - final_stats: 241 + final_stats: 672 + final_stats: 170.95 + final_stats: 1439.236 + final_stats: 379.22343 + final_stats: 299 final_stats: 15 - final_stats: 41567.255 + final_stats: 41159.375 final_stats: 75 final_stats: 75 final_stats: 75 @@ -45,7 +45,7 @@ character_stats_results: { stat_weights_results: { key: "TestProtectionWarrior-StatWeights-Default" value: { - weights: 1.12186 + weights: 0.81514 weights: 0 weights: 0 weights: 0 @@ -56,7 +56,7 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.36597 + weights: 0.13876 weights: 0 weights: 0 weights: 0 @@ -65,12 +65,12 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.015 + weights: -0.01813 weights: 0 weights: 0 weights: 0 - weights: 0.42774 - weights: -0.17886 + weights: 0.43436 + weights: 0.2588 weights: 0 weights: 0 weights: 0 @@ -89,632 +89,632 @@ stat_weights_results: { dps_results: { key: "TestProtectionWarrior-AllItems-AshtongueTalismanofValor-32485" value: { - dps: 1940.4294 - tps: 5627.40832 + dps: 2002.9354 + tps: 5799.87838 } } dps_results: { key: "TestProtectionWarrior-AllItems-AustereEarthsiegeDiamond" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-Bandit'sInsignia-40371" value: { - dps: 2000.81 - tps: 5760.1445 + dps: 2063.66365 + tps: 5940.66746 } } dps_results: { key: "TestProtectionWarrior-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 1912.42712 - tps: 5539.14843 + dps: 1989.50769 + tps: 5758.18741 } } dps_results: { key: "TestProtectionWarrior-AllItems-Beast-tamer'sShoulders-30892" value: { - dps: 1873.12 - tps: 5427.37105 + dps: 1948.10259 + tps: 5644.05566 } } dps_results: { key: "TestProtectionWarrior-AllItems-BlessedBattlegearofUndeadSlaying" value: { - dps: 1718.05074 - tps: 5014.47176 + dps: 1759.46944 + tps: 5130.54064 } } dps_results: { key: "TestProtectionWarrior-AllItems-BlessedGarboftheUndeadSlayer" value: { - dps: 1700.62816 - tps: 4953.82787 + dps: 1740.50914 + tps: 5071.68357 } } dps_results: { key: "TestProtectionWarrior-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 1587.40455 - tps: 4665.86485 + dps: 1627.1703 + tps: 4781.6918 } } dps_results: { key: "TestProtectionWarrior-AllItems-BracingEarthsiegeDiamond" value: { - dps: 1908.7515 - tps: 5424.0499 + dps: 1974.22931 + tps: 5606.67982 } } dps_results: { key: "TestProtectionWarrior-AllItems-ChaoticSkyflareDiamond" value: { - dps: 1949.64287 - tps: 5635.19308 + dps: 2012.27016 + tps: 5814.69996 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 1973.69861 - tps: 5687.49221 + dps: 2046.49671 + tps: 5899.6947 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Death-42990" value: { - dps: 2005.04643 - tps: 5750.8993 + dps: 2078.65308 + tps: 5964.75256 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-42987" value: { - dps: 2060.78603 - tps: 5944.50002 + dps: 2100.03605 + tps: 6064.05685 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-44253" value: { - dps: 2029.22049 - tps: 5839.09884 + dps: 2101.92561 + tps: 6053.16841 } } dps_results: { key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-44254" value: { - dps: 1984.88368 - tps: 5739.46798 + dps: 2041.60523 + tps: 5913.41824 } } dps_results: { key: "TestProtectionWarrior-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 1947.57213 - tps: 5624.00811 + dps: 2036.91768 + tps: 5890.16438 } } dps_results: { key: "TestProtectionWarrior-AllItems-DestructiveSkyflareDiamond" value: { - dps: 1916.25695 - tps: 5549.82 + dps: 1993.86183 + tps: 5769.20932 } } dps_results: { key: "TestProtectionWarrior-AllItems-DreadnaughtBattlegear" value: { - dps: 2054.01469 - tps: 5898.59112 + dps: 2118.90011 + tps: 6074.03374 } } dps_results: { key: "TestProtectionWarrior-AllItems-EffulgentSkyflareDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-EmberSkyflareDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 1912.42712 - tps: 5539.14843 + dps: 1989.50769 + tps: 5758.18741 } } dps_results: { key: "TestProtectionWarrior-AllItems-EnigmaticStarflareDiamond" value: { - dps: 1913.11864 - tps: 5542.33677 + dps: 1986.65426 + tps: 5751.5131 } } dps_results: { key: "TestProtectionWarrior-AllItems-EternalEarthsiegeDiamond" value: { - dps: 1920.29611 - tps: 5565.81277 + dps: 1987.28816 + tps: 5756.25162 } } dps_results: { key: "TestProtectionWarrior-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 2009.62693 - tps: 5768.60719 + dps: 2069.34602 + tps: 5941.65384 } } dps_results: { key: "TestProtectionWarrior-AllItems-EyeoftheBroodmother-45308" value: { - dps: 1958.59275 - tps: 5654.62251 + dps: 2031.08615 + tps: 5863.61032 } } dps_results: { key: "TestProtectionWarrior-AllItems-ForgeEmber-37660" value: { - dps: 1949.58352 - tps: 5632.17354 + dps: 2019.80446 + tps: 5834.99497 } } dps_results: { key: "TestProtectionWarrior-AllItems-ForlornSkyflareDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-ForlornStarflareDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 1988.09445 - tps: 5756.78088 + dps: 2041.3583 + tps: 5904.65157 } } dps_results: { key: "TestProtectionWarrior-AllItems-FuturesightRune-38763" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-Gladiator'sBattlegear" value: { - dps: 2299.8514 - tps: 6456.80386 + dps: 2349.71126 + tps: 6596.05721 } } dps_results: { key: "TestProtectionWarrior-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 1912.42712 - tps: 5539.14843 + dps: 1989.50769 + tps: 5758.18741 } } dps_results: { key: "TestProtectionWarrior-AllItems-ImpassiveStarflareDiamond" value: { - dps: 1913.11864 - tps: 5542.33677 + dps: 1986.65426 + tps: 5751.5131 } } dps_results: { key: "TestProtectionWarrior-AllItems-IncisorFragment-37723" value: { - dps: 1972.56637 - tps: 5697.12622 + dps: 2062.36872 + tps: 5954.3178 } } dps_results: { key: "TestProtectionWarrior-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 1923.54912 - tps: 5579.50009 + dps: 1976.70753 + tps: 5721.18593 } } dps_results: { key: "TestProtectionWarrior-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 1925.70246 - tps: 5580.3934 + dps: 1987.92579 + tps: 5764.77344 } } dps_results: { key: "TestProtectionWarrior-AllItems-MajesticDragonFigurine-40430" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-MeteoriteWhetstone-37390" value: { - dps: 1997.67454 - tps: 5754.73466 + dps: 2061.55588 + tps: 5949.289 } } dps_results: { key: "TestProtectionWarrior-AllItems-OfferingofSacrifice-37638" value: { - dps: 1915.20807 - tps: 5555.14344 + dps: 1983.75654 + tps: 5747.67539 } } dps_results: { key: "TestProtectionWarrior-AllItems-OnslaughtArmor" value: { - dps: 1587.55041 - tps: 4645.07048 + dps: 1596.87788 + tps: 4684.99878 } } dps_results: { key: "TestProtectionWarrior-AllItems-OnslaughtBattlegear" value: { - dps: 1758.94438 - tps: 5074.74917 + dps: 1790.12054 + tps: 5161.55378 } } dps_results: { key: "TestProtectionWarrior-AllItems-PersistentEarthshatterDiamond" value: { - dps: 1922.13761 - tps: 5573.75279 + dps: 1982.41745 + tps: 5745.14343 } } dps_results: { key: "TestProtectionWarrior-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 1923.54912 - tps: 5579.50009 + dps: 1976.70753 + tps: 5721.18593 } } dps_results: { key: "TestProtectionWarrior-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-PurifiedShardoftheGods" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-ReignoftheDead-47316" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-ReignoftheDead-47477" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 1950.73137 - tps: 5637.52896 + dps: 1999.87133 + tps: 5781.9813 } } dps_results: { key: "TestProtectionWarrior-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-RuneofRepulsion-40372" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-SealofthePantheon-36993" value: { - dps: 1906.20695 - tps: 5525.43232 + dps: 1973.87956 + tps: 5722.56348 } } dps_results: { key: "TestProtectionWarrior-AllItems-ShinyShardoftheGods" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-SiegebreakerBattlegear" value: { - dps: 2138.44151 - tps: 6121.11172 + dps: 2157.92737 + tps: 6170.0384 } } dps_results: { key: "TestProtectionWarrior-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-SparkofLife-37657" value: { - dps: 1933.36658 - tps: 5595.02982 + dps: 1993.91419 + tps: 5772.08232 } } dps_results: { key: "TestProtectionWarrior-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 1980.45666 - tps: 5737.08234 + dps: 2048.9071 + tps: 5941.13032 } } dps_results: { key: "TestProtectionWarrior-AllItems-StormshroudArmor" value: { - dps: 1563.96999 - tps: 4598.25242 + dps: 1597.09634 + tps: 4692.15419 } } dps_results: { key: "TestProtectionWarrior-AllItems-SwiftSkyflareDiamond" value: { - dps: 1923.54912 - tps: 5579.50009 + dps: 1976.70753 + tps: 5721.18593 } } dps_results: { key: "TestProtectionWarrior-AllItems-SwiftStarflareDiamond" value: { - dps: 1922.13761 - tps: 5573.75279 + dps: 1982.41745 + tps: 5745.14343 } } dps_results: { key: "TestProtectionWarrior-AllItems-SwiftWindfireDiamond" value: { - dps: 1920.52071 - tps: 5560.52963 + dps: 1979.94858 + tps: 5740.42288 } } dps_results: { key: "TestProtectionWarrior-AllItems-TheFistsofFury" value: { - dps: 1581.92528 - tps: 4524.28827 + dps: 1580.71132 + tps: 4529.13126 } } dps_results: { key: "TestProtectionWarrior-AllItems-TheTwinBladesofAzzinoth" value: { - dps: 1723.24304 - tps: 4899.63584 + dps: 1739.40787 + tps: 4944.85999 } } dps_results: { key: "TestProtectionWarrior-AllItems-ThunderingSkyflareDiamond" value: { - dps: 1926.10426 - tps: 5581.53127 + dps: 1995.20031 + tps: 5777.71374 } } dps_results: { key: "TestProtectionWarrior-AllItems-TinyAbominationinaJar-50351" value: { - dps: 2060.81566 - tps: 5972.43603 + dps: 2086.53689 + tps: 6034.63956 } } dps_results: { key: "TestProtectionWarrior-AllItems-TinyAbominationinaJar-50706" value: { - dps: 2067.91537 - tps: 5980.85939 + dps: 2103.48725 + tps: 6076.27182 } } dps_results: { key: "TestProtectionWarrior-AllItems-TirelessSkyflareDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-TirelessStarflareDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 1908.7515 - tps: 5534.6937 + dps: 1974.22931 + tps: 5721.05082 } } dps_results: { key: "TestProtectionWarrior-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 1683.67646 - tps: 4910.09654 + dps: 1725.66052 + tps: 5029.67171 } } dps_results: { key: "TestProtectionWarrior-AllItems-WingedTalisman-37844" value: { - dps: 1898.57105 - tps: 5507.25933 + dps: 1976.00532 + tps: 5732.64124 } } dps_results: { key: "TestProtectionWarrior-AllItems-Wrynn'sBattlegear" value: { - dps: 2295.29797 - tps: 6507.18081 + dps: 2310.55651 + tps: 6540.8145 } } dps_results: { key: "TestProtectionWarrior-AllItems-YmirjarLord'sBattlegear" value: { - dps: 2516.05393 - tps: 7028.70861 + dps: 2606.08043 + tps: 7285.04174 } } dps_results: { key: "TestProtectionWarrior-Average-Default" value: { - dps: 2891.66156 - tps: 7582.04495 - dtps: 111.47521 + dps: 2991.24697 + tps: 7850.42651 + dtps: 118.81527 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 1956.90803 - tps: 5233.97287 + dps: 2026.4224 + tps: 5426.74706 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 1956.90803 - tps: 5186.42209 + dps: 2026.4224 + tps: 5379.22163 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 2149.67465 - tps: 5651.44089 + dps: 2193.59551 + tps: 5776.03822 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 1056.46205 - tps: 2833.88604 + dps: 1089.62095 + tps: 2917.80638 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 1056.46205 - tps: 2786.31965 + dps: 1089.62095 + tps: 2870.19924 } } dps_results: { key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 988.63749 - tps: 2616.43462 + dps: 1017.21049 + tps: 2703.44043 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-LongMultiTarget" value: { - dps: 1974.9549 - tps: 5285.33941 + dps: 2057.29564 + tps: 5512.26069 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-LongSingleTarget" value: { - dps: 1974.9549 - tps: 5237.78543 + dps: 2057.29564 + tps: 5464.73436 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-ShortSingleTarget" value: { - dps: 2151.0983 - tps: 5652.21807 + dps: 2275.2248 + tps: 5983.62007 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-LongMultiTarget" value: { - dps: 1066.07701 - tps: 2857.51694 + dps: 1097.019 + tps: 2945.66357 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-LongSingleTarget" value: { - dps: 1066.07701 - tps: 2809.93769 + dps: 1097.019 + tps: 2898.0604 } } dps_results: { key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-ShortSingleTarget" value: { - dps: 1002.52664 - tps: 2656.38701 + dps: 1017.56702 + tps: 2717.34824 } } dps_results: { key: "TestProtectionWarrior-SwitchInFrontOfTarget-Default" value: { - dps: 3020.02458 - tps: 7916.81241 - dtps: 102.70828 + dps: 3101.33308 + tps: 8149.37222 + dtps: 108.29049 } } diff --git a/sim/warrior/protection/presets.go b/sim/warrior/protection/presets.go index 0adb923df8..ff8c63759d 100644 --- a/sim/warrior/protection/presets.go +++ b/sim/warrior/protection/presets.go @@ -73,7 +73,7 @@ var FullConsumes = &proto.Consumes{ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ { "id": 40546, - "enchant": 44878, + "enchant": 3818, "gems": [ 41380, 40034 @@ -84,41 +84,41 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 39704, - "enchant": 44957, + "enchant": 3852, "gems": [ - 40008 + 40034 ] }, { - "id": 40252, - "enchant": 55002 + "id": 40722, + "enchant": 3605 }, { - "id": 40544, - "enchant": 44489, + "id": 44000, + "enchant": 3832, "gems": [ - 40008, - 40008 + 40034, + 40015 ] }, { "id": 39764, - "enchant": 44944, + "enchant": 3850, "gems": [ 0 ] }, { "id": 40545, - "enchant": 63770, + "enchant": 3860, "gems": [ - 49110, + 40034, 0 ] }, { "id": 39759, - "enchant": 54793, + "enchant": 3601, "gems": [ 40008, 36767 @@ -126,11 +126,14 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40589, - "enchant": 38373 + "enchant": 3822 }, { - "id": 40297, - "enchant": 44491 + "id": 39717, + "enchant": 3232, + "gems": [ + 40089 + ] }, { "id": 40370 @@ -150,11 +153,11 @@ var P1Gear = items.EquipmentSpecFromJsonString(`{"items": [ }, { "id": 40402, - "enchant": 22559 + "enchant": 3788 }, { "id": 40400, - "enchant": 44936 + "enchant": 3849 }, { "id": 41168, diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts index 7e6b2161bc..7e44974f03 100644 --- a/ui/balance_druid/presets.ts +++ b/ui/balance_druid/presets.ts @@ -110,195 +110,194 @@ export const OtherDefaults = { }; export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 40467, - "enchant": 44877, - "gems": [ - 41285, - 42144 - ] - }, - { - "id": 44661, - "gems": [ - 40026 - ] - }, - { - "id": 40470, - "enchant": 44874, - "gems": [ - 42144 - ] - }, - { - "id": 44005, - "enchant": 63765, - "gems": [ - 40026 - ] - }, - { - "id": 40469, - "enchant": 44489, - "gems": [ - 42144, - 39998 - ] - }, - { - "id": 44008, - "enchant": 44498, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40466, - "enchant": 54999, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40561, - "enchant": 54793, - "gems": [ - 39998 - ] - }, - { - "id": 40560, - "enchant": 41602 - }, - { - "id": 40519, - "enchant": 55016 - }, - { - "id": 40399 - }, - { - "id": 40080 - }, - { - "id": 40255 - }, - { - "id": 40432 - }, - { - "id": 40395, - "enchant": 44487 - }, - { - "id": 40192 - }, - { - "id": 40321 - } - ]}`), + name: 'P1 Preset', + tooltip: Tooltips.BASIC_BIS_DISCLAIMER, + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 40467, + "enchant": 3820, + "gems": [ + 41285, + 42144 + ] + }, + { + "id": 44661, + "gems": [ + 40026 + ] + }, + { + "id": 40470, + "enchant": 3810, + "gems": [ + 42144 + ] + }, + { + "id": 44005, + "enchant": 3859, + "gems": [ + 40026 + ] + }, + { + "id": 40469, + "enchant": 3832, + "gems": [ + 42144, + 39998 + ] + }, + { + "id": 44008, + "enchant": 2332, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40466, + "enchant": 3604, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40561, + "enchant": 3601, + "gems": [ + 39998 + ] + }, + { + "id": 40560, + "enchant": 3719 + }, + { + "id": 40519, + "enchant": 3606 + }, + { + "id": 40399 + }, + { + "id": 40080 + }, + { + "id": 40255 + }, + { + "id": 40432 + }, + { + "id": 40395, + "enchant": 3834 + }, + { + "id": 40192 + }, + { + "id": 40321 + } + ]}`), }; export const PRE_RAID_PRESET = { - name: 'Pre-raid Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 42554, - "enchant": 44877, - "gems": [ - 41285, - 40049 - ] - }, - { - "id": 40680 - }, - { - "id": 37673, - "enchant": 44874, - "gems": [ - 42144 - ] - }, - { - "id": 41610, - "enchant": 63765 - }, - { - "id": 39547, - "enchant": 44489, - "gems": [ - 42144, - 40026 - ] - }, - { - "id": 37884, - "enchant": 44498, - "gems": [ - 0 - ] - }, - { - "id": 39544, - "enchant": 54999, - "gems": [ - 42144, - 0 - ] - }, - { - "id": 40696, - "enchant": 54793, - "gems": [ - 40014, - 39998 - ] - }, - { - "id": 37854, - "enchant": 41602 - }, - { - "id": 44202, - "enchant": 55016, - "gems": [ - 39998 - ] - }, - { - "id": 40585 - }, - { - "id": 43253, - "gems": [ - 40026 - ] - }, - { - "id": 37873 - }, - { - "id": 40682 - }, - { - "id": 45085, - "enchant": 44487 - }, - { - "id": 40698 - }, - { - "id": 40712 - } - ] - }`), + name: 'Pre-raid Preset', + tooltip: Tooltips.BASIC_BIS_DISCLAIMER, + gear: EquipmentSpec.fromJsonString(`{ "items": [ + { + "id": 42554, + "enchant": 3820, + "gems": [ + 41285, + 40049 + ] + }, + { + "id": 40680 + }, + { + "id": 37673, + "enchant": 3810, + "gems": [ + 42144 + ] + }, + { + "id": 41610, + "enchant": 3859 + }, + { + "id": 39547, + "enchant": 3832, + "gems": [ + 42144, + 40026 + ] + }, + { + "id": 37884, + "enchant": 2332, + "gems": [ + 0 + ] + }, + { + "id": 39544, + "enchant": 3604, + "gems": [ + 42144, + 0 + ] + }, + { + "id": 40696, + "enchant": 3601, + "gems": [ + 40014, + 39998 + ] + }, + { + "id": 37854, + "enchant": 3719 + }, + { + "id": 44202, + "enchant": 3606, + "gems": [ + 39998 + ] + }, + { + "id": 40585 + }, + { + "id": 43253, + "gems": [ + 40026 + ] + }, + { + "id": 37873 + }, + { + "id": 40682 + }, + { + "id": 45085, + "enchant": 3834 + }, + { + "id": 40698 + }, + { + "id": 40712 + } + ]}`), }; diff --git a/ui/core/components/gear_picker.ts b/ui/core/components/gear_picker.ts index 12821ca1c1..f6a6fd69c9 100644 --- a/ui/core/components/gear_picker.ts +++ b/ui/core/components/gear_picker.ts @@ -191,10 +191,10 @@ class ItemPicker extends Component { this.enchantElem.textContent = description; }); // Make enchant text hover have a tooltip. - if (newItem.enchant.isSpellId) { - this.enchantElem.setAttribute('data-wowhead', `domain=wotlk&spell=${newItem.enchant.id}`); + if (newItem.enchant.spellId) { + this.enchantElem.setAttribute('data-wowhead', `domain=wotlk&spell=${newItem.enchant.spellId}`); } else { - this.enchantElem.setAttribute('data-wowhead', `domain=wotlk&item=${newItem.enchant.id}`); + this.enchantElem.setAttribute('data-wowhead', `domain=wotlk&item=${newItem.enchant.itemId}`); } } @@ -300,8 +300,8 @@ class SelectorModal extends Popup { eligibleEnchants.map(enchant => { return { item: enchant, - id: enchant.id, - actionId: enchant.isSpellId ? ActionId.fromSpellId(enchant.id) : ActionId.fromItemId(enchant.id), + id: enchant.effectId, + actionId: enchant.spellId ? ActionId.fromSpellId(enchant.spellId) : ActionId.fromItemId(enchant.itemId), name: enchant.name, quality: enchant.quality, phase: enchant.phase || 1, diff --git a/ui/core/components/importers.ts b/ui/core/components/importers.ts index ae6977d534..fa6dc9dd20 100644 --- a/ui/core/components/importers.ts +++ b/ui/core/components/importers.ts @@ -114,17 +114,6 @@ export abstract class Importer extends Popup { throw new Error(`Wrong Class! Expected ${classNames[playerClass]} but found ${classNames[charClass]}!`); } - equipmentSpec.items.forEach(item => { - if (item.enchant) { - const dbEnchant = simUI.sim.getEnchantFlexible(item.enchant); - if (dbEnchant) { - item.enchant = dbEnchant.id; - } else { - item.enchant = 0; - } - } - }); - const gear = simUI.sim.lookupEquipmentSpec(equipmentSpec); const expectedEnchantIds = equipmentSpec.items.map(item => item.enchant); diff --git a/ui/core/player.ts b/ui/core/player.ts index a5bb52f2b0..055ef99ec4 100644 --- a/ui/core/player.ts +++ b/ui/core/player.ts @@ -212,12 +212,12 @@ export class Player { } // Returns all items that this player can wear in the given slot. - getItems(slot: ItemSlot | undefined): Array { + getItems(slot: ItemSlot): Array { return this.sim.getItems(slot).filter(item => canEquipItem(item, this.spec, slot)); } // Returns all enchants that this player can wear in the given slot. - getEnchants(slot: ItemSlot | undefined): Array { + getEnchants(slot: ItemSlot): Array { return this.sim.getEnchants(slot).filter(enchant => canEquipEnchant(enchant, this.spec)); } @@ -589,12 +589,12 @@ export class Player { } computeEnchantEP(enchant: Enchant): number { - if (this.enchantEPCache.has(enchant.id)) { - return this.enchantEPCache.get(enchant.id)!; + if (this.enchantEPCache.has(enchant.effectId)) { + return this.enchantEPCache.get(enchant.effectId)!; } let ep = this.computeStatsEP(new Stats(enchant.stats)); - this.enchantEPCache.set(enchant.id, ep); + this.enchantEPCache.set(enchant.effectId, ep); return ep } diff --git a/ui/core/proto_utils/equipped_item.ts b/ui/core/proto_utils/equipped_item.ts index 9aba798736..94a456608f 100644 --- a/ui/core/proto_utils/equipped_item.ts +++ b/ui/core/proto_utils/equipped_item.ts @@ -167,7 +167,7 @@ export class EquippedItem { asSpec(): ItemSpec { return ItemSpec.create({ id: this._item.id, - enchant: this._enchant?.id, + enchant: this._enchant?.effectId, gems: this._gems.map(gem => gem?.id || 0), }); } diff --git a/ui/core/sim.ts b/ui/core/sim.ts index 6431ccd8a5..de6cd0ddf1 100644 --- a/ui/core/sim.ts +++ b/ui/core/sim.ts @@ -83,7 +83,7 @@ export class Sim { // Database private items: Record = {}; - private enchants: Enchant[] = []; + private enchantsBySlot: Partial> = {}; private gems: Record = {}; private presetEncounters: Record = {}; private presetTargets: Record = {}; @@ -122,8 +122,15 @@ export class Sim { this._initPromise = this.workerPool.getGearList(GearListRequest.create()).then(result => { result.items.forEach(item => this.items[item.id] = item); - // result.enchants.forEach(enchant => this.enchants[enchant.id] = enchant); - this.enchants = result.enchants; + result.enchants.forEach(enchant => { + const slots = getEligibleEnchantSlots(enchant); + slots.forEach(slot => { + if (!this.enchantsBySlot[slot]) { + this.enchantsBySlot[slot] = []; + } + this.enchantsBySlot[slot]!.push(enchant); + }); + }); result.gems.forEach(gem => this.gems[gem.id] = gem); result.encounters.forEach(encounter => this.presetEncounters[encounter.path] = encounter); result.encounters.map(e => e.targets).flat().forEach(target => this.presetTargets[target.path] = target); @@ -320,25 +327,14 @@ export class Sim { } } - getItems(slot: ItemSlot | undefined): Array { + getItems(slot: ItemSlot): Array { let items = Object.values(this.items); - if (slot != undefined) { - items = items.filter(item => getEligibleItemSlots(item).includes(slot)); - } + items = items.filter(item => getEligibleItemSlots(item).includes(slot)); return items; } - getEnchants(slot: ItemSlot | undefined): Array { - let enchants = Object.values(this.enchants); - if (slot != undefined) { - enchants = enchants.filter(enchant => getEligibleEnchantSlots(enchant).includes(slot)); - } - return enchants; - } - - // ID can be the formula ID OR the effect ID. - getEnchantFlexible(id: number): Enchant | null { - return Object.values(this.enchants).find(enchant => enchant.id == id || enchant.effectId == id) || null; + getEnchants(slot: ItemSlot): Array { + return this.enchantsBySlot[slot] || []; } getGems(socketColor?: GemColor): Array { @@ -499,7 +495,18 @@ export class Sim { if (!item) return null; - const enchant = itemSpec.enchant > 0 ? this.enchants.find(e => (e.id == itemSpec.enchant && e.type == item.type)) : null; + let enchant: Enchant | null = null; + if (itemSpec.enchant) { + const slots = getEligibleItemSlots(item); + for (let i = 0; i < slots.length; i++) { + enchant = (this.enchantsBySlot[slots[i]] || []) + .find(enchant => [enchant.effectId, enchant.itemId, enchant.spellId].includes(itemSpec.enchant)) || null; + if (enchant) { + break; + } + } + } + const gems = itemSpec.gems.map(gemId => this.gems[gemId] || null); return new EquippedItem(item, enchant, gems); diff --git a/ui/deathknight/presets.ts b/ui/deathknight/presets.ts index 2822ea891a..79a564bc25 100644 --- a/ui/deathknight/presets.ts +++ b/ui/deathknight/presets.ts @@ -197,689 +197,590 @@ export const DefaultConsumes = Consumes.create({ export const P1_UNHOLY_2H_PRERAID_PRESET = { name: 'Pre-Raid 2H Unholy', toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().summonGargoyle, + enableWhen: (player: Player) => player.getTalentTree() == 2, gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 41386, - "enchant": 44879, - "gems": [ - 41400, - 49110 - ] - }, - { - "id": 37397 - }, - { - "id": 37627, - "enchant": 44871, - "gems": [ - 39996 - ] - }, - { - "id": 37647, - "enchant": 44472 - }, - { - "id": 39617, - "enchant": 44489, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 41355, - "enchant": 44484, - "gems": [ - 0 - ] - }, - { - "id": 39618, - "enchant": 54999, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40688, - "gems": [ - 39996, - 42142 - ] - }, - { - "id": 37193, - "enchant": 38374, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 44306, - "enchant": 55016, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 37642 - }, - { - "id": 44935 - }, - { - "id": 40684 - }, - { - "id": 42987 - }, - { - "id": 41257, - "enchant": 53344 - }, - {}, - { - "id": 40867 - } + { + "id": 41386, + "enchant": 3817, + "gems": [ + 41400, + 49110 + ] + }, + { + "id": 37397 + }, + { + "id": 37627, + "enchant": 3808, + "gems": [ + 39996 + ] + }, + { + "id": 37647, + "enchant": 3831 + }, + { + "id": 39617, + "enchant": 3832, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 41355, + "enchant": 3845, + "gems": [ + 0 + ] + }, + { + "id": 39618, + "enchant": 3604, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40688, + "gems": [ + 39996, + 42142 + ] + }, + { + "id": 37193, + "enchant": 3823, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 44306, + "enchant": 3606, + "gems": [ + 39996, + 39996 + ] + }, + { + "id": 37642 + }, + { + "id": 44935 + }, + { + "id": 40684 + }, + { + "id": 42987 + }, + { + "id": 41257, + "enchant": 3368 + }, + {}, + { + "id": 40867 + } ]}`), }; export const P1_UNHOLY_2H_BIS_PRESET = { name: 'P1 2H Unholy', toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().summonGargoyle, + enableWhen: (player: Player) => player.getTalentTree() == 2, gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 44006, - "enchant": 44879, - "gems": [ - 41400, - 49110 - ] - }, - { - "id": 44664, - "gems": [ - 39996 - ] - }, - { - "id": 40557, - "enchant": 44871, - "gems": [ - 39996 - ] - }, - { - "id": 40403, - "enchant": 44472 - }, - { - "id": 40550, - "enchant": 44489, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 40330, - "enchant": 44484, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40552, - "enchant": 54999, - "gems": [ - 40038, - 0 - ] - }, - { - "id": 40278, - "gems": [ - 42142, - 42142 - ] - }, - { - "id": 40556, - "enchant": 38374, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 40591, - "enchant": 55016 - }, - { - "id": 39401 - }, - { - "id": 40075 - }, - { - "id": 40256 - }, - { - "id": 42987 - }, - { - "id": 40384, - "enchant": 53344 - }, - {}, - { - "id": 40207 - } + { + "id": 44006, + "enchant": 3817, + "gems": [ + 41400, + 49110 + ] + }, + { + "id": 44664, + "gems": [ + 39996 + ] + }, + { + "id": 40557, + "enchant": 3808, + "gems": [ + 39996 + ] + }, + { + "id": 40403, + "enchant": 3831 + }, + { + "id": 40550, + "enchant": 3832, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 40330, + "enchant": 3845, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40552, + "enchant": 3604, + "gems": [ + 40038, + 0 + ] + }, + { + "id": 40278, + "gems": [ + 42142, + 42142 + ] + }, + { + "id": 40556, + "enchant": 3823, + "gems": [ + 39996, + 39996 + ] + }, + { + "id": 40591, + "enchant": 3606 + }, + { + "id": 39401 + }, + { + "id": 40075 + }, + { + "id": 40256 + }, + { + "id": 42987 + }, + { + "id": 40384, + "enchant": 3368 + }, + {}, + { + "id": 40207 + } ]}`), }; export const P1_UNHOLY_DW_PRERAID_PRESET = { name: 'Pre-Raid DW Unholy', toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().summonGargoyle, + enableWhen: (player: Player) => player.getTalentTree() == 2, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 41386, - "enchant": 44879, - "gems": [ - 41400, - 49110 - ] - }, - { - "id": 37397 - }, - { - "id": 37627, - "enchant": 44871, - "gems": [ - 39996 - ] - }, - { - "id": 37647, - "enchant": 44472 - }, - { - "id": 39617, - "enchant": 44489, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 41355, - "enchant": 44484, - "gems": [ - 0 - ] - }, - { - "id": 39618, - "enchant": 54999, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40688, - "gems": [ - 39996, - 42142 - ] - }, - { - "id": 37193, - "enchant": 38374, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 44306, - "enchant": 55016, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 37642 - }, - { - "id": 44935 - }, - { - "id": 40684 - }, - { - "id": 42987 - }, - { - "id": 41383, - "enchant": 53344 - }, - { - "id": 40703, - "enchant": 44495 - }, - { - "id": 40867 - } + { + "id": 41386, + "enchant": 3817, + "gems": [ + 41400, + 49110 + ] + }, + { + "id": 37397 + }, + { + "id": 37627, + "enchant": 3808, + "gems": [ + 39996 + ] + }, + { + "id": 37647, + "enchant": 3831 + }, + { + "id": 39617, + "enchant": 3832, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 41355, + "enchant": 3845, + "gems": [ + 0 + ] + }, + { + "id": 39618, + "enchant": 3604, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40688, + "gems": [ + 39996, + 42142 + ] + }, + { + "id": 37193, + "enchant": 3823, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 44306, + "enchant": 3606, + "gems": [ + 39996, + 39996 + ] + }, + { + "id": 37642 + }, + { + "id": 44935 + }, + { + "id": 40684 + }, + { + "id": 42987 + }, + { + "id": 41383, + "enchant": 3368 + }, + { + "id": 40703, + "enchant": 3790 + }, + { + "id": 40867 + } ]}`), }; export const P1_UNHOLY_DW_BIS_PRESET = { name: 'P1 DW Unholy', toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().summonGargoyle, + enableWhen: (player: Player) => player.getTalentTree() == 2, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 44006, - "enchant": 44879, - "gems": [ - 41398, - 42702 - ] - }, - { - "id": 39421 - }, - { - "id": 40557, - "enchant": 44871, - "gems": [ - 39996 - ] - }, - { - "id": 40403, - "enchant": 44472 - }, - { - "id": 40550, - "enchant": 44489, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 40330, - "enchant": 44484, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40347, - "enchant": 54999, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40278, - "gems": [ - 42142, - 42142 - ] - }, - { - "id": 40294, - "enchant": 38374 - }, - { - "id": 39706, - "enchant": 55016, - "gems": [ - 39996 - ] - }, - { - "id": 39401 - }, - { - "id": 40075 - }, - { - "id": 37390 - }, - { - "id": 42987 - }, - { - "id": 40402, - "enchant": 53344 - }, - { - "id": 40491, - "enchant": 53344 - }, - { - "id": 42620 - } + { + "id": 44006, + "enchant": 3817, + "gems": [ + 41398, + 42702 + ] + }, + { + "id": 39421 + }, + { + "id": 40557, + "enchant": 3808, + "gems": [ + 39996 + ] + }, + { + "id": 40403, + "enchant": 3831 + }, + { + "id": 40550, + "enchant": 3832, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 40330, + "enchant": 3845, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40347, + "enchant": 3604, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40278, + "gems": [ + 42142, + 42142 + ] + }, + { + "id": 40294, + "enchant": 3823 + }, + { + "id": 39706, + "enchant": 3606, + "gems": [ + 39996 + ] + }, + { + "id": 39401 + }, + { + "id": 40075 + }, + { + "id": 37390 + }, + { + "id": 42987 + }, + { + "id": 40402, + "enchant": 3368 + }, + { + "id": 40491, + "enchant": 3368 + }, + { + "id": 42620 + } ]}`), }; export const P1_FROST_PRE_BIS_PRESET = { name: 'Pre-Raid Frost', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().howlingBlast, + enableWhen: (player: Player) => player.getTalentTree() == 1, gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 41386, - "enchant": 44879, - "gems": [ - 41398, - 49110 - ] - }, - { - "id": 42645, - "gems": [ - 42142 - ] - }, - { - "id": 34388, - "enchant": 44871, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 37647, - "enchant": 44472 - }, - { - "id": 39617, - "enchant": 44489, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 41355, - "enchant": 44484, - "gems": [ - 0 - ] - }, - { - "id": 39618, - "enchant": 54999, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 37171, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 37193, - "enchant": 38374, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 44306, - "enchant": 55016, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 42642, - "gems": [ - 39996 - ] - }, - { - "id": 44935 - }, - { - "id": 40684 - }, - { - "id": 42987 - }, - { - "id": 41383, - "enchant": 53343 - }, - { - "id": 43611, - "enchant": 53344 - }, - { - "id": 40715 - } + { + "id": 41386, + "enchant": 3817, + "gems": [ + 41398, + 49110 + ] + }, + { + "id": 42645, + "gems": [ + 42142 + ] + }, + { + "id": 34388, + "enchant": 3808, + "gems": [ + 39996, + 39996 + ] + }, + { + "id": 37647, + "enchant": 3831 + }, + { + "id": 39617, + "enchant": 3832, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 41355, + "enchant": 3845, + "gems": [ + 0 + ] + }, + { + "id": 39618, + "enchant": 3604, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 37171, + "gems": [ + 39996, + 39996 + ] + }, + { + "id": 37193, + "enchant": 3823, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 44306, + "enchant": 3606, + "gems": [ + 39996, + 39996 + ] + }, + { + "id": 42642, + "gems": [ + 39996 + ] + }, + { + "id": 44935 + }, + { + "id": 40684 + }, + { + "id": 42987 + }, + { + "id": 41383, + "enchant": 3370 + }, + { + "id": 43611, + "enchant": 3368 + }, + { + "id": 40715 + } ]}`), }; export const P1_FROST_BIS_PRESET = { name: 'P1 Frost', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().howlingBlast, + enableWhen: (player: Player) => player.getTalentTree() == 1, gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 44006, - "enchant": 44879, - "gems": [ - 41398, - 42702 - ] - }, - { - "id": 44664, - "gems": [ - 39996 - ] - }, - { - "id": 40557, - "enchant": 44871, - "gems": [ - 39996 - ] - }, - { - "id": 40403, - "enchant": 44472 - }, - { - "id": 40550, - "enchant": 44489, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 40330, - "enchant": 44484, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40552, - "enchant": 54999, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40278, - "gems": [ - 39996, - 42142 - ] - }, - { - "id": 40556, - "enchant": 38374, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 40591, - "enchant": 55016 - }, - { - "id": 39401 - }, - { - "id": 40075 - }, - { - "id": 40256 - }, - { - "id": 42987 - }, - { - "id": 40189, - "enchant": 53343 - }, - { - "id": 40189, - "enchant": 53344 - }, - { - "id": 40207 - } - ]}`), -}; - -export const P1_BLOOD_BIS_PRESET = { - name: 'P1 Blood', - toolbar: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().dancingRuneWeapon, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 44006, - "enchant": 44879, - "gems": [ - 41398, - 49110 - ] - }, - { - "id": 44664, - "gems": [ - 39996 - ] - }, - { - "id": 40557, - "enchant": 44871, - "gems": [ - 39996 - ] - }, - { - "id": 40250, - "enchant": 44472 - }, - { - "id": 40550, - "enchant": 44489, - "gems": [ - 42142, - 39996 - ] - }, - { - "id": 40330, - "enchant": 44484, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40552, - "enchant": 54999, - "gems": [ - 40038, - 0 - ] - }, - { - "id": 40278, - "gems": [ - 42142, - 42142 - ] - }, - { - "id": 40556, - "enchant": 38374, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 40591, - "enchant": 55016 - }, - { - "id": 43993, - "gems": [ - 39996 - ] - }, - { - "id": 40075 - }, - { - "id": 40256 - }, - { - "id": 42987 - }, - { - "id": 40384, - "enchant": 53344 - }, - {}, - { - "id": 40207 - } + { + "id": 44006, + "enchant": 3817, + "gems": [ + 41398, + 42702 + ] + }, + { + "id": 44664, + "gems": [ + 39996 + ] + }, + { + "id": 40557, + "enchant": 3808, + "gems": [ + 39996 + ] + }, + { + "id": 40403, + "enchant": 3831 + }, + { + "id": 40550, + "enchant": 3832, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 40330, + "enchant": 3845, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40552, + "enchant": 3604, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40278, + "gems": [ + 39996, + 42142 + ] + }, + { + "id": 40556, + "enchant": 3823, + "gems": [ + 42142, + 39996 + ] + }, + { + "id": 40591, + "enchant": 3606 + }, + { + "id": 39401 + }, + { + "id": 40075 + }, + { + "id": 40256 + }, + { + "id": 42987 + }, + { + "id": 40189, + "enchant": 3370 + }, + { + "id": 40189, + "enchant": 3368 + }, + { + "id": 40207 + } ]}`), }; diff --git a/ui/deathknight/sim.ts b/ui/deathknight/sim.ts index 38e5788602..5ef5366dd6 100644 --- a/ui/deathknight/sim.ts +++ b/ui/deathknight/sim.ts @@ -175,8 +175,8 @@ export class DeathknightSimUI extends IndividualSimUI { Presets.P1_FROST_PRE_BIS_PRESET, Presets.P1_FROST_BIS_PRESET, Presets.P1_UNHOLY_DW_PRERAID_PRESET, - Presets.P1_UNHOLY_DW_BIS_PRESET, Presets.P1_UNHOLY_2H_PRERAID_PRESET, + Presets.P1_UNHOLY_DW_BIS_PRESET, Presets.P1_UNHOLY_2H_BIS_PRESET, ], }, diff --git a/ui/elemental_shaman/presets.ts b/ui/elemental_shaman/presets.ts index dbab2d59fd..79eacf8ecb 100644 --- a/ui/elemental_shaman/presets.ts +++ b/ui/elemental_shaman/presets.ts @@ -72,290 +72,284 @@ export const DefaultConsumes = Consumes.create({ export const SWP_PRESET = { name: 'SWP Pre-Raid Preset', tooltip: "Pre-raid preset that includes some gear from SWP.", - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { - "id": 34332, - "enchant": 44877, - "gems": [ - 40049, - 41285 - ] - }, - { - "id": 37595 - }, - { - "id": 31023, - "enchant": 44874, - "gems": [ - 42144, - 40049 - ] - }, - { - "id": 41610, - "enchant": 55642 - }, - { - "id": 39592, - "enchant": 44489, - "gems": [ - 42144, - 40025 - ] - }, - { - "id": 34437, - "enchant": 44498, - "gems": [ - 40049, - 0 - ] - }, - { - "id": 34344, - "enchant": 44592, - "gems": [ - 40049, - 42144, - 0 - ] - }, - { - "id": 34542, - "gems": [ - 40049, - 39998 - ] - }, - { - "id": 37791, - "enchant": 41602 - }, - { - "id": 34566, - "enchant": 60623, - "gems": [ - 40049 - ] - }, - { - "id": 43253, - "gems": [ - 40027 - ] - }, - { - "id": 37694 - }, - { - "id": 40682 - }, - { - "id": 37873 - }, - { - "id": 41384, - "enchant": 44487 - }, - { - "id": 40698 - }, - { - "id": 32330 - } - ] - }`), + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 34332, + "enchant": 3820, + "gems": [ + 40049, + 41285 + ] + }, + { + "id": 37595 + }, + { + "id": 31023, + "enchant": 3810, + "gems": [ + 42144, + 40049 + ] + }, + { + "id": 41610, + "enchant": 3722 + }, + { + "id": 39592, + "enchant": 3832, + "gems": [ + 42144, + 40025 + ] + }, + { + "id": 34437, + "enchant": 2332, + "gems": [ + 40049, + 0 + ] + }, + { + "id": 34344, + "enchant": 3246, + "gems": [ + 40049, + 42144, + 0 + ] + }, + { + "id": 34542, + "gems": [ + 40049, + 39998 + ] + }, + { + "id": 37791, + "enchant": 3719 + }, + { + "id": 34566, + "enchant": 3826, + "gems": [ + 40049 + ] + }, + { + "id": 43253, + "gems": [ + 40027 + ] + }, + { + "id": 37694 + }, + { + "id": 40682 + }, + { + "id": 37873 + }, + { + "id": 41384, + "enchant": 3834 + }, + { + "id": 40698 + }, + { + "id": 32330 + } + ]}`), }; export const PRE_RAID_PRESET = { name: 'Pre-raid Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { - "id": 37180, - "enchant": 44877, - "gems": [ - 41285, - 42144 - ] - }, - { - "id": 37595 - }, - { - "id": 37673, - "enchant": 44874, - "gems": [ - 42144 - ] - }, - { - "id": 41610, - "enchant": 55642 - }, - { - "id": 39592, - "enchant": 44489, - "gems": [ - 42144, - 40025 - ] - }, - { - "id": 37788, - "enchant": 44498, - "gems": [ - 0 - ] - }, - { - "id": 39593, - "enchant": 44592, - "gems": [ - 40051, - 0 - ] - }, - { - "id": 40696, - "gems": [ - 40049, - 39998 - ] - }, - { - "id": 37791, - "enchant": 41602 - }, - { - "id": 44202, - "enchant": 60623, - "gems": [ - 39998 - ] - }, - { - "id": 43253, - "gems": [ - 40027 - ] - }, - { - "id": 37694 - }, - { - "id": 40682 - }, - { - "id": 37873 - }, - { - "id": 41384, - "enchant": 44487 - }, - { - "id": 40698 - }, - { - "id": 40708 - } - ] - }`), + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 37180, + "enchant": 3820, + "gems": [ + 41285, + 42144 + ] + }, + { + "id": 37595 + }, + { + "id": 37673, + "enchant": 3810, + "gems": [ + 42144 + ] + }, + { + "id": 41610, + "enchant": 3722 + }, + { + "id": 39592, + "enchant": 3832, + "gems": [ + 42144, + 40025 + ] + }, + { + "id": 37788, + "enchant": 2332, + "gems": [ + 0 + ] + }, + { + "id": 39593, + "enchant": 3246, + "gems": [ + 40051, + 0 + ] + }, + { + "id": 40696, + "gems": [ + 40049, + 39998 + ] + }, + { + "id": 37791, + "enchant": 3719 + }, + { + "id": 44202, + "enchant": 3826, + "gems": [ + 39998 + ] + }, + { + "id": 43253, + "gems": [ + 40027 + ] + }, + { + "id": 37694 + }, + { + "id": 40682 + }, + { + "id": 37873 + }, + { + "id": 41384, + "enchant": 3834 + }, + { + "id": 40698 + }, + { + "id": 40708 + } + ]}`), }; export const P1_PRESET = { name: 'P1 Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { - "id": 40516, - "enchant": 44877, - "gems": [ - 41285, - 40027 - ] - }, - { - "id": 44661, - "gems": [ - 39998 - ] - }, - { - "id": 40286, - "enchant": 44874 - }, - { - "id": 44005, - "enchant": 55642, - "gems": [ - 40027 - ] - }, - { - "id": 40514, - "enchant": 44489, - "gems": [ - 42144, - 42144 - ] - }, - { - "id": 40324, - "enchant": 44498, - "gems": [ - 42144, - 0 - ] - }, - { - "id": 40302, - "enchant": 44592, - "gems": [ - 0 - ] - }, - { - "id": 40301, - "gems": [ - 40014 - ] - }, - { - "id": 40560, - "enchant": 41604 - }, - { - "id": 40519, - "enchant": 60623 - }, - { - "id": 37694 - }, - { - "id": 40399 - }, - { - "id": 40432 - }, - { - "id": 40255 - }, - { - "id": 40395, - "enchant": 44487 - }, - { - "id": 40401, - "enchant": 60653 - }, - { - "id": 40267 - } - ] - }`), + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 40516, + "enchant": 3820, + "gems": [ + 41285, + 40027 + ] + }, + { + "id": 44661, + "gems": [ + 39998 + ] + }, + { + "id": 40286, + "enchant": 3810 + }, + { + "id": 44005, + "enchant": 3722, + "gems": [ + 40027 + ] + }, + { + "id": 40514, + "enchant": 3832, + "gems": [ + 42144, + 42144 + ] + }, + { + "id": 40324, + "enchant": 2332, + "gems": [ + 42144, + 0 + ] + }, + { + "id": 40302, + "enchant": 3246, + "gems": [ + 0 + ] + }, + { + "id": 40301, + "gems": [ + 40014 + ] + }, + { + "id": 40560, + "enchant": 3721 + }, + { + "id": 40519, + "enchant": 3826 + }, + { + "id": 37694 + }, + { + "id": 40399 + }, + { + "id": 40432 + }, + { + "id": 40255 + }, + { + "id": 40395, + "enchant": 3834 + }, + { + "id": 40401, + "enchant": 1128 + }, + { + "id": 40267 + } + ]}`), }; diff --git a/ui/enhancement_shaman/presets.ts b/ui/enhancement_shaman/presets.ts index 569d1f3dc9..9887e98818 100644 --- a/ui/enhancement_shaman/presets.ts +++ b/ui/enhancement_shaman/presets.ts @@ -124,191 +124,188 @@ export const PreRaid_PRESET = { name: 'Preraid Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 43311, - "enchant": 44879, - "gems": [ - 41398, - 42156 - ] - }, - { - "id": 40678 - }, - { - "id": 37373, - "enchant": 44871 - }, - { - "id": 37840, - "enchant": 55002 - }, - { - "id": 39597, - "enchant": 44489, - "gems": [ - 40053, - 40088 - ] - }, - { - "id": 43131, - "enchant": 44484, - "gems": [ - 0 - ] - }, - { - "id": 39601, - "enchant": 54999, - "gems": [ - 40053, - 0 - ] - }, - { - "id": 37407, - "gems": [ - 42156 - ] - }, - { - "id": 37669, - "enchant": 38374 - }, - { - "id": 37167, - "enchant": 55016, - "gems": [ - 40053, - 42156 - ] - }, - { - "id": 37685 - }, - { - "id": 37642 - }, - { - "id": 37390 - }, - { - "id": 40684 - }, - { - "id": 41384, - "enchant": 44492 - }, - { - "id": 40704, - "enchant": 44492 - }, - { - "id": 37575 - }, - { - "id": 33507 - } - ]}`) + { + "id": 43311, + "enchant": 3817, + "gems": [ + 41398, + 42156 + ] + }, + { + "id": 40678 + }, + { + "id": 37373, + "enchant": 3808 + }, + { + "id": 37840, + "enchant": 3605 + }, + { + "id": 39597, + "enchant": 3832, + "gems": [ + 40053, + 40088 + ] + }, + { + "id": 43131, + "enchant": 3845, + "gems": [ + 0 + ] + }, + { + "id": 39601, + "enchant": 3604, + "gems": [ + 40053, + 0 + ] + }, + { + "id": 37407, + "gems": [ + 42156 + ] + }, + { + "id": 37669, + "enchant": 3823 + }, + { + "id": 37167, + "enchant": 3606, + "gems": [ + 40053, + 42156 + ] + }, + { + "id": 37685 + }, + { + "id": 37642 + }, + { + "id": 37390 + }, + { + "id": 40684 + }, + { + "id": 41384, + "enchant": 3789 + }, + { + "id": 40704, + "enchant": 3789 + }, + { + "id": 33507 + } + ]}`), } export const P1_PRESET = { name: 'P1 Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 40543, - "enchant": 44879, - "gems": [ - 41398, - 40014 - ] - }, - { - "id": 44661, - "gems": [ - 40014 - ] - }, - { - "id": 40524, - "enchant": 44871, - "gems": [ - 40014 - ] - }, - { - "id": 40403, - "enchant": 55002 - }, - { - "id": 40523, - "enchant": 44489, - "gems": [ - 40003, - 40014 - ] - }, - { - "id": 40282, - "enchant": 44484, - "gems": [ - 42702, - 0 - ] - }, - { - "id": 40520, - "enchant": 54999, - "gems": [ - 42154, - 0 - ] - }, - { - "id": 40275, - "gems": [ - 42156 - ] - }, - { - "id": 40522, - "enchant": 38374, - "gems": [ - 39999, - 42156 - ] - }, - { - "id": 40367, - "enchant": 55016, - "gems": [ - 40058 - ] - }, - { - "id": 40474 - }, - { - "id": 40074 - }, - { - "id": 40684 - }, - { - "id": 37390 - }, - { - "id": 39763, - "enchant": 44492 - }, - { - "id": 39468, - "enchant": 44492 - }, - { - "id": 40322 - } - ]}`), + { + "id": 40543, + "enchant": 3817, + "gems": [ + 41398, + 40014 + ] + }, + { + "id": 44661, + "gems": [ + 40014 + ] + }, + { + "id": 40524, + "enchant": 3808, + "gems": [ + 40014 + ] + }, + { + "id": 40403, + "enchant": 3605 + }, + { + "id": 40523, + "enchant": 3832, + "gems": [ + 40003, + 40014 + ] + }, + { + "id": 40282, + "enchant": 3845, + "gems": [ + 42702, + 0 + ] + }, + { + "id": 40520, + "enchant": 3604, + "gems": [ + 42154, + 0 + ] + }, + { + "id": 40275, + "gems": [ + 42156 + ] + }, + { + "id": 40522, + "enchant": 3823, + "gems": [ + 39999, + 42156 + ] + }, + { + "id": 40367, + "enchant": 3606, + "gems": [ + 40058 + ] + }, + { + "id": 40474 + }, + { + "id": 40074 + }, + { + "id": 40684 + }, + { + "id": 37390 + }, + { + "id": 39763, + "enchant": 3789 + }, + { + "id": 39468, + "enchant": 3789 + }, + { + "id": 40322 + } + ]}`), }; diff --git a/ui/feral_druid/presets.ts b/ui/feral_druid/presets.ts index e2b7ff5d6e..eb81631136 100644 --- a/ui/feral_druid/presets.ts +++ b/ui/feral_druid/presets.ts @@ -71,81 +71,81 @@ export const PreRaid_PRESET = { name: 'PreRaid', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 42550, - "enchant": 44879, - "gems": [ - 41398, - 39996 - ] - }, - { - "id": 40678 - }, - { - "id": 37139, - "enchant": 44871, - "gems": [ - 39996 - ] - }, - { - "id": 37840, - "enchant": 55002 - }, - { - "id": 37219, - "enchant": 44489 - }, - { - "id": 44203, - "enchant": 44484, - "gems": [ - 0 - ] - }, - { - "id": 37409, - "enchant": 54999, - "gems": [ - 0 - ] - }, - { - "id": 40694, - "gems": [ - 49110, - 39996 - ] - }, - { - "id": 37644, - "enchant": 38374 - }, - { - "id": 44297, - "enchant": 55016 - }, - { - "id": 37642 - }, - { - "id": 37624 - }, - { - "id": 40684 - }, - { - "id": 37166 - }, - { - "id": 37883, - "enchant": 44483 - }, - {}, - { - "id": 40713 - } + { + "id": 42550, + "enchant": 3817, + "gems": [ + 41398, + 39996 + ] + }, + { + "id": 40678 + }, + { + "id": 37139, + "enchant": 3808, + "gems": [ + 39996 + ] + }, + { + "id": 37840, + "enchant": 3605 + }, + { + "id": 37219, + "enchant": 3832 + }, + { + "id": 44203, + "enchant": 3845, + "gems": [ + 0 + ] + }, + { + "id": 37409, + "enchant": 3604, + "gems": [ + 0 + ] + }, + { + "id": 40694, + "gems": [ + 49110, + 39996 + ] + }, + { + "id": 37644, + "enchant": 3823 + }, + { + "id": 44297, + "enchant": 3606 + }, + { + "id": 37642 + }, + { + "id": 37624 + }, + { + "id": 40684 + }, + { + "id": 37166 + }, + { + "id": 37883, + "enchant": 3827 + }, + {}, + { + "id": 40713 + } ]}`), }; @@ -153,93 +153,93 @@ export const P1_PRESET = { name: 'P1 Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 40473, - "enchant": 44879, - "gems": [ - 41398, - 39996 - ] - }, - { - "id": 44664, - "gems": [ - 39996 - ] - }, - { - "id": 40494, - "enchant": 44871, - "gems": [ - 39996 - ] - }, - { - "id": 40403, - "enchant": 55002 - }, - { - "id": 40539, - "enchant": 44489, - "gems": [ - 39996 - ] - }, - { - "id": 39765, - "enchant": 44484, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40541, - "enchant": 54999, - "gems": [ - 0 - ] - }, - { - "id": 40205, - "gems": [ - 39996 - ] - }, - { - "id": 44011, - "enchant": 38374, - "gems": [ - 39996, - 49110 - ] - }, - { - "id": 40243, - "enchant": 55016, - "gems": [ - 40014 - ] - }, - { - "id": 40474 - }, - { - "id": 40717 - }, - { - "id": 42987 - }, - { - "id": 40256 - }, - { - "id": 40388, - "enchant": 44492 - }, - {}, - { - "id": 39757 - } - ]}`), -}; \ No newline at end of file + { + "id": 40473, + "enchant": 3817, + "gems": [ + 41398, + 39996 + ] + }, + { + "id": 44664, + "gems": [ + 39996 + ] + }, + { + "id": 40494, + "enchant": 3808, + "gems": [ + 39996 + ] + }, + { + "id": 40403, + "enchant": 3605 + }, + { + "id": 40539, + "enchant": 3832, + "gems": [ + 39996 + ] + }, + { + "id": 39765, + "enchant": 3845, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40541, + "enchant": 3604, + "gems": [ + 0 + ] + }, + { + "id": 40205, + "gems": [ + 39996 + ] + }, + { + "id": 44011, + "enchant": 3823, + "gems": [ + 39996, + 49110 + ] + }, + { + "id": 40243, + "enchant": 3606, + "gems": [ + 40014 + ] + }, + { + "id": 40474 + }, + { + "id": 40717 + }, + { + "id": 42987 + }, + { + "id": 40256 + }, + { + "id": 40388, + "enchant": 3789 + }, + {}, + { + "id": 39757 + } + ]}`), +}; diff --git a/ui/feral_tank_druid/presets.ts b/ui/feral_tank_druid/presets.ts index 035823455f..f851f1511a 100644 --- a/ui/feral_tank_druid/presets.ts +++ b/ui/feral_tank_druid/presets.ts @@ -54,370 +54,12 @@ export const DefaultConsumes = Consumes.create({ }); export const P1_PRESET = { - name: 'P1 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 29098, - "enchant": 29192, - "gems": [ - 24067, - 32409 - ] - }, - { - "id": 28509 - }, - { - "id": 29100, - "enchant": 28911, - "gems": [ - 24033, - 24033 - ] - }, - { - "id": 28660, - "enchant": 34004 - }, - { - "id": 29096, - "enchant": 24003, - "gems": [ - 24067, - 24055, - 24055 - ] - }, - { - "id": 28978, - "enchant": 22533, - "gems": [ - 24033 - ] - }, - { - "id": 29097, - "enchant": 33153 - }, - { - "id": 28986 - }, - { - "id": 29099, - "enchant": 29536 - }, - { - "id": 30674, - "enchant": 35297 - }, - { - "id": 29279, - "enchant": 22538 - }, - { - "id": 28792, - "enchant": 22538 - }, - { - "id": 28830 - }, - { - "id": 23836 - }, - { - "id": 28476, - "enchant": 22556 - }, - { - "id": 23198 - } - ]}`), -}; - -export const P2_PRESET = { - name: 'P2 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 30228, - "enchant": 29192, - "gems": [ - 24055, - 32409 - ] - }, - { - "id": 33066, - "gems": [ - 24061 - ] - }, - { - "id": 30230, - "enchant": 28888, - "gems": [ - 24033, - 24033 - ] - }, - { - "id": 28660, - "enchant": 34004 - }, - { - "id": 30222, - "enchant": 24003, - "gems": [ - 24033, - 24061, - 24055 - ] - }, - { - "id": 32810, - "enchant": 22533, - "gems": [ - 24033 - ] - }, - { - "id": 30223, - "enchant": 33153 - }, - { - "id": 30106, - "gems": [ - 24055, - 24033 - ] - }, - { - "id": 30229, - "enchant": 29536, - "gems": [ - 24033 - ] - }, - { - "id": 32790, - "enchant": 35297 - }, - { - "id": 29279, - "enchant": 22538 - }, - { - "id": 28792, - "enchant": 22538 - }, - { - "id": 28579 - }, - { - "id": 32658 - }, - { - "id": 30021, - "enchant": 22556 - }, - { - "id": 32387 - } - ]}`), -}; - -export const P3_PRESET = { - name: 'P3 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 31039, - "enchant": 29186, - "gems": [ - 32212, - 32409 - ] - }, - { - "id": 32362 - }, - { - "id": 31048, - "enchant": 28889, - "gems": [ - 32220, - 32212 - ] - }, - { - "id": 28660, - "enchant": 34004 - }, - { - "id": 31042, - "enchant": 24003, - "gems": [ - 32212, - 32220, - 32194 - ] - }, - { - "id": 33881, - "enchant": 22533, - "gems": [ - 32194 - ] - }, - { - "id": 31034, - "enchant": 33153, - "gems": [ - 32212 - ] - }, - { - "id": 30106, - "gems": [ - 32194, - 32212 - ] - }, - { - "id": 31044, - "enchant": 29536, - "gems": [ - 32212 - ] - }, - { - "id": 32593, - "enchant": 35297 - }, - { - "id": 29279, - "enchant": 22538 - }, - { - "id": 32266, - "enchant": 22538 - }, - { - "id": 32501 - }, - { - "id": 32658 - }, - { - "id": 30883, - "enchant": 22556 - }, - { - "id": 32387 - } - ]}`), -}; - -export const P4_PRESET = { - name: 'P4 Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 33672, - "enchant": 29192, - "gems": [ - 32409, - 32220 - ] - }, - { - "id": 33296 - }, - { - "id": 31048, - "enchant": 28911, - "gems": [ - 32194, - 32194 - ] - }, - { - "id": 33593, - "enchant": 34004 - }, - { - "id": 31042, - "enchant": 24003, - "gems": [ - 32212, - 32220, - 32194 - ] - }, - { - "id": 33881, - "enchant": 22533, - "gems": [ - 32194 - ] - }, - { - "id": 31034, - "enchant": 33153, - "gems": [ - 32212 - ] - }, - { - "id": 30106, - "gems": [ - 32194, - 32212 - ] - }, - { - "id": 31044, - "enchant": 29536, - "gems": [ - 32212 - ] - }, - { - "id": 32593, - "enchant": 35297 - }, - { - "id": 29279, - "enchant": 22538 - }, - { - "id": 29301, - "enchant": 22538 - }, - { - "id": 32501 - }, - { - "id": 33832 - }, - { - "id": 30883, - "enchant": 22556 - }, - { - "id": 32387 - } - ]}`), -}; - -export const P5_PRESET = { - name: 'P5 Preset', + name: 'TBC P5 Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{"items": [ { "id": 34404, - "enchant": 29193, + "enchant": 3004, "gems": [ 32212, 25896 @@ -428,7 +70,7 @@ export const P5_PRESET = { }, { "id": 34392, - "enchant": 28911, + "enchant": 2991, "gems": [ 32200, 32200 @@ -436,11 +78,11 @@ export const P5_PRESET = { }, { "id": 34190, - "enchant": 34004 + "enchant": 368 }, { "id": 34211, - "enchant": 24003, + "enchant": 2661, "gems": [ 32200, 32200, @@ -449,25 +91,30 @@ export const P5_PRESET = { }, { "id": 34444, - "enchant": 22533, + "enchant": 2649, "gems": [ - 32200 + 32200, + 0 ] }, { "id": 34408, - "enchant": 33153, + "enchant": 2613, "gems": [ 32200, - 32200 + 32200, + 0 ] }, { - "id": 35156 + "id": 35156, + "gems": [ + 0 + ] }, { "id": 34385, - "enchant": 29536, + "enchant": 3013, "gems": [ 32200, 32200, @@ -476,18 +123,18 @@ export const P5_PRESET = { }, { "id": 34573, - "enchant": 35297, + "enchant": 2940, "gems": [ 32200 ] }, { "id": 34213, - "enchant": 22538 + "enchant": 2931 }, { "id": 34361, - "enchant": 22538 + "enchant": 2931 }, { "id": 32501 @@ -497,8 +144,9 @@ export const P5_PRESET = { }, { "id": 30883, - "enchant": 22556 + "enchant": 2670 }, + {}, { "id": 32387 } diff --git a/ui/feral_tank_druid/sim.ts b/ui/feral_tank_druid/sim.ts index 8a65730391..95670c62d4 100644 --- a/ui/feral_tank_druid/sim.ts +++ b/ui/feral_tank_druid/sim.ts @@ -78,7 +78,7 @@ export class FeralTankDruidSimUI extends IndividualSimUI { stats = stats.addStat(Stat.StatMeleeCrit, player.getTalents().lethalShots * 1 * Mechanics.MELEE_CRIT_RATING_PER_CRIT_CHANCE); const rangedWeapon = player.getEquippedItem(ItemSlot.ItemSlotRanged); - if (rangedWeapon?.enchant?.id == 41167) { + if (rangedWeapon?.enchant?.effectId == 3608) { stats = stats.addStat(Stat.StatMeleeCrit, 40); } if (player.getRace() == Race.RaceDwarf && rangedWeapon?.item.rangedWeaponType == RangedWeaponType.RangedWeaponTypeGun) { diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts index 8b18bdc4e2..22af053106 100644 --- a/ui/mage/presets.ts +++ b/ui/mage/presets.ts @@ -152,198 +152,195 @@ export const P1_ARCANE_PRESET = { tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Arcane, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 40416, - "enchant": 44877, - "gems": [ - 41285, - 39998 - ] - }, - { - "id": 44661, - "gems": [ - 40026 - ] - }, - { - "id": 40419, - "enchant": 44874, - "gems": [ - 40051 - ] - }, - { - "id": 44005, - "enchant": 55642, - "gems": [ - 40026 - ] - }, - { - "id": 44002, - "enchant": 44489, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 44008, - "enchant": 44498, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40415, - "enchant": 54999, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40561, - "gems": [ - 39998 - ] - }, - { - "id": 40417, - "enchant": 41602, - "gems": [ - 39998, - 40051 - ] - }, - { - "id": 40558, - "enchant": 55016 - }, - { - "id": 40719 - }, - { - "id": 40399 - }, - { - "id": 39229 - }, - { - "id": 40255 - }, - { - "id": 40396, - "enchant": 44487 - }, - { - "id": 40273 - }, - { - "id": 39426 - } - ] - }`), + { + "id": 40416, + "enchant": 3820, + "gems": [ + 41285, + 39998 + ] + }, + { + "id": 44661, + "gems": [ + 40026 + ] + }, + { + "id": 40419, + "enchant": 3810, + "gems": [ + 40051 + ] + }, + { + "id": 44005, + "enchant": 3722, + "gems": [ + 40026 + ] + }, + { + "id": 44002, + "enchant": 3832, + "gems": [ + 39998, + 39998 + ] + }, + { + "id": 44008, + "enchant": 2332, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40415, + "enchant": 3604, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40561, + "gems": [ + 39998 + ] + }, + { + "id": 40417, + "enchant": 3719, + "gems": [ + 39998, + 40051 + ] + }, + { + "id": 40558, + "enchant": 3606 + }, + { + "id": 40719 + }, + { + "id": 40399 + }, + { + "id": 39229 + }, + { + "id": 40255 + }, + { + "id": 40396, + "enchant": 3834 + }, + { + "id": 40273 + }, + { + "id": 39426 + } + ]}`), }; export const P1_FIRE_PRESET = { name: 'Wotlk P1 Fire Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Fire, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 40416, - "enchant": 44877, + "enchant": 3820, "gems": [ - 41285, - 39998 + 41285, + 39998 ] - }, - { + }, + { "id": 44661, "gems": [ - 40026 + 40026 ] - }, - { + }, + { "id": 40419, - "enchant": 44874, + "enchant": 3810, "gems": [ - 40049 + 40049 ] - }, - { + }, + { "id": 44005, - "enchant": 55642, + "enchant": 3722, "gems": [ - 40026 + 40026 ] - }, - { + }, + { "id": 40418, - "enchant": 44489, + "enchant": 3832, "gems": [ - 39998, - 40048 + 39998, + 40048 ] - }, - { + }, + { "id": 44008, - "enchant": 44498, + "enchant": 2332, "gems": [ - 39998, - 0 + 39998, + 0 ] - }, - { + }, + { "id": 40415, - "enchant": 54999, + "enchant": 3604, "gems": [ - 39998, - 0 + 39998, + 0 ] - }, - { + }, + { "id": 40301, "gems": [ - 39998 + 39998 ] - }, - { + }, + { "id": 40560, - "enchant": 41602 - }, - { + "enchant": 3719 + }, + { "id": 40246, - "enchant": 55016 - }, - { + "enchant": 3606 + }, + { "id": 40399 - }, - { + }, + { "id": 40719 - }, - { + }, + { "id": 40255 - }, - { + }, + { "id": 40432 - }, - { + }, + { "id": 40396, - "enchant": 44487 - }, - { + "enchant": 3834 + }, + { "id": 40273 - }, - { + }, + { "id": 39712 - } - ] - }`), + } + ]}`), }; export const P1_FROST_PRESET = { @@ -351,292 +348,283 @@ export const P1_FROST_PRESET = { tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Frost, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 40416, - "enchant": 44877, - "gems": [ - 41285, - 39998 - ] - }, - { - "id": 44661, - "gems": [ - 40026 - ] - }, - { - "id": 40419, - "enchant": 44874, - "gems": [ - 40051 - ] - }, - { - "id": 44005, - "enchant": 55642, - "gems": [ - 40026 - ] - }, - { - "id": 40418, - "enchant": 44489, - "gems": [ - 39998, - 40048 - ] - }, - { - "id": 44008, - "enchant": 44498, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40415, - "enchant": 54999, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40301, - "gems": [ - 39998 - ] - }, - { - "id": 40560, - "enchant": 41602 - }, - { - "id": 40558, - "enchant": 55016 - }, - { - "id": 40399 - }, - { - "id": 40719 - }, - { - "id": 40255 - }, - { - "id": 40432 - }, - { - "id": 40396, - "enchant": 44487 - }, - { - "id": 39766 - }, - { - "id": 39712 - } - ] - }`), + { + "id": 40416, + "enchant": 3820, + "gems": [ + 41285, + 39998 + ] + }, + { + "id": 44661, + "gems": [ + 40026 + ] + }, + { + "id": 40419, + "enchant": 3810, + "gems": [ + 40051 + ] + }, + { + "id": 44005, + "enchant": 3722, + "gems": [ + 40026 + ] + }, + { + "id": 40418, + "enchant": 3832, + "gems": [ + 39998, + 40048 + ] + }, + { + "id": 44008, + "enchant": 2332, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40415, + "enchant": 3604, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40301, + "gems": [ + 39998 + ] + }, + { + "id": 40560, + "enchant": 3719 + }, + { + "id": 40558, + "enchant": 3606 + }, + { + "id": 40399 + }, + { + "id": 40719 + }, + { + "id": 40255 + }, + { + "id": 40432 + }, + { + "id": 40396, + "enchant": 3834 + }, + { + "id": 39766 + }, + { + "id": 39712 + } + ]}`), }; export const P1_PRERAID_ARCANE_PRESET = { name: "Arcane Pre Raid Preset", tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Arcane, - gear: EquipmentSpec.fromJsonString(` - { - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 42553, - "enchant": 44877, + "enchant": 3820, "gems": [ - 41285, - 40049 + 41285, + 40049 ] - }, - { + }, + { "id": 39472 - }, - { + }, + { "id": 37673, - "enchant": 44874, + "enchant": 3810, "gems": [ - 39998 + 39998 ] - }, - { + }, + { "id": 41610, - "enchant": 55642 - }, - { + "enchant": 3722 + }, + { "id": 39492, - "enchant": 44489, + "enchant": 3832, "gems": [ - 39998, - 40049 + 39998, + 40049 ] - }, - { + }, + { "id": 37361, - "enchant": 44498, + "enchant": 2332, "gems": [ - 0 + 0 ] - }, - { + }, + { "id": 39495, - "enchant": 54999, + "enchant": 3604, "gems": [ - 39998, - 0 + 39998, + 0 ] - }, - { + }, + { "id": 40696, "gems": [ - 40049, - 40026 + 40049, + 40026 ] - }, - { + }, + { "id": 37854, - "enchant": 41602 - }, - { + "enchant": 3719 + }, + { "id": 44202, - "enchant": 55016, + "enchant": 3606, "gems": [ - 40026 + 40026 ] - }, - { + }, + { "id": 40585 - }, - { + }, + { "id": 37694 - }, - { + }, + { "id": 37873 - }, - { + }, + { "id": 40682 - }, - { + }, + { "id": 37360, - "enchant": 45059 - }, - {}, - { + "enchant": 3854 + }, + {}, + { "id": 37238 - } - ] - }` - ) + } + ]}`) } export const P1_PRERAID_FIRE_PRESET = { name: "Fire Pre Raid Preset", tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Fire, - gear: EquipmentSpec.fromJsonString(` - { - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 42553, - "enchant": 44877, + "enchant": 3820, "gems": [ - 41285, - 40014 + 41285, + 40014 ] - }, - { + }, + { "id": 39472 - }, - { + }, + { "id": 34210, - "enchant": 44874, + "enchant": 3810, "gems": [ - 40049, - 40014 + 40049, + 40014 ] - }, - { + }, + { "id": 41610, - "enchant": 63765 - }, - { + "enchant": 3859 + }, + { "id": 39492, - "enchant": 44489, + "enchant": 3832, "gems": [ - 40049, - 40014 + 40049, + 40014 ] - }, - { + }, + { "id": 37361, - "enchant": 44498, + "enchant": 2332, "gems": [ - 0 + 0 ] - }, - { + }, + { "id": 39495, - "enchant": 54999, + "enchant": 3604, "gems": [ - 40049, - 0 + 40049, + 0 ] - }, - { + }, + { "id": 40696, "gems": [ - 40014, - 40026 + 40014, + 40026 ] - }, - { + }, + { "id": 37854, - "enchant": 41602 - }, - { + "enchant": 3719 + }, + { "id": 44202, - "enchant": 60623, + "enchant": 3826, "gems": [ - 40026 + 40026 ] - }, - { + }, + { "id": 40585 - }, - { + }, + { "id": 42644, "gems": [ - 40049 + 40049 ] - }, - { + }, + { "id": 37873 - }, - { + }, + { "id": 40682 - }, - { + }, + { "id": 45085, - "enchant": 44487 - }, - { + "enchant": 3834 + }, + { "id": 40698 - }, - { + }, + { "id": 37177 - } - ] - } - `) + } + ]}`) } @@ -644,121 +632,118 @@ export const ICC_FFB_Preset = { name: 'Wotlk ICC Frostfire Bolt Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Fire, - gear: EquipmentSpec.fromJsonString(` - {"items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 51281, - "enchant": 44877, + "enchant": 3820, "gems": [ 41285, 40133 ] - }, - { + }, + { "id": 50724, "gems": [ 40133 ] - }, - { + }, + { "id": 51284, - "enchant": 44874, + "enchant": 3810, "gems": [ 40153 ] - }, - { + }, + { "id": 54583, - "enchant": 55642, + "enchant": 3722, "gems": [ 40152 ] - }, - { + }, + { "id": 51283, - "enchant": 44489, + "enchant": 3832, "gems": [ 40152, 40133 ] - }, - { + }, + { "id": 54582, - "enchant": 44498, + "enchant": 2332, "gems": [ 40152, 0 ] - }, - { + }, + { "id": 51280, - "enchant": 54999, + "enchant": 3604, "gems": [ 40133, 0 ] - }, - { + }, + { "id": 50613, "gems": [ 40133, 40153, 40153 ] - }, - { + }, + { "id": 50694, - "enchant": 41602, + "enchant": 3719, "gems": [ 40152, 40133, 40153 ] - }, - { + }, + { "id": 50699, - "enchant": 55016, + "enchant": 3606, "gems": [ 40133, 40152 ] - }, - { + }, + { "id": 50664, "gems": [ 40133 ] - }, - { + }, + { "id": 50398, "gems": [ 40153 ] - }, - { + }, + { "id": 50348 - }, - { + }, + { "id": 50345 - }, - { + }, + { "id": 50732, "gems": [ 40152 ] - }, - { + }, + { "id": 50719 - }, - { + }, + { "id": 50684, "gems": [ 40153 ] - } - ] - }` - ) + } + ]}`) } @@ -766,121 +751,118 @@ export const ICC_Fireball_Preset = { name: 'Wotlk ICC Fire Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Fire, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 51281, - "enchant": 44877, + "enchant": 3820, "gems": [ - 41285, - 40133 + 41285, + 40133 ] - }, - { + }, + { "id": 50658, "gems": [ - 40153 + 40153 ] - }, - { + }, + { "id": 51284, - "enchant": 44874, + "enchant": 3810, "gems": [ - 40153 + 40153 ] - }, - { + }, + { "id": 54583, - "enchant": 55642, + "enchant": 3722, "gems": [ - 40152 + 40152 ] - }, - { + }, + { "id": 51283, - "enchant": 44489, + "enchant": 3832, "gems": [ - 40152, - 40133 + 40152, + 40133 ] - }, - { + }, + { "id": 54582, - "enchant": 44498, + "enchant": 2332, "gems": [ - 40152, - 0 + 40152, + 0 ] - }, - { + }, + { "id": 51280, - "enchant": 54999, + "enchant": 3604, "gems": [ - 40133, - 0 + 40133, + 0 ] - }, - { + }, + { "id": 50613, "gems": [ - 40133, - 40153, - 40153 + 40133, + 40153, + 40153 ] - }, - { + }, + { "id": 50694, - "enchant": 41602, + "enchant": 3719, "gems": [ - 40152, - 40133, - 40153 + 40152, + 40133, + 40153 ] - }, - { + }, + { "id": 50699, - "enchant": 55016, + "enchant": 3606, "gems": [ - 40133, - 40152 + 40133, + 40152 ] - }, - { + }, + { "id": 50664, "gems": [ - 40133 + 40133 ] - }, - { + }, + { "id": 50398, "gems": [ - 40153 + 40153 ] - }, - { + }, + { "id": 50348 - }, - { + }, + { "id": 50345 - }, - { + }, + { "id": 50732, "gems": [ - 40152 + 40152 ] - }, - { + }, + { "id": 50719 - }, - { + }, + { "id": 50684, "gems": [ - 40153 + 40153 ] - } - ] - } - `) + } + ]}`) } @@ -888,236 +870,228 @@ export const P2_Arcane_Preset = { name: 'Ulduar Arcane rough BiS', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Arcane, - gear: EquipmentSpec.fromJsonString(` - { - "items": [ - { - "id": 46129, - "enchant": 44877, - "gems": [ - 41285, - 39998 - ] - }, - { - "id": 45243, - "gems": [ - 39998 - ] - }, - { - "id": 46134, - "enchant": 44874, - "gems": [ - 40051 - ] - }, - { - "id": 45618, - "enchant": 55642, - "gems": [ - 40026 - ] - }, - { - "id": 46130, - "enchant": 44489, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 45446, - "enchant": 44498, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 45665, - "enchant": 54999, - "gems": [ - 40026, - 40051, - 0 - ] - }, - { - "id": 45619, - "gems": [ - 40049, - 40049, - 39998 - ] - }, - { - "id": 46133, - "enchant": 41602, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 45135, - "enchant": 55016, - "gems": [ - 39998, - 40026 - ] - }, - { - "id": 46046, - "gems": [ - 40049 - ] - }, - { - "id": 45495, - "gems": [ - 39998 - ] - }, - { - "id": 45518 - }, - { - "id": 45490 - }, - { - "id": 45620, - "gems": [ - 39998 - ] - }, - { - "id": 45271 - }, - { - "id": 39712 - } - ] - } - `) + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 46129, + "enchant": 3820, + "gems": [ + 41285, + 39998 + ] + }, + { + "id": 45243, + "gems": [ + 39998 + ] + }, + { + "id": 46134, + "enchant": 3810, + "gems": [ + 40051 + ] + }, + { + "id": 45618, + "enchant": 3722, + "gems": [ + 40026 + ] + }, + { + "id": 46130, + "enchant": 3832, + "gems": [ + 39998, + 39998 + ] + }, + { + "id": 45446, + "enchant": 2332, + "gems": [ + 39998, + 39998 + ] + }, + { + "id": 45665, + "enchant": 3604, + "gems": [ + 40026, + 40051, + 0 + ] + }, + { + "id": 45619, + "gems": [ + 40049, + 40049, + 39998 + ] + }, + { + "id": 46133, + "enchant": 3719, + "gems": [ + 39998, + 39998 + ] + }, + { + "id": 45135, + "enchant": 3606, + "gems": [ + 39998, + 40026 + ] + }, + { + "id": 46046, + "gems": [ + 40049 + ] + }, + { + "id": 45495, + "gems": [ + 39998 + ] + }, + { + "id": 45518 + }, + { + "id": 45490 + }, + { + "id": 45620, + "gems": [ + 39998 + ] + }, + { + "id": 45271 + }, + { + "id": 39712 + } + ]}`) } export const P2_Fire_Preset = { name: 'Ulduar Fire rough BiS', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => player.getRotation().type == RotationType.Fire, - gear: EquipmentSpec.fromJsonString(` - { - "items": [ - { - "id": 46129, - "enchant": 44877, - "gems": [ - 41285, - 39998 - ] - }, - { - "id": 45133, - "gems": [ - 40051 - ] - }, - { - "id": 46134, - "enchant": 44874, - "gems": [ - 40051 - ] - }, - { - "id": 45242, - "enchant": 55642, - "gems": [ - 40051 - ] - }, - { - "id": 46130, - "enchant": 44489, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 45275, - "enchant": 44498, - "gems": [ - 39998 - ] - }, - { - "id": 45665, - "enchant": 54999, - "gems": [ - 40026, - 40051, - 0 - ] - }, - { - "id": 45619, - "gems": [ - 40051, - 40051, - 39998 - ] - }, - { - "id": 46133, - "enchant": 41602, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 45537, - "enchant": 55016, - "gems": [ - 39998, - 40026 - ] - }, - { - "id": 46046, - "gems": [ - 40051 - ] - }, - { - "id": 45495, - "gems": [ - 39998 - ] - }, - { - "id": 45308 - }, - { - "id": 45518 - }, - { - "id": 45620, - "enchant": 44495, - "gems": [ - 39998 - ] - }, - { - "id": 45617 - }, - { - "id": 39712 - } - ] - } - `) -} \ No newline at end of file + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 46129, + "enchant": 3820, + "gems": [ + 41285, + 39998 + ] + }, + { + "id": 45133, + "gems": [ + 40051 + ] + }, + { + "id": 46134, + "enchant": 3810, + "gems": [ + 40051 + ] + }, + { + "id": 45242, + "enchant": 3722, + "gems": [ + 40051 + ] + }, + { + "id": 46130, + "enchant": 3832, + "gems": [ + 39998, + 39998 + ] + }, + { + "id": 45275, + "enchant": 2332, + "gems": [ + 39998 + ] + }, + { + "id": 45665, + "enchant": 3604, + "gems": [ + 40026, + 40051, + 0 + ] + }, + { + "id": 45619, + "gems": [ + 40051, + 40051, + 39998 + ] + }, + { + "id": 46133, + "enchant": 3719, + "gems": [ + 39998, + 39998 + ] + }, + { + "id": 45537, + "enchant": 3606, + "gems": [ + 39998, + 40026 + ] + }, + { + "id": 46046, + "gems": [ + 40051 + ] + }, + { + "id": 45495, + "gems": [ + 39998 + ] + }, + { + "id": 45308 + }, + { + "id": 45518 + }, + { + "id": 45620, + "enchant": 3790, + "gems": [ + 39998 + ] + }, + { + "id": 45617 + }, + { + "id": 39712 + } + ]}`) +} diff --git a/ui/mage/sim.ts b/ui/mage/sim.ts index e481428d49..e37c22894e 100644 --- a/ui/mage/sim.ts +++ b/ui/mage/sim.ts @@ -147,15 +147,15 @@ export class MageSimUI extends IndividualSimUI { ], // Preset gear configurations that the user can quickly select. gear: [ + Presets.P1_PRERAID_ARCANE_PRESET, + Presets.P1_PRERAID_FIRE_PRESET, Presets.P1_ARCANE_PRESET, Presets.P1_FIRE_PRESET, Presets.P1_FROST_PRESET, - Presets.P1_PRERAID_ARCANE_PRESET, - Presets.P1_PRERAID_FIRE_PRESET, + Presets.P2_Arcane_Preset, + Presets.P2_Fire_Preset, Presets.ICC_FFB_Preset, Presets.ICC_Fireball_Preset, - Presets.P2_Arcane_Preset, - Presets.P2_Fire_Preset ], }, }); diff --git a/ui/protection_paladin/presets.ts b/ui/protection_paladin/presets.ts index 76759a4989..9249e06c91 100644 --- a/ui/protection_paladin/presets.ts +++ b/ui/protection_paladin/presets.ts @@ -81,98 +81,98 @@ export const PRERAID_PRESET = { tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => true, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 42549, - "enchant": 44878, - "gems": [ - 41396, - 49110 - ] - }, - { - "id": 40679 - }, - { - "id": 37635, - "enchant": 44957, - "gems": [ - 40015 - ] - }, - { - "id": 44188, - "enchant": 55002 - }, - { - "id": 39638, - "enchant": 47766, - "gems": [ - 36767, - 40089 - ] - }, - { - "id": 37682, - "enchant": 44944, - "gems": [ - 0 - ] - }, - { - "id": 39639, - "enchant": 63770, - "gems": [ - 36767, - 0 - ] - }, - { - "id": 37379, - "enchant": 54793, - "gems": [ - 40022, - 40008 - ] - }, - { - "id": 37292, - "enchant": 38373, - "gems": [ - 40089 - ] - }, - { - "id": 44243, - "enchant": 55016 - }, - { - "id": 37186 - }, - { - "id": 37257 - }, - { - "id": 44063, - "gems": [ - 36767, - 40015 - ] - }, - { - "id": 37220 - }, - { - "id": 37179, - "enchant": 22559 - }, - { - "id": 43085, - "enchant": 44936 - }, - { - "id": 40707 - } - ]}`), + { + "id": 42549, + "enchant": 3818, + "gems": [ + 41396, + 49110 + ] + }, + { + "id": 40679 + }, + { + "id": 37635, + "enchant": 3852, + "gems": [ + 40015 + ] + }, + { + "id": 44188, + "enchant": 3605 + }, + { + "id": 39638, + "enchant": 1953, + "gems": [ + 36767, + 40089 + ] + }, + { + "id": 37682, + "enchant": 3850, + "gems": [ + 0 + ] + }, + { + "id": 39639, + "enchant": 3860, + "gems": [ + 36767, + 0 + ] + }, + { + "id": 37379, + "enchant": 3601, + "gems": [ + 40022, + 40008 + ] + }, + { + "id": 37292, + "enchant": 3822, + "gems": [ + 40089 + ] + }, + { + "id": 44243, + "enchant": 3606 + }, + { + "id": 37186 + }, + { + "id": 37257 + }, + { + "id": 44063, + "gems": [ + 36767, + 40015 + ] + }, + { + "id": 37220 + }, + { + "id": 37179, + "enchant": 2673 + }, + { + "id": 43085, + "enchant": 3849 + }, + { + "id": 40707 + } + ]}`), }; export const P1_PRESET = { @@ -180,97 +180,97 @@ export const P1_PRESET = { tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => true, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 40581, - "enchant": 44878, - "gems": [ - 41396, - 36767 - ] - }, - { - "id": 40387 - }, - { - "id": 40584, - "enchant": 44957, - "gems": [ - 49110 - ] - }, - { - "id": 40410, - "enchant": 55002 - }, - { - "id": 40579, - "enchant": 44489, - "gems": [ - 36767, - 40022 - ] - }, - { - "id": 39764, - "enchant": 44944, - "gems": [ - 0 - ] - }, - { - "id": 40580, - "enchant": 63770, - "gems": [ - 40008, - 0 - ] - }, - { - "id": 39759, - "enchant": 54793, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 40589, - "enchant": 38373 - }, - { - "id": 39717, - "enchant": 55016, - "gems": [ - 40089 - ] - }, - { - "id": 40718 - }, - { - "id": 40107 - }, - { - "id": 44063, - "gems": [ - 36767, - 40089 - ] - }, - { - "id": 37220 - }, - { - "id": 40345, - "enchant": 44496 - }, - { - "id": 40400, - "enchant": 44936 - }, - { - "id": 40707 - } - ]}`), + { + "id": 40581, + "enchant": 3818, + "gems": [ + 41396, + 36767 + ] + }, + { + "id": 40387 + }, + { + "id": 40584, + "enchant": 3852, + "gems": [ + 49110 + ] + }, + { + "id": 40410, + "enchant": 3605 + }, + { + "id": 40579, + "enchant": 3832, + "gems": [ + 36767, + 40022 + ] + }, + { + "id": 39764, + "enchant": 3850, + "gems": [ + 0 + ] + }, + { + "id": 40580, + "enchant": 3860, + "gems": [ + 40008, + 0 + ] + }, + { + "id": 39759, + "enchant": 3601, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 40589, + "enchant": 3822 + }, + { + "id": 39717, + "enchant": 3606, + "gems": [ + 40089 + ] + }, + { + "id": 40718 + }, + { + "id": 40107 + }, + { + "id": 44063, + "gems": [ + 36767, + 40089 + ] + }, + { + "id": 37220 + }, + { + "id": 40345, + "enchant": 3788 + }, + { + "id": 40400, + "enchant": 3849 + }, + { + "id": 40707 + } + ]}`), }; diff --git a/ui/protection_warrior/presets.ts b/ui/protection_warrior/presets.ts index b53c18b719..3abad330a3 100644 --- a/ui/protection_warrior/presets.ts +++ b/ui/protection_warrior/presets.ts @@ -96,201 +96,201 @@ export const DefaultConsumes = Consumes.create({ fillerExplosive: Explosive.ExplosiveSaroniteBomb, }); -export const P1_BALANCED_PRESET = { - name: 'P1 Balanced Preset', +export const P1_PRERAID_BALANCED_PRESET = { + name: 'P1 Pre-Raid Balanced Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 40546, - "enchant": 44878, - "gems": [ - 41380, - 40034 - ] - }, - { - "id": 40387 - }, - { - "id": 39704, - "enchant": 44957, - "gems": [ - 40034 - ] - }, - { - "id": 40722, - "enchant": 55002 - }, - { - "id": 44000, - "enchant": 44489, - "gems": [ - 40034, - 40015 - ] - }, - { - "id": 39764, - "enchant": 44944, - "gems": [ - 0 - ] - }, - { - "id": 40545, - "enchant": 63770, - "gems": [ - 40034, - 0 - ] - }, - { - "id": 39759, - "enchant": 54793, - "gems": [ - 40008, - 36767 - ] - }, - { - "id": 40589, - "enchant": 38373 - }, - { - "id": 39717, - "enchant": 44491, - "gems": [ - 40089 - ] - }, - { - "id": 40370 - }, - { - "id": 40718 - }, - { - "id": 40257 - }, - { - "id": 44063, - "gems": [ - 36767, - 40089 - ] - }, - { - "id": 40402, - "enchant": 44496 - }, - { - "id": 40400, - "enchant": 44936 - }, - { - "id": 41168, - "gems": [ - 36767 - ] - } + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 42549, + "enchant": 3818, + "gems": [ + 41380, + 40015 + ] + }, + { + "id": 40679 + }, + { + "id": 37814, + "enchant": 3852 + }, + { + "id": 37728, + "enchant": 3605 + }, + { + "id": 39611, + "enchant": 1953, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 37620, + "enchant": 3850, + "gems": [ + 0 + ] + }, + { + "id": 39622, + "enchant": 3860, + "gems": [ + 40034, + 0 + ] + }, + { + "id": 37379, + "enchant": 3601, + "gems": [ + 40034, + 36767 + ] + }, + { + "id": 43500, + "enchant": 3822, + "gems": [ + 40034 + ] + }, + { + "id": 44201, + "enchant": 3232 + }, + { + "id": 37784 + }, + { + "id": 37186 + }, + { + "id": 37220 + }, + { + "id": 44063, + "gems": [ + 36767, + 40089 + ] + }, + { + "id": 37401, + "enchant": 3788 + }, + { + "id": 43085, + "enchant": 3849 + }, + { + "id": 41168, + "gems": [ + 36767 + ] + } ]}`), }; -export const P1_PRERAID_BALANCED_PRESET = { - name: 'P1 Pre-Raid Balanced Preset', +export const P1_BALANCED_PRESET = { + name: 'P1 Balanced Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 42549, - "enchant": 44878, - "gems": [ - 41380, - 40015 - ] - }, - { - "id": 40679 - }, - { - "id": 37814, - "enchant": 44957 - }, - { - "id": 37728, - "enchant": 55002 - }, - { - "id": 39611, - "enchant": 47766, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 37620, - "enchant": 44944, - "gems": [ - 0 - ] - }, - { - "id": 39622, - "enchant": 63770, - "gems": [ - 40034, - 0 - ] - }, - { - "id": 37379, - "enchant": 54793, - "gems": [ - 40034, - 36767 - ] - }, - { - "id": 43500, - "enchant": 38373, - "gems": [ - 40034 - ] - }, - { - "id": 44201, - "enchant": 44491 - }, - { - "id": 37784 - }, - { - "id": 37186 - }, - { - "id": 37220 - }, - { - "id": 44063, - "gems": [ - 36767, - 40089 - ] - }, - { - "id": 37401, - "enchant": 44496 - }, - { - "id": 43085, - "enchant": 44936 - }, - { - "id": 41168, - "gems": [ - 36767 - ] - } + gear: EquipmentSpec.fromJsonString(`{ "items": [ + { + "id": 40546, + "enchant": 3818, + "gems": [ + 41380, + 40034 + ] + }, + { + "id": 40387 + }, + { + "id": 39704, + "enchant": 3852, + "gems": [ + 40034 + ] + }, + { + "id": 40722, + "enchant": 3605 + }, + { + "id": 44000, + "enchant": 3832, + "gems": [ + 40034, + 40015 + ] + }, + { + "id": 39764, + "enchant": 3850, + "gems": [ + 0 + ] + }, + { + "id": 40545, + "enchant": 3860, + "gems": [ + 40034, + 0 + ] + }, + { + "id": 39759, + "enchant": 3601, + "gems": [ + 40008, + 36767 + ] + }, + { + "id": 40589, + "enchant": 3822 + }, + { + "id": 39717, + "enchant": 3232, + "gems": [ + 40089 + ] + }, + { + "id": 40370 + }, + { + "id": 40718 + }, + { + "id": 40257 + }, + { + "id": 44063, + "gems": [ + 36767, + 40089 + ] + }, + { + "id": 40402, + "enchant": 3788 + }, + { + "id": 40400, + "enchant": 3849 + }, + { + "id": 41168, + "gems": [ + 36767 + ] + } ]}`), }; diff --git a/ui/protection_warrior/sim.ts b/ui/protection_warrior/sim.ts index 1fe46bee2e..4e6c7e7f65 100644 --- a/ui/protection_warrior/sim.ts +++ b/ui/protection_warrior/sim.ts @@ -181,8 +181,8 @@ export class ProtectionWarriorSimUI extends IndividualSimUI { const item = ItemSpec.create(); item.id = gear.id; - const dbEnchant = this.simUI.sim.getEnchantFlexible(gear.permanentEnchant); - item.enchant = dbEnchant - ? dbEnchant.id - : 0; + item.enchant = gear.permanentEnchant; if (gear.gems) { item.gems = new Array(); gear.gems.forEach((gemInfo) => item.gems.push(gemInfo.id)); diff --git a/ui/raid/presets.ts b/ui/raid/presets.ts index e578055ce8..0f4799336d 100644 --- a/ui/raid/presets.ts +++ b/ui/raid/presets.ts @@ -163,31 +163,31 @@ export const playerPresets: Array> = [ tooltip: 'Dual Wield Unholy DK', iconUrl: talentTreeIcons[Class.ClassDeathknight][2], }, - { - spec: Spec.SpecDeathknight, - rotation: DeathknightPresets.DefaultBloodRotation, - talents: DeathknightPresets.BloodTalents.data, - specOptions: DeathknightPresets.DefaultBloodOptions, - consumes: DeathknightPresets.DefaultConsumes, - defaultName: 'Blood Dps DK', - defaultFactionRaces: { - [Faction.Unknown]: Race.RaceUnknown, - [Faction.Alliance]: Race.RaceHuman, - [Faction.Horde]: Race.RaceTroll, - }, - defaultGear: { - [Faction.Unknown]: {}, - [Faction.Alliance]: { - 1: DeathknightPresets.P1_BLOOD_BIS_PRESET.gear, - }, - [Faction.Horde]: { - 1: DeathknightPresets.P1_BLOOD_BIS_PRESET.gear, - }, - }, - otherDefaults: DeathknightPresets.OtherDefaults, - tooltip: 'Blood Dps DK', - iconUrl: talentTreeIcons[Class.ClassDeathknight][0], - }, + //{ + // spec: Spec.SpecDeathknight, + // rotation: DeathknightPresets.DefaultBloodRotation, + // talents: DeathknightPresets.BloodTalents.data, + // specOptions: DeathknightPresets.DefaultBloodOptions, + // consumes: DeathknightPresets.DefaultConsumes, + // defaultName: 'Blood Dps DK', + // defaultFactionRaces: { + // [Faction.Unknown]: Race.RaceUnknown, + // [Faction.Alliance]: Race.RaceHuman, + // [Faction.Horde]: Race.RaceTroll, + // }, + // defaultGear: { + // [Faction.Unknown]: {}, + // [Faction.Alliance]: { + // 1: DeathknightPresets.P1_UNHOLY_2H_BIS_PRESET.gear, + // }, + // [Faction.Horde]: { + // 1: DeathknightPresets.P1_UNHOLY_2H_BIS_PRESET.gear, + // }, + // }, + // otherDefaults: DeathknightPresets.OtherDefaults, + // tooltip: 'Blood Dps DK', + // iconUrl: talentTreeIcons[Class.ClassDeathknight][0], + //}, { spec: Spec.SpecBalanceDruid, rotation: BalanceDruidPresets.DefaultRotation, diff --git a/ui/retribution_paladin/presets.ts b/ui/retribution_paladin/presets.ts index ef131b7813..e421be5538 100644 --- a/ui/retribution_paladin/presets.ts +++ b/ui/retribution_paladin/presets.ts @@ -118,655 +118,644 @@ export const PRE_RAID_PRESET = { tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => true, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 41386, - "enchant": 44879, - "gems": [ - 41398, - 40022 - ] - }, - { - "id": 40678 - }, - { - "id": 34388, - "enchant": 44131, - "gems": [ - 39996, - 40037 - ] - }, - { - "id": 37647, - "enchant": 55002 - }, - { - "id": 39633, - "enchant": 44489, - "gems": [ - 39996, - 40038 - ] - }, - { - "id": 41355, - "enchant": 44484, - "gems": [ - 0 - ] - }, - { - "id": 39634, - "enchant": 54999, - "gems": [ - 39996, - 0 - ] - }, - { - "id": 40694, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 37193, - "enchant": 38372, - "gems": [ - 39996, - 39996 - ] - }, - { - "id": 44297, - "enchant": 55016 - }, - { - "id": 40586 - }, - { - "id": 37685 - }, - { - "id": 42987 - }, - { - "id": 40684 - }, - { - "id": 37852, - "enchant": 44492 - }, - {}, - { - "id": 37574 - } - ] - }`), + { + "id": 41386, + "enchant": 3817, + "gems": [ + 41398, + 40022 + ] + }, + { + "id": 40678 + }, + { + "id": 34388, + "enchant": 3875, + "gems": [ + 39996, + 40037 + ] + }, + { + "id": 37647, + "enchant": 3605 + }, + { + "id": 39633, + "enchant": 3832, + "gems": [ + 39996, + 40038 + ] + }, + { + "id": 41355, + "enchant": 3845, + "gems": [ + 0 + ] + }, + { + "id": 39634, + "enchant": 3604, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40694, + "gems": [ + 39996, + 39996 + ] + }, + { + "id": 37193, + "enchant": 3326, + "gems": [ + 39996, + 39996 + ] + }, + { + "id": 44297, + "enchant": 3606 + }, + { + "id": 40586 + }, + { + "id": 37685 + }, + { + "id": 42987 + }, + { + "id": 40684 + }, + { + "id": 37852, + "enchant": 3789 + }, + {}, + { + "id": 37574 + } + ]}`), }; export const P1_PRESET = { name: 'P1 Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => true, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 40576, - "enchant": 44879, + "enchant": 3817, "gems": [ - 41398, - 40037 + 41398, + 40037 ] - }, - { + }, + { "id": 44664, "gems": [ - 42142 + 42142 ] - }, - { + }, + { "id": 40578, - "enchant": 44871, + "enchant": 3808, "gems": [ - 49110 + 49110 ] - }, - { + }, + { "id": 40403, - "enchant": 55002 - }, - { + "enchant": 3605 + }, + { "id": 40574, - "enchant": 44489, + "enchant": 3832, "gems": [ - 42142, - 39996 + 42142, + 39996 ] - }, - { + }, + { "id": 40186, - "enchant": 44484, + "enchant": 3845, "gems": [ - 0 + 0 ] - }, - { + }, + { "id": 40541, - "enchant": 54999, + "enchant": 3604, "gems": [ - 0 + 0 ] - }, - { + }, + { "id": 40205, "gems": [ - 39996 + 39996 ] - }, - { + }, + { "id": 40577, - "enchant": 38374, + "enchant": 3823, "gems": [ - 42142, - 40038 + 42142, + 40038 ] - }, - { + }, + { "id": 39701, - "enchant": 55016 - }, - { + "enchant": 3606 + }, + { "id": 40075 - }, - { + }, + { "id": 40474 - }, - { + }, + { "id": 42987 - }, - { + }, + { "id": 40431 - }, - { + }, + { "id": 40384, - "enchant": 44492 - }, - {}, - { + "enchant": 3789 + }, + {}, + { "id": 42852 - } - ] - }`), + } + ]}`), }; export const P2_PRESET = { name: 'P2 Preset (Placeholder)', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => true, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 46156, - "enchant": 44879, + "enchant": 3817, "gems": [ - 41398, - 40003 + 41398, + 40003 ] - }, - { + }, + { "id": 45517, "gems": [ - 39996 + 39996 ] - }, - { + }, + { "id": 46152, - "enchant": 44871, + "enchant": 3808, "gems": [ - 40059 + 40059 ] - }, - { + }, + { "id": 45461, - "enchant": 55002, + "enchant": 3605, "gems": [ - 39996 + 39996 ] - }, - { + }, + { "id": 46154, - "enchant": 44489, + "enchant": 3832, "gems": [ - 39996, - 39996 + 39996, + 39996 ] - }, - { + }, + { "id": 45611, - "enchant": 44484, + "enchant": 3845, "gems": [ - 39996, - 0 + 39996, + 0 ] - }, - { + }, + { "id": 46155, - "enchant": 54999, + "enchant": 3604, "gems": [ - 39996, - 0 + 39996, + 0 ] - }, - { + }, + { "id": 46095, "gems": [ - 39996, - 39996, - 39996 + 39996, + 39996, + 39996 ] - }, - { + }, + { "id": 45134, - "enchant": 38374, + "enchant": 3823, "gems": [ - 42142, - 42142, - 42142 + 42142, + 42142, + 42142 ] - }, - { + }, + { "id": 45599, - "enchant": 55016, + "enchant": 3606, "gems": [ - 40003, - 49110 + 40003, + 49110 ] - }, - { + }, + { "id": 45456, "gems": [ - 39996 + 39996 ] - }, - { + }, + { "id": 45525 - }, - { + }, + { "id": 45609 - }, - { + }, + { "id": 45522 - }, - { + }, + { "id": 45533, - "enchant": 44492, + "enchant": 3789, "gems": [ - 39996, - 39996 + 39996, + 39996 ] - }, - {}, - { + }, + {}, + { "id": 42852 - } - ] - }`), + } + ]}`), }; export const P3_PRESET = { name: 'P3 Preset (Placeholder)', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => true, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 48614, - "enchant": 44879, + "enchant": 3817, "gems": [ - 41398, - 40111 + 41398, + 40111 ] - }, - { + }, + { "id": 53103, "gems": [ - 40162 + 40162 ] - }, - { + }, + { "id": 47972, - "enchant": 44871, + "enchant": 3808, "gems": [ - 40111, - 40162 + 40111, + 40162 ] - }, - { + }, + { "id": 46971, - "enchant": 55002, + "enchant": 3605, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 47004, - "enchant": 44489, + "enchant": 3832, "gems": [ - 40111, - 40111, - 40111 + 40111, + 40111, + 40111 ] - }, - { + }, + { "id": 47155, - "enchant": 44484, + "enchant": 3845, "gems": [ - 49110, - 40111, - 0 + 49110, + 40111, + 0 ] - }, - { + }, + { "id": 48615, - "enchant": 54999, + "enchant": 3604, "gems": [ - 40162, - 0 + 40162, + 0 ] - }, - { + }, + { "id": 47460, "gems": [ - 40111, - 40111, - 40111 + 40111, + 40111, + 40111 ] - }, - { + }, + { "id": 46975, - "enchant": 38374, + "enchant": 3823, "gems": [ - 42142, - 42142, - 42142 + 42142, + 42142, + 42142 ] - }, - { + }, + { "id": 47154, - "enchant": 55016, + "enchant": 3606, "gems": [ - 40111, - 40111 + 40111, + 40111 ] - }, - { + }, + { "id": 47075, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 46966, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 47131 - }, - { + }, + { "id": 47115 - }, - { + }, + { "id": 47519, - "enchant": 44492, + "enchant": 3789, "gems": [ - 40111, - 40111 + 40111, + 40111 ] - }, - {}, - { + }, + {}, + { "id": 47661 - } - ] - }`), + } + ]}`), }; export const P4_PRESET = { name: 'P4 Preset (Placeholder)', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => true, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 51162, - "enchant": 44879, + "enchant": 3817, "gems": [ - 41398, - 40111 + 41398, + 40111 ] - }, - { + }, + { "id": 50421, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 51160, - "enchant": 44871, + "enchant": 3808, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 49998, - "enchant": 55002, + "enchant": 3605, "gems": [ - 40125 + 40125 ] - }, - { + }, + { "id": 51164, - "enchant": 44489, + "enchant": 3832, "gems": [ - 40111, - 49110 + 40111, + 49110 ] - }, - { + }, + { "id": 51832, - "enchant": 44484, + "enchant": 3845, "gems": [ - 42142, - 0 + 42142, + 0 ] - }, - { + }, + { "id": 50021, - "enchant": 54999, + "enchant": 3604, "gems": [ - 40125, - 40111, - 0 + 40125, + 40111, + 0 ] - }, - { + }, + { "id": 51925, "gems": [ - 40111, - 40111, - 40125 + 40111, + 40111, + 40125 ] - }, - { + }, + { "id": 51161, - "enchant": 38374, + "enchant": 3823, "gems": [ - 42142, - 42142 + 42142, + 42142 ] - }, - { + }, + { "id": 49895, - "enchant": 55016, + "enchant": 3606, "gems": [ - 40125, - 40111 + 40125, + 40111 ] - }, - { + }, + { "id": 51843, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 49949, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 50351 - }, - { + }, + { "id": 50343 - }, - { + }, + { "id": 49888, - "enchant": 44492, + "enchant": 3789, "gems": [ - 40111, - 40111 + 40111, + 40111 ] - }, - {}, - { + }, + {}, + { "id": 50455 - } - ] - }`), + } + ]}`), }; export const P5_PRESET = { name: 'P5 Preset (Placeholder)', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, enableWhen: (player: Player) => true, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { + gear: EquipmentSpec.fromJsonString(`{"items": [ + { "id": 51277, - "enchant": 44879, + "enchant": 3817, "gems": [ - 41398, - 40111 + 41398, + 40111 ] - }, - { + }, + { "id": 54581, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 51279, - "enchant": 44871, + "enchant": 3808, "gems": [ - 40118 + 40118 ] - }, - { + }, + { "id": 50653, - "enchant": 55002, + "enchant": 3605, "gems": [ - 40125 + 40125 ] - }, - { + }, + { "id": 51275, - "enchant": 44489, + "enchant": 3832, "gems": [ - 40118, - 49110 + 40118, + 49110 ] - }, - { + }, + { "id": 54580, - "enchant": 44484, + "enchant": 3845, "gems": [ - 42142, - 0 + 42142, + 0 ] - }, - { + }, + { "id": 50690, - "enchant": 54999, + "enchant": 3604, "gems": [ - 40125, - 40111, - 0 + 40125, + 40111, + 0 ] - }, - { + }, + { "id": 50707, "gems": [ - 40111, - 40111, - 40125 + 40111, + 40111, + 40125 ] - }, - { + }, + { "id": 51161, - "enchant": 38374, + "enchant": 3823, "gems": [ - 42142, - 42142 + 42142, + 42142 ] - }, - { + }, + { "id": 54578, - "enchant": 55016, + "enchant": 3606, "gems": [ - 40111, - 40111 + 40111, + 40111 ] - }, - { + }, + { "id": 54576, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 52572, "gems": [ - 40111 + 40111 ] - }, - { + }, + { "id": 50706 - }, - { + }, + { "id": 54590 - }, - { + }, + { "id": 49623, - "enchant": 44492, + "enchant": 3789, "gems": [ - 40111, - 40111, - 40111 + 40111, + 40111, + 40111 ] - }, - {}, - { + }, + {}, + { "id": 50455 - } - ] - }`), + } + ]}`), }; diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts index d1428b2d04..39bbf217d3 100644 --- a/ui/rogue/presets.ts +++ b/ui/rogue/presets.ts @@ -74,90 +74,90 @@ export const PRERAID_PRESET_ASSASSINATION = { name: 'Pre-Raid Assassination', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 42550, - "enchant": 44879, - "gems": [ - 41398, - 40058 - ] - }, - { - "id": 40678 - }, - { - "id": 43481, - "enchant": 44871 - }, - { - "id": 38614, - "enchant": 55002 - }, - { - "id": 39558, - "enchant": 44489, - "gems": [ - 40003, - 42702 - ] - }, - { - "id": 34448, - "enchant": 44484, - "gems": [ - 40003, - 0 - ] - }, - { - "id": 39560, - "enchant": 54999, - "gems": [ - 40058, - 0 - ] - }, - { - "id": 40694, - "gems": [ - 40003, - 40003 - ] - }, - { - "id": 37644, - "enchant": 38374 - }, - { - "id": 34575, - "enchant": 55016, - "gems": [ - 40003 - ] - }, - { - "id": 40586 - }, - { - "id": 37642 - }, - { - "id": 40684 - }, - { - "id": 44253 - }, - { - "id": 37856, - "enchant": 44492 - }, - { - "id": 37667, - "enchant": 44492 - }, - { - "id": 43612 - } + { + "id": 42550, + "enchant": 3817, + "gems": [ + 41398, + 40058 + ] + }, + { + "id": 40678 + }, + { + "id": 43481, + "enchant": 3808 + }, + { + "id": 38614, + "enchant": 3605 + }, + { + "id": 39558, + "enchant": 3832, + "gems": [ + 40003, + 42702 + ] + }, + { + "id": 34448, + "enchant": 3845, + "gems": [ + 40003, + 0 + ] + }, + { + "id": 39560, + "enchant": 3604, + "gems": [ + 40058, + 0 + ] + }, + { + "id": 40694, + "gems": [ + 40003, + 40003 + ] + }, + { + "id": 37644, + "enchant": 3823 + }, + { + "id": 34575, + "enchant": 3606, + "gems": [ + 40003 + ] + }, + { + "id": 40586 + }, + { + "id": 37642 + }, + { + "id": 40684 + }, + { + "id": 44253 + }, + { + "id": 37856, + "enchant": 3789 + }, + { + "id": 37667, + "enchant": 3789 + }, + { + "id": 43612 + } ]}`), }; @@ -165,99 +165,99 @@ export const PRERAID_PRESET_COMBAT = { name: 'Pre-Raid Combat', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 42550, - "enchant": 44879, - "gems": [ - 41398, - 40014 - ] - }, - { - "id": 40678 - }, - { - "id": 37139, - "enchant": 44871, - "gems": [ - 39999 - ] - }, - { - "id": 34241, - "enchant": 55002, - "gems": [ - 40014 - ] - }, - { - "id": 39558, - "enchant": 44489, - "gems": [ - 39999, - 40014 - ] - }, - { - "id": 34448, - "enchant": 44484, - "gems": [ - 39999, - 0 - ] - }, - { - "id": 39560, - "enchant": 54999, - "gems": [ - 40014, - 0 - ] - }, - { - "id": 40694, - "gems": [ - 42702, - 39999 - ] - }, - { - "id": 37644, - "enchant": 38374 - }, - { - "id": 34575, - "enchant": 55016, - "gems": [ - 39999 - ] - }, - { - "id": 40586 - }, - { - "id": 37642 - }, - { - "id": 40684 - }, - { - "id": 44253 - }, - { - "id": 37693, - "enchant": 44492 - }, - { - "id": 37856, - "enchant": 44492 - }, - { - "id": 44504, - "gems": [ - 40053 - ] - } + { + "id": 42550, + "enchant": 3817, + "gems": [ + 41398, + 40014 + ] + }, + { + "id": 40678 + }, + { + "id": 37139, + "enchant": 3808, + "gems": [ + 39999 + ] + }, + { + "id": 34241, + "enchant": 3605, + "gems": [ + 40014 + ] + }, + { + "id": 39558, + "enchant": 3832, + "gems": [ + 39999, + 40014 + ] + }, + { + "id": 34448, + "enchant": 3845, + "gems": [ + 39999, + 0 + ] + }, + { + "id": 39560, + "enchant": 3604, + "gems": [ + 40014, + 0 + ] + }, + { + "id": 40694, + "gems": [ + 42702, + 39999 + ] + }, + { + "id": 37644, + "enchant": 3823 + }, + { + "id": 34575, + "enchant": 3606, + "gems": [ + 39999 + ] + }, + { + "id": 40586 + }, + { + "id": 37642 + }, + { + "id": 40684 + }, + { + "id": 44253 + }, + { + "id": 37693, + "enchant": 3789 + }, + { + "id": 37856, + "enchant": 3789 + }, + { + "id": 44504, + "gems": [ + 40053 + ] + } ]}`), } @@ -265,95 +265,95 @@ export const P1_PRESET_ASSASSINATION = { name: 'P1 Assassination', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 40499, - "enchant": 44879, - "gems": [ - 41398, - 42702 - ] - }, - { - "id": 44664, - "gems": [ - 40003 - ] - }, - { - "id": 40502, - "enchant": 44871, - "gems": [ - 40003 - ] - }, - { - "id": 40403, - "enchant": 55002 - }, - { - "id": 40539, - "enchant": 44489, - "gems": [ - 40003 - ] - }, - { - "id": 39765, - "enchant": 44484, - "gems": [ - 40003, - 0 - ] - }, - { - "id": 40496, - "enchant": 54999, - "gems": [ - 40053, - 0 - ] - }, - { - "id": 40260, - "gems": [ - 39999 - ] - }, - { - "id": 40500, - "enchant": 38374, - "gems": [ - 40003, - 40003 - ] - }, - { - "id": 39701, - "enchant": 55016 - }, - { - "id": 40074 - }, - { - "id": 40474 - }, - { - "id": 40684 - }, - { - "id": 44253 - }, - { - "id": 39714, - "enchant": 44492 - }, - { - "id": 40386, - "enchant": 44492 - }, - { - "id": 40385 - } + { + "id": 40499, + "enchant": 3817, + "gems": [ + 41398, + 42702 + ] + }, + { + "id": 44664, + "gems": [ + 40003 + ] + }, + { + "id": 40502, + "enchant": 3808, + "gems": [ + 40003 + ] + }, + { + "id": 40403, + "enchant": 3605 + }, + { + "id": 40539, + "enchant": 3832, + "gems": [ + 40003 + ] + }, + { + "id": 39765, + "enchant": 3845, + "gems": [ + 40003, + 0 + ] + }, + { + "id": 40496, + "enchant": 3604, + "gems": [ + 40053, + 0 + ] + }, + { + "id": 40260, + "gems": [ + 39999 + ] + }, + { + "id": 40500, + "enchant": 3823, + "gems": [ + 40003, + 40003 + ] + }, + { + "id": 39701, + "enchant": 3606 + }, + { + "id": 40074 + }, + { + "id": 40474 + }, + { + "id": 40684 + }, + { + "id": 44253 + }, + { + "id": 39714, + "enchant": 3789 + }, + { + "id": 40386, + "enchant": 3789 + }, + { + "id": 40385 + } ]}`), } @@ -361,93 +361,93 @@ export const P1_PRESET_COMBAT = { name: 'P1 Combat', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 40499, - "enchant": 44879, - "gems": [ - 41398, - 42702 - ] - }, - { - "id": 44664, - "gems": [ - 39999 - ] - }, - { - "id": 40502, - "enchant": 44871, - "gems": [ - 39999 - ] - }, - { - "id": 40403, - "enchant": 55002 - }, - { - "id": 40539, - "enchant": 44489, - "gems": [ - 39999 - ] - }, - { - "id": 39765, - "enchant": 44484, - "gems": [ - 39999, - 0 - ] - }, - { - "id": 40541, - "enchant": 54999, - "gems": [ - 0 - ] - }, - { - "id": 40205, - "gems": [ - 39999 - ] - }, - { - "id": 44011, - "enchant": 38374, - "gems": [ - 39999, - 39999 - ] - }, - { - "id": 39701, - "enchant": 55016 - }, - { - "id": 40074 - }, - { - "id": 40474 - }, - { - "id": 40684 - }, - { - "id": 44253 - }, - { - "id": 40383, - "enchant": 44492 - }, - { - "id": 39714, - "enchant": 44492 - }, - { - "id": 40385 - } + { + "id": 40499, + "enchant": 3817, + "gems": [ + 41398, + 42702 + ] + }, + { + "id": 44664, + "gems": [ + 39999 + ] + }, + { + "id": 40502, + "enchant": 3808, + "gems": [ + 39999 + ] + }, + { + "id": 40403, + "enchant": 3605 + }, + { + "id": 40539, + "enchant": 3832, + "gems": [ + 39999 + ] + }, + { + "id": 39765, + "enchant": 3845, + "gems": [ + 39999, + 0 + ] + }, + { + "id": 40541, + "enchant": 3604, + "gems": [ + 0 + ] + }, + { + "id": 40205, + "gems": [ + 39999 + ] + }, + { + "id": 44011, + "enchant": 3823, + "gems": [ + 39999, + 39999 + ] + }, + { + "id": 39701, + "enchant": 3606 + }, + { + "id": 40074 + }, + { + "id": 40474 + }, + { + "id": 40684 + }, + { + "id": 44253 + }, + { + "id": 40383, + "enchant": 3789 + }, + { + "id": 39714, + "enchant": 3789 + }, + { + "id": 40385 + } ]}`), -} \ No newline at end of file +} diff --git a/ui/shadow_priest/presets.ts b/ui/shadow_priest/presets.ts index 5b113dc7a8..b0817a9e5c 100644 --- a/ui/shadow_priest/presets.ts +++ b/ui/shadow_priest/presets.ts @@ -94,193 +94,189 @@ export const DefaultDebuffs = Debuffs.create({ judgementOfWisdom: true, }); +export const PreBis_PRESET = { + name: 'PreBis Preset', + tooltip: Tooltips.BASIC_BIS_DISCLAIMER, + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 42553, + "enchant": 3820, + "gems": [ + 41285, + 40049 + ] + }, + { + "id": 40680 + }, + { + "id": 34210, + "enchant": 3810, + "gems": [ + 39998, + 40026 + ] + }, + { + "id": 41610, + "enchant": 3722 + }, + { + "id": 43792, + "enchant": 1144, + "gems": [ + 39998, + 40051 + ] + }, + { + "id": 37361, + "enchant": 2332, + "gems": [ + 0 + ] + }, + { + "id": 39530, + "enchant": 3604, + "gems": [ + 40049, + 0 + ] + }, + { + "id": 40696, + "gems": [ + 40049, + 39998 + ] + }, + { + "id": 37854, + "enchant": 3719 + }, + { + "id": 44202, + "enchant": 3826, + "gems": [ + 40026 + ] + }, + { + "id": 40585 + }, + { + "id": 37694 + }, + { + "id": 37835 + }, + { + "id": 37873 + }, + { + "id": 41384, + "enchant": 3834 + }, + { + "id": 40698 + }, + { + "id": 37177 + } + ]}`), +}; export const P1_PRESET = { name: 'P1 Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(` { - "items": [ - { - "id": 40562, - "enchant": 44877, - "gems": [ - 41285, - 39998 - ] - }, - { - "id": 44661, - "gems": [ - 40026 - ] - }, - { - "id": 40459, - "enchant": 44874, - "gems": [ - 39998 - ] - }, - { - "id": 44005, - "enchant": 55642, - "gems": [ - 40026 - ] - }, - { - "id": 44002, - "enchant": 33990, - "gems": [ - 39998, - 39998 - ] - }, - { - "id": 44008, - "enchant": 44498, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40454, - "enchant": 54999, - "gems": [ - 40049, - 0 - ] - }, - { - "id": 40561, - "gems": [ - 39998 - ] - }, - { - "id": 40560, - "enchant": 41602 - }, - { - "id": 40558, - "enchant": 55016 - }, - { - "id": 40719 - }, - { - "id": 40399 - }, - { - "id": 40255 - }, - { - "id": 40432 - }, - { - "id": 40395, - "enchant": 44487 - }, - { - "id": 40273 - }, - { - "id": 39712 - } - ] - }`), + gear: EquipmentSpec.fromJsonString(` {"items": [ + { + "id": 40562, + "enchant": 3820, + "gems": [ + 41285, + 39998 + ] + }, + { + "id": 44661, + "gems": [ + 40026 + ] + }, + { + "id": 40459, + "enchant": 3810, + "gems": [ + 39998 + ] + }, + { + "id": 44005, + "enchant": 3722, + "gems": [ + 40026 + ] + }, + { + "id": 44002, + "enchant": 1144, + "gems": [ + 39998, + 39998 + ] + }, + { + "id": 44008, + "enchant": 2332, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40454, + "enchant": 3604, + "gems": [ + 40049, + 0 + ] + }, + { + "id": 40561, + "gems": [ + 39998 + ] + }, + { + "id": 40560, + "enchant": 3719 + }, + { + "id": 40558, + "enchant": 3606 + }, + { + "id": 40719 + }, + { + "id": 40399 + }, + { + "id": 40255 + }, + { + "id": 40432 + }, + { + "id": 40395, + "enchant": 3834 + }, + { + "id": 40273 + }, + { + "id": 39712 + } + ]}`), }; -export const PreBis_PRESET = { - name: 'PreBis Preset', - tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - gear: EquipmentSpec.fromJsonString(`{ - "items": [ - { - "id": 42553, - "enchant": 44877, - "gems": [ - 41285, - 40049 - ] - }, - { - "id": 40680 - }, - { - "id": 34210, - "enchant": 44874, - "gems": [ - 39998, - 40026 - ] - }, - { - "id": 41610, - "enchant": 55642 - }, - { - "id": 43792, - "enchant": 33990, - "gems": [ - 39998, - 40051 - ] - }, - { - "id": 37361, - "enchant": 44498, - "gems": [ - 0 - ] - }, - { - "id": 39530, - "enchant": 54999, - "gems": [ - 40049, - 0 - ] - }, - { - "id": 40696, - "gems": [ - 40049, - 39998 - ] - }, - { - "id": 37854, - "enchant": 41602 - }, - { - "id": 44202, - "enchant": 60623, - "gems": [ - 40026 - ] - }, - { - "id": 40585 - }, - { - "id": 37694 - }, - { - "id": 37835 - }, - { - "id": 37873 - }, - { - "id": 41384, - "enchant": 44487 - }, - { - "id": 40698 - }, - { - "id": 37177 - } - ] - }`), -}; \ No newline at end of file diff --git a/ui/smite_priest/presets.ts b/ui/smite_priest/presets.ts index ef64c180b6..384d72dbbf 100644 --- a/ui/smite_priest/presets.ts +++ b/ui/smite_priest/presets.ts @@ -98,7 +98,7 @@ export const PRERAID_PRESET = { gear: EquipmentSpec.fromJsonString(`{"items": [ { "id": 42553, - "enchant": 44877, + "enchant": 3820, "gems": [ 41333, 40014 @@ -109,7 +109,7 @@ export const PRERAID_PRESET = { }, { "id": 34210, - "enchant": 44874, + "enchant": 3810, "gems": [ 42144, 40014 @@ -117,11 +117,11 @@ export const PRERAID_PRESET = { }, { "id": 41610, - "enchant": 63765 + "enchant": 3859 }, { "id": 43792, - "enchant": 33990, + "enchant": 1144, "gems": [ 42144, 40049 @@ -129,14 +129,14 @@ export const PRERAID_PRESET = { }, { "id": 37361, - "enchant": 44498, + "enchant": 2332, "gems": [ 0 ] }, { "id": 39285, - "enchant": 44592, + "enchant": 3246, "gems": [ 40014, 0 @@ -151,11 +151,11 @@ export const PRERAID_PRESET = { }, { "id": 37854, - "enchant": 41602 + "enchant": 3719 }, { "id": 44202, - "enchant": 60623, + "enchant": 3826, "gems": [ 40026 ] @@ -177,7 +177,7 @@ export const PRERAID_PRESET = { }, { "id": 41384, - "enchant": 44487 + "enchant": 3834 }, { "id": 40698 @@ -194,7 +194,7 @@ export const P1_PRESET = { gear: EquipmentSpec.fromJsonString(`{"items": [ { "id": 40562, - "enchant": 44877, + "enchant": 3820, "gems": [ 41333, 42144 @@ -208,21 +208,21 @@ export const P1_PRESET = { }, { "id": 40459, - "enchant": 44874, + "enchant": 3810, "gems": [ 42144 ] }, { "id": 44005, - "enchant": 63765, + "enchant": 3859, "gems": [ 42144 ] }, { "id": 40234, - "enchant": 33990, + "enchant": 1144, "gems": [ 39998, 39998 @@ -230,7 +230,7 @@ export const P1_PRESET = { }, { "id": 44008, - "enchant": 44498, + "enchant": 2332, "gems": [ 39998, 0 @@ -238,7 +238,7 @@ export const P1_PRESET = { }, { "id": 40454, - "enchant": 54999, + "enchant": 3604, "gems": [ 40049, 0 @@ -246,18 +246,18 @@ export const P1_PRESET = { }, { "id": 40561, - "enchant": 54793, + "enchant": 3601, "gems": [ 39998 ] }, { "id": 40560, - "enchant": 41602 + "enchant": 3719 }, { "id": 40558, - "enchant": 60623 + "enchant": 3826 }, { "id": 40719 @@ -273,7 +273,7 @@ export const P1_PRESET = { }, { "id": 40395, - "enchant": 44487 + "enchant": 3834 }, { "id": 40273 diff --git a/ui/tank_deathknight/presets.ts b/ui/tank_deathknight/presets.ts index e118fb60e9..dc9e9f27df 100644 --- a/ui/tank_deathknight/presets.ts +++ b/ui/tank_deathknight/presets.ts @@ -63,97 +63,97 @@ export const P1_BLOOD_BIS_PRESET = { name: 'P1 BiS Blood', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 40565, - "enchant": 67839, - "gems": [ - 41380, - 36767 - ] - }, - { - "id": 40387 - }, - { - "id": 39704, - "enchant": 44957, - "gems": [ - 40008 - ] - }, - { - "id": 40252, - "enchant": 55002 - }, - { - "id": 40559, - "gems": [ - 40008, - 40022 - ] - }, - { - "id": 40306, - "enchant": 44944, - "gems": [ - 40008, - 0 - ] - }, - { - "id": 40563, - "enchant": 63770, - "gems": [ - 40008, - 0 - ] - }, - { - "id": 39759, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 40567, - "enchant": 38373, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 40297, - "enchant": 44491 - }, - { - "id": 40718 - }, - { - "id": 40107 - }, - { - "id": 44063, - "gems": [ - 36767, - 36767 - ] - }, - { - "id": 42341, - "gems": [ - 40008, - 40008 - ] - }, - { - "id": 40406, - "enchant": 62158 - }, - {}, - { - "id": 40207 - } + { + "id": 40565, + "enchant": 3878, + "gems": [ + 41380, + 36767 + ] + }, + { + "id": 40387 + }, + { + "id": 39704, + "enchant": 3852, + "gems": [ + 40008 + ] + }, + { + "id": 40252, + "enchant": 3605 + }, + { + "id": 40559, + "gems": [ + 40008, + 40022 + ] + }, + { + "id": 40306, + "enchant": 3850, + "gems": [ + 40008, + 0 + ] + }, + { + "id": 40563, + "enchant": 3860, + "gems": [ + 40008, + 0 + ] + }, + { + "id": 39759, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 40567, + "enchant": 3822, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 40297, + "enchant": 3232 + }, + { + "id": 40718 + }, + { + "id": 40107 + }, + { + "id": 44063, + "gems": [ + 36767, + 36767 + ] + }, + { + "id": 42341, + "gems": [ + 40008, + 40008 + ] + }, + { + "id": 40406, + "enchant": 3847 + }, + {}, + { + "id": 40207 + } ]}`), }; diff --git a/ui/warlock/presets.ts b/ui/warlock/presets.ts index 2d2d4f4d26..ef18e0b62f 100644 --- a/ui/warlock/presets.ts +++ b/ui/warlock/presets.ts @@ -187,321 +187,311 @@ export const OtherDefaults = { export const SWP_BIS = { name: 'Straight Outa SWP', - gear: EquipmentSpec.fromJsonString(` -{"items": [ - { - "id": 34340, - "enchant": 29191, - "gems": [ - 34220, - 32215 - ] - }, - { - "id": 34204 - }, - { - "id": 31054, - "enchant": 28886, - "gems": [ - 32215, - 35760 - ] - }, - { - "id": 34242, - "enchant": 33150, - "gems": [ - 32196 - ] - }, - { - "id": 34364, - "enchant": 24003, - "gems": [ - 32196, - 35488, - 32196 - ] - }, - { - "id": 34436, - "enchant": 22534, - "gems": [ - 35760, - 0 - ] - }, - { - "id": 34344, - "enchant": 28272, - "gems": [ - 35760, - 32196, - 0 - ] - }, - { - "id": 34541, - "gems": [ - 35760, - 0 - ] - }, - { - "id": 34181, - "enchant": 24274, - "gems": [ - 32196, - 32196, - 35760 - ] - }, - { - "id": 34564, - "enchant": 35297, - "gems": [ - 35760 - ] - }, - { - "id": 34362, - "enchant": 22536 - }, - { - "id": 34230, - "enchant": 22536 - }, - { - "id": 32483 - }, - { - "id": 34429 - }, - { - "id": 34336, - "enchant": 22561 - }, - { - "id": 34179 - }, - { - "id": 34347, - "gems": [ - 35760 - ] - } - ]} - `), + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 34340, + "enchant": 3002, + "gems": [ + 34220, + 32215 + ] + }, + { + "id": 34204 + }, + { + "id": 31054, + "enchant": 2982, + "gems": [ + 32215, + 35760 + ] + }, + { + "id": 34242, + "enchant": 2621, + "gems": [ + 32196 + ] + }, + { + "id": 34364, + "enchant": 2661, + "gems": [ + 32196, + 35488, + 32196 + ] + }, + { + "id": 34436, + "enchant": 2650, + "gems": [ + 35760, + 0 + ] + }, + { + "id": 34344, + "enchant": 2937, + "gems": [ + 35760, + 32196, + 0 + ] + }, + { + "id": 34541, + "gems": [ + 35760, + 0 + ] + }, + { + "id": 34181, + "enchant": 2748, + "gems": [ + 32196, + 32196, + 35760 + ] + }, + { + "id": 34564, + "enchant": 2940, + "gems": [ + 35760 + ] + }, + { + "id": 34362, + "enchant": 2928 + }, + { + "id": 34230, + "enchant": 2928 + }, + { + "id": 32483 + }, + { + "id": 34429 + }, + { + "id": 34336, + "enchant": 2672 + }, + { + "id": 34179 + }, + { + "id": 34347, + "gems": [ + 35760 + ] + } + ]}`), }; export const P1_PreBiS_11 = { name: 'Pre-Raid Affliction', tooltip: WarlockTooltips.BIS_TOOLTIP, enableWhen: (player: Player) => player.getRotation().type == RotationType.Affliction, - gear: EquipmentSpec.fromJsonString(` - {"items": - [ - { - "id": 44910, - "enchant": 44877, - "gems": [ - 41285, - 39998 - ] - }, - { - "id": 42647, - "gems": [ - 39998 - ] - }, - { - "id": 34210, - "enchant": 44874, - "gems": [ - 39998, - 40051 - ] - }, - { - "id": 41610, - "enchant": 55642 - }, - { - "id": 39497, - "enchant": 44489, - "gems": [ - 39998, - 40051 - ] - }, - { - "id": 37361, - "enchant": 44498, - "gems": [ - 0 - ] - }, - { - "id": 42113, - "enchant": 54999, - "gems": [ - 0 - ] - }, - { - "id": 40696, - "gems": [ - 40051, - 39998 - ] - }, - { - "id": 34181, - "enchant": 41602, - "gems": [ - 39998, - 39998, - 40051 - ] - }, - { - "id": 44202, - "enchant": 55016, - "gems": [ - 40026 - ] - }, - { - "id": 43253, - "gems": [ - 40026 - ] - }, - { - "id": 37694 - }, - { - "id": 40682 - }, - { - "id": 37873 - }, - { - "id": 45085, - "enchant": 44487 - }, - { - "id": 40698 - }, - { - "id": 34348, - "gems": [ - 39998 - ] - } - ] - } - `), + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 44910, + "enchant": 3820, + "gems": [ + 41285, + 39998 + ] + }, + { + "id": 42647, + "gems": [ + 39998 + ] + }, + { + "id": 34210, + "enchant": 3810, + "gems": [ + 39998, + 40051 + ] + }, + { + "id": 41610, + "enchant": 3722 + }, + { + "id": 39497, + "enchant": 3832, + "gems": [ + 39998, + 40051 + ] + }, + { + "id": 37361, + "enchant": 2332, + "gems": [ + 0 + ] + }, + { + "id": 42113, + "enchant": 3604, + "gems": [ + 0 + ] + }, + { + "id": 40696, + "gems": [ + 40051, + 39998 + ] + }, + { + "id": 34181, + "enchant": 3719, + "gems": [ + 39998, + 39998, + 40051 + ] + }, + { + "id": 44202, + "enchant": 3606, + "gems": [ + 40026 + ] + }, + { + "id": 43253, + "gems": [ + 40026 + ] + }, + { + "id": 37694 + }, + { + "id": 40682 + }, + { + "id": 37873 + }, + { + "id": 45085, + "enchant": 3834 + }, + { + "id": 40698 + }, + { + "id": 34348, + "gems": [ + 39998 + ] + } + ]}`), } export const P1_Preset_Demo_Destro = { name: 'P1 Preset Demo / Destro', tooltip: WarlockTooltips.BIS_TOOLTIP, enableWhen: (player: Player) => player.getRotation().type == RotationType.Demonology || player.getRotation().type == RotationType.Destruction, - gear: EquipmentSpec.fromJsonString(` - {"items": - [ - { - "id": 40421, - "enchant": 44877, - "gems": [ - 41285, - 40014 - ] - }, - { - "id": 44661, - "gems": [ - 40099 - ] - }, - { - "id": 40424, - "enchant": 44874, - "gems": [ - 40049 - ] - }, - { - "id": 44005, - "enchant": 55642, - "gems": [ - 40099 - ] - }, - { - "id": 40423, - "enchant": 44489, - "gems": [ - 40049, - 40014 - ] - }, - { - "id": 44008, - "enchant": 44498, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40420, - "enchant": 54999, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40561, - "gems": [ - 40014 - ] - }, - { - "id": 40560, - "enchant": 41602 - }, - { - "id": 40558, - "enchant": 55016 - }, - { - "id": 40399 - }, - { - "id": 40719 - }, - { - "id": 40432 - }, - { - "id": 40255 - }, - { - "id": 40396, - "enchant": 44487 - }, - { - "id": 39766 - }, - { - "id": 39712 - } - ] - } - `), + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 40421, + "enchant": 3820, + "gems": [ + 41285, + 40014 + ] + }, + { + "id": 44661, + "gems": [ + 40099 + ] + }, + { + "id": 40424, + "enchant": 3810, + "gems": [ + 40049 + ] + }, + { + "id": 44005, + "enchant": 3722, + "gems": [ + 40099 + ] + }, + { + "id": 40423, + "enchant": 3832, + "gems": [ + 40049, + 40014 + ] + }, + { + "id": 44008, + "enchant": 2332, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40420, + "enchant": 3604, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40561, + "gems": [ + 40014 + ] + }, + { + "id": 40560, + "enchant": 3719 + }, + { + "id": 40558, + "enchant": 3606 + }, + { + "id": 40399 + }, + { + "id": 40719 + }, + { + "id": 40432 + }, + { + "id": 40255 + }, + { + "id": 40396, + "enchant": 3834 + }, + { + "id": 39766 + }, + { + "id": 39712 + } + ]}`), } @@ -510,100 +500,96 @@ export const P1_Preset_Affliction = { name: 'P1 Affliction Preset', tooltip: WarlockTooltips.BIS_TOOLTIP, enableWhen: (player: Player) => player.getRotation().type == RotationType.Affliction, - gear: EquipmentSpec.fromJsonString(` - {"items": - [ - { - "id": 40421, - "enchant": 44877, - "gems": [ - 41285, - 40051 - ] - }, - { - "id": 44661, - "gems": [ - 40026 - ] - }, - { - "id": 40424, - "enchant": 44874, - "gems": [ - 39998 - ] - }, - { - "id": 44005, - "enchant": 55642, - "gems": [ - 40026 - ] - }, - { - "id": 40423, - "enchant": 44489, - "gems": [ - 39998, - 40051 - ] - }, - { - "id": 44008, - "enchant": 44498, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40420, - "enchant": 54999, - "gems": [ - 39998, - 0 - ] - }, - { - "id": 40561, - "gems": [ - 39998 - ] - }, - { - "id": 40560, - "enchant": 41602 - }, - { - "id": 40558, - "enchant": 55016 - }, - { - "id": 40399 - }, - { - "id": 40719 - }, - { - "id": 40432 - }, - { - "id": 40255 - }, - { - "id": 40396, - "enchant": 44487 - }, - { - "id": 39766 - }, - { - "id": 39712 - } - ] - } - `), + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 40421, + "enchant": 3820, + "gems": [ + 41285, + 40051 + ] + }, + { + "id": 44661, + "gems": [ + 40026 + ] + }, + { + "id": 40424, + "enchant": 3810, + "gems": [ + 39998 + ] + }, + { + "id": 44005, + "enchant": 3722, + "gems": [ + 40026 + ] + }, + { + "id": 40423, + "enchant": 3832, + "gems": [ + 39998, + 40051 + ] + }, + { + "id": 44008, + "enchant": 2332, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40420, + "enchant": 3604, + "gems": [ + 39998, + 0 + ] + }, + { + "id": 40561, + "gems": [ + 39998 + ] + }, + { + "id": 40560, + "enchant": 3719 + }, + { + "id": 40558, + "enchant": 3606 + }, + { + "id": 40399 + }, + { + "id": 40719 + }, + { + "id": 40432 + }, + { + "id": 40255 + }, + { + "id": 40396, + "enchant": 3834 + }, + { + "id": 39766 + }, + { + "id": 39712 + } + ]}`), } @@ -611,111 +597,107 @@ export const P1_PreBiS_14 = { name: 'Pre-Raid Preset', tooltip: WarlockTooltips.BIS_TOOLTIP, enableWhen: (player: Player) => player.getRotation().type == RotationType.Demonology || player.getRotation().type == RotationType.Destruction, - gear: EquipmentSpec.fromJsonString(` - {"items": - [ - { - "id": 44910, - "enchant": 44877, - "gems": [ - 41285, - 39998 - ] - }, - { - "id": 42647, - "gems": [ - 40049 - ] - }, - { - "id": 34210, - "enchant": 44874, - "gems": [ - 39998, - 40014 - ] - }, - { - "id": 41610, - "enchant": 55642 - }, - { - "id": 39497, - "enchant": 44489, - "gems": [ - 39998, - 40014 - ] - }, - { - "id": 37361, - "enchant": 44498, - "gems": [ - 0 - ] - }, - { - "id": 42113, - "enchant": 54999, - "gems": [ - 0 - ] - }, - { - "id": 40696, - "gems": [ - 40014, - 39998 - ] - }, - { - "id": 34181, - "enchant": 41602, - "gems": [ - 39998, - 39998, - 40014 - ] - }, - { - "id": 44202, - "enchant": 55016, - "gems": [ - 40026 - ] - }, - { - "id": 43253, - "gems": [ - 40026 - ] - }, - { - "id": 37694 - }, - { - "id": 40682 - }, - { - "id": 37873 - }, - { - "id": 45085, - "enchant": 44487 - }, - { - "id": 40698 - }, - { - "id": 34348, - "gems": [ - 39998 - ] - } - ] - } - `), + gear: EquipmentSpec.fromJsonString(`{"items": [ + { + "id": 44910, + "enchant": 3820, + "gems": [ + 41285, + 39998 + ] + }, + { + "id": 42647, + "gems": [ + 40049 + ] + }, + { + "id": 34210, + "enchant": 3810, + "gems": [ + 39998, + 40014 + ] + }, + { + "id": 41610, + "enchant": 3722 + }, + { + "id": 39497, + "enchant": 3832, + "gems": [ + 39998, + 40014 + ] + }, + { + "id": 37361, + "enchant": 2332, + "gems": [ + 0 + ] + }, + { + "id": 42113, + "enchant": 3604, + "gems": [ + 0 + ] + }, + { + "id": 40696, + "gems": [ + 40014, + 39998 + ] + }, + { + "id": 34181, + "enchant": 3719, + "gems": [ + 39998, + 39998, + 40014 + ] + }, + { + "id": 44202, + "enchant": 3606, + "gems": [ + 40026 + ] + }, + { + "id": 43253, + "gems": [ + 40026 + ] + }, + { + "id": 37694 + }, + { + "id": 40682 + }, + { + "id": 37873 + }, + { + "id": 45085, + "enchant": 3834 + }, + { + "id": 40698 + }, + { + "id": 34348, + "gems": [ + 39998 + ] + } + ]}`), } export const Naked = { diff --git a/ui/warrior/presets.ts b/ui/warrior/presets.ts index 241d9c31bc..e189a09501 100644 --- a/ui/warrior/presets.ts +++ b/ui/warrior/presets.ts @@ -114,389 +114,391 @@ export const DefaultConsumes = Consumes.create({ export const P1_PRERAID_FURY_PRESET = { name: 'P1 Pre-Raid Fury Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().bloodthirst, + enableWhen: (player: Player) => player.getTalentTree() != 0, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 41386, - "enchant": 44879, - "gems": [ - 41398, - 42702 - ] - }, - { - "id": 42645, - "gems": [ - 40003 - ] - }, - { - "id": 44195, - "enchant": 44871 - }, - { - "id": 37647, - "enchant": 55002 - }, - { - "id": 39606, - "enchant": 44489, - "gems": [ - 40003, - 40003 - ] - }, - { - "id": 44203, - "enchant": 44484, - "gems": [ - 0 - ] - }, - { - "id": 39609, - "enchant": 54999, - "gems": [ - 40037, - 0 - ] - }, - { - "id": 40694, - "gems": [ - 42149, - 42149 - ] - }, - { - "id": 44205, - "enchant": 38374 - }, - { - "id": 44306, - "enchant": 55016, - "gems": [ - 40037, - 40037 - ] - }, - { - "id": 42642, - "gems": [ - 42149 - ] - }, - { - "id": 37642 - }, - { - "id": 42987 - }, - { - "id": 40684 - }, - { - "id": 37852, - "enchant": 44492 - }, - { - "id": 37852, - "enchant": 44492 - }, - { - "id": 37191 - } - ]}`), + { + "id": 41386, + "enchant": 3817, + "gems": [ + 41398, + 42702 + ] + }, + { + "id": 42645, + "gems": [ + 40003 + ] + }, + { + "id": 44195, + "enchant": 3808 + }, + { + "id": 37647, + "enchant": 3605 + }, + { + "id": 39606, + "enchant": 3832, + "gems": [ + 40003, + 40003 + ] + }, + { + "id": 44203, + "enchant": 3845, + "gems": [ + 0 + ] + }, + { + "id": 39609, + "enchant": 3604, + "gems": [ + 40037, + 0 + ] + }, + { + "id": 40694, + "gems": [ + 42149, + 42149 + ] + }, + { + "id": 44205, + "enchant": 3823 + }, + { + "id": 44306, + "enchant": 3606, + "gems": [ + 40037, + 40037 + ] + }, + { + "id": 42642, + "gems": [ + 42149 + ] + }, + { + "id": 37642 + }, + { + "id": 42987 + }, + { + "id": 40684 + }, + { + "id": 37852, + "enchant": 3789 + }, + { + "id": 37852, + "enchant": 3789 + }, + { + "id": 37191 + } + ]}`), }; export const P1_FURY_PRESET = { name: 'P1 Fury Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().bloodthirst, + enableWhen: (player: Player) => player.getTalentTree() != 0, gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 44006, - "enchant": 44879, - "gems": [ - 41285, - 42702 - ] - }, - { - "id": 44664, - "gems": [ - 39996 - ] - }, - { - "id": 40530, - "enchant": 44871, - "gems": [ - 40037 - ] - }, - { - "id": 40403, - "enchant": 55002 - }, - { - "id": 40539, - "enchant": 44489, - "gems": [ - 42142 - ] - }, - { - "id": 39765, - "enchant": 44484, - "gems": [ - 39996 - ] - }, - { - "id": 40541, - "enchant": 54999, - "gems": [ - 0 - ] - }, - { - "id": 40205, - "gems": [ - 42142 - ] - }, - { - "id": 40529, - "enchant": 38374, - "gems": [ - 39996, - 40022 - ] - }, - { - "id": 40591, - "enchant": 55016 - }, - { - "id": 43993, - "gems": [ - 42142 - ] - }, - { - "id": 40717 - }, - { - "id": 42987 - }, - { - "id": 40256 - }, - { - "id": 40384, - "enchant": 44492 - }, - { - "id": 40384, - "enchant": 44492 - }, - { - "id": 40385 - } - ]}`), + { + "id": 44006, + "enchant": 3817, + "gems": [ + 41285, + 42702 + ] + }, + { + "id": 44664, + "gems": [ + 39996 + ] + }, + { + "id": 40530, + "enchant": 3808, + "gems": [ + 40037 + ] + }, + { + "id": 40403, + "enchant": 3605 + }, + { + "id": 40539, + "enchant": 3832, + "gems": [ + 42142 + ] + }, + { + "id": 39765, + "enchant": 3845, + "gems": [ + 39996, + 0 + ] + }, + { + "id": 40541, + "enchant": 3604, + "gems": [ + 0 + ] + }, + { + "id": 40205, + "gems": [ + 42142 + ] + }, + { + "id": 40529, + "enchant": 3823, + "gems": [ + 39996, + 40022 + ] + }, + { + "id": 40591, + "enchant": 3606 + }, + { + "id": 43993, + "gems": [ + 42142 + ] + }, + { + "id": 40717 + }, + { + "id": 42987 + }, + { + "id": 40256 + }, + { + "id": 40384, + "enchant": 3789 + }, + { + "id": 40384, + "enchant": 3789 + }, + { + "id": 40385 + } + ]}`), }; export const P1_PRERAID_ARMS_PRESET = { name: 'P1 Pre-Raid Arms Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().mortalStrike, + enableWhen: (player: Player) => player.getTalentTree() == 0, gear: EquipmentSpec.fromJsonString(`{ "items": [ - { - "id": 41386, - "enchant": 44879, - "gems": [ - 41285, - 42702 - ] - }, - { - "id": 42645, - "gems": [ - 40002 - ] - }, - { - "id": 44195, - "enchant": 44871 - }, - { - "id": 37647, - "enchant": 55002 - }, - { - "id": 39606, - "enchant": 44489, - "gems": [ - 40002, - 40002 - ] - }, - { - "id": 41355, - "enchant": 44484, - "gems": [ - 0 - ] - }, - { - "id": 39609, - "enchant": 54999, - "gems": [ - 40037, - 0 - ] - }, - { - "id": 40694, - "gems": [ - 42149, - 42149 - ] - }, - { - "id": 37193, - "enchant": 38374, - "gems": [ - 40002, - 40037 - ] - }, - { - "id": 44306, - "enchant": 55016, - "gems": [ - 40086, - 40002 - ] - }, - { - "id": 42642, - "gems": [ - 42149 - ] - }, - { - "id": 37642 - }, - { - "id": 42987 - }, - { - "id": 40684 - }, - { - "id": 37852, - "enchant": 44492 - }, - {}, - { - "id": 37191 - } - ]}`), + { + "id": 41386, + "enchant": 3817, + "gems": [ + 41285, + 42702 + ] + }, + { + "id": 42645, + "gems": [ + 40002 + ] + }, + { + "id": 44195, + "enchant": 3808 + }, + { + "id": 37647, + "enchant": 3605 + }, + { + "id": 39606, + "enchant": 3832, + "gems": [ + 40002, + 40002 + ] + }, + { + "id": 41355, + "enchant": 3845, + "gems": [ + 0 + ] + }, + { + "id": 39609, + "enchant": 3604, + "gems": [ + 40037, + 0 + ] + }, + { + "id": 40694, + "gems": [ + 42149, + 42149 + ] + }, + { + "id": 37193, + "enchant": 3823, + "gems": [ + 40002, + 40037 + ] + }, + { + "id": 44306, + "enchant": 3606, + "gems": [ + 40086, + 40002 + ] + }, + { + "id": 42642, + "gems": [ + 42149 + ] + }, + { + "id": 37642 + }, + { + "id": 42987 + }, + { + "id": 40684 + }, + { + "id": 37852, + "enchant": 3789 + }, + {}, + { + "id": 37191 + } + ]}`), }; export const P1_ARMS_PRESET = { name: 'P1 Arms Preset', tooltip: Tooltips.BASIC_BIS_DISCLAIMER, - enableWhen: (player: Player) => player.getTalents().mortalStrike, + enableWhen: (player: Player) => player.getTalentTree() == 0, gear: EquipmentSpec.fromJsonString(`{"items": [ - { - "id": 40528, - "enchant": 44879, - "gems": [ - 41398, - 42153 - ] - }, - { - "id": 44664, - "gems": [ - 39996 - ] - }, - { - "id": 40530, - "enchant": 44871, - "gems": [ - 40038 - ] - }, - { - "id": 40403, - "enchant": 55002 - }, - { - "id": 40539, - "enchant": 44489, - "gems": [ - 42153 - ] - }, - { - "id": 40330, - "enchant": 44484, - "gems": [ - 40002 - ] - }, - { - "id": 40541, - "enchant": 54999, - "gems": [ - 0 - ] - }, - { - "id": 40205, - "gems": [ - 42153 - ] - }, - { - "id": 40318, - "enchant": 38374, - "gems": [ - 49110, - 40038 - ] - }, - { - "id": 40591, - "enchant": 55016 - }, - { - "id": 43993, - "gems": [ - 40002 - ] - }, - { - "id": 40474 - }, - { - "id": 42987 - }, - { - "id": 40256 - }, - { - "id": 40384, - "enchant": 44492 - }, - {}, - { - "id": 40385 - } - ]}`), + { + "id": 40528, + "enchant": 3817, + "gems": [ + 41398, + 42153 + ] + }, + { + "id": 44664, + "gems": [ + 39996 + ] + }, + { + "id": 40530, + "enchant": 3808, + "gems": [ + 40038 + ] + }, + { + "id": 40403, + "enchant": 3605 + }, + { + "id": 40539, + "enchant": 3832, + "gems": [ + 42153 + ] + }, + { + "id": 40330, + "enchant": 3845, + "gems": [ + 40002, + 0 + ] + }, + { + "id": 40541, + "enchant": 3604, + "gems": [ + 0 + ] + }, + { + "id": 40205, + "gems": [ + 42153 + ] + }, + { + "id": 40318, + "enchant": 3823, + "gems": [ + 49110, + 40038 + ] + }, + { + "id": 40591, + "enchant": 3606 + }, + { + "id": 43993, + "gems": [ + 40002 + ] + }, + { + "id": 40474 + }, + { + "id": 42987 + }, + { + "id": 40256 + }, + { + "id": 40384, + "enchant": 3789 + }, + {}, + { + "id": 40385 + } + ]}`), };