P8 Tuning Changes

assets/database/db.json

@@ -9944,7 +9944,7 @@
 {"id":240152,"name":"Heretic Wristguards","icon":"inv_bracer_13","type":6,"armorType":1,"requiresLevel":60,"stats":[0,0,21,0,10,14,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,194,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":98,"phase":8,"quality":4,"sanctified":true,"setName":"Heretic Stitchings","setId":1953},
 {"id":240153,"name":"Heretic Boots","icon":"inv_boots_fabric_01","type":10,"armorType":1,"requiresLevel":60,"stats":[0,0,30,8,10,18,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,200,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":98,"phase":8,"quality":4,"sanctified":true,"setName":"Heretic Stitchings","setId":1953},
 {"id":240174,"name":"Solistra, Fang of the First Light","icon":"inv_misc_monsterfang_01","type":13,"weaponType":2,"handType":2,"requiresLevel":60,"stats":[0,12,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":70,"weaponDamageMax":131,"weaponSpeed":1.2,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4,"unique":true},
-{"id":240837,"name":"Strings of Fate","icon":"inv_weapon_bow_30","type":14,"rangedWeaponType":1,"requiresLevel":60,"stats":[0,10,8,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":159,"weaponDamageMax":297,"weaponSpeed":3.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
+{"id":240837,"name":"Strings of Fate","icon":"inv_weapon_bow_30","type":14,"rangedWeaponType":1,"requiresLevel":60,"stats":[0,21,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":177,"weaponDamageMax":330,"weaponSpeed":3.6,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
 {"id":240839,"name":"Thal'kituun, the Unseen Guest","icon":"inv_misc_monsterfang_01","type":13,"weaponType":2,"handType":1,"requiresLevel":60,"stats":[0,0,15,0,0,144,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,100,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":23,"weaponDamageMax":84,"weaponSpeed":1.3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":92,"phase":8,"quality":4},
 {"id":240841,"name":"High Commander's Guard","icon":"inv_sword_74","type":13,"weaponType":9,"handType":1,"requiresLevel":60,"stats":[0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":70,"weaponDamageMax":131,"weaponSpeed":1.2,"weaponSkills":[0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4,"unique":true},
 {"id":240842,"name":"Scarlet Rotbringer","icon":"inv_staff_52","type":13,"weaponType":8,"handType":4,"requiresLevel":60,"stats":[20,14,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,150,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,700],"weaponDamageMin":159,"weaponDamageMax":235,"weaponSpeed":3.6,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":94,"phase":8,"quality":4},
@@ -9962,7 +9962,7 @@
 {"id":240922,"name":"Deception","icon":"inv_sword_2h_blood_c_01","type":13,"weaponType":9,"handType":2,"requiresLevel":60,"stats":[0,15,10,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":146,"weaponDamageMax":272,"weaponSpeed":2.7,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":92,"phase":8,"quality":4,"unique":true,"setName":"Tools of the Nathrezim","setId":1956},
 {"id":240923,"name":"Duplicity","icon":"inv_sword_2h_blood_c_01","type":13,"weaponType":9,"handType":2,"requiresLevel":60,"stats":[15,0,10,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":158,"weaponDamageMax":294,"weaponSpeed":2.8,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":94,"phase":8,"quality":4,"unique":true,"setName":"Tools of the Nathrezim","setId":1956},
 {"id":240924,"name":"Poleaxe of the Beast","icon":"inv_weapon_halberd_05","type":13,"weaponType":6,"handType":4,"requiresLevel":60,"stats":[0,40,13,0,0,0,0,0,0,0,0,0,0,1,3,0,0,0,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,756],"weaponDamageMin":296,"weaponDamageMax":444,"weaponSpeed":3.4,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
-{"id":240925,"name":"Experiment-800M","icon":"inv_weapon_rifle_19","type":14,"rangedWeaponType":3,"requiresLevel":60,"stats":[0,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":159,"weaponDamageMax":297,"weaponSpeed":3.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
+{"id":240925,"name":"Experiment-800M","icon":"inv_weapon_rifle_19","type":14,"rangedWeaponType":3,"requiresLevel":60,"stats":[0,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":159,"weaponDamageMax":297,"weaponSpeed":3.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
 {"id":240997,"name":"Fratley's Spur","icon":"ability_upgrademoonglaive","type":14,"rangedWeaponType":6,"requiresLevel":60,"stats":[6,6,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":152,"weaponDamageMax":283,"weaponSpeed":3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":94,"phase":8,"quality":4},
 {"id":240998,"name":"Soporific Blade","icon":"inv_sword_05","type":13,"weaponType":2,"handType":1,"requiresLevel":60,"stats":[0,0,11,10,0,169,0,0,0,0,0,0,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":33,"weaponDamageMax":134,"weaponSpeed":2,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
 {"id":241001,"name":"Tyr's Fall","icon":"inv_mace_82","type":13,"weaponType":4,"handType":1,"requiresLevel":60,"stats":[0,0,9,17,0,169,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":39,"weaponDamageMax":160,"weaponSpeed":2.4,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},

assets/database/leftover_db.json

@@ -1568,8 +1568,8 @@
 {"effectId":929,"itemId":16217,"spellId":20017,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0],"quality":2},

sim/common/sod/item_effects/phase_7.go

@@ -72,14 +72,14 @@ func init() {
 	})
 
 	// https://www.wowhead.com/classic/item=237512/blade-of-inquisition
-	// Equip: Chance on hit to Increase your Strength by 250 and movement speed by 15% for 15 sec. (15s cooldown)
+	// Equip: Chance on hit to Increase your Strength by 175 and movement speed by 15% for 15 sec. (15s cooldown)
 	// TODO: Verify proc chance, 1ppm for now
 	core.NewItemEffect(BladeOfInquisition, func(agent core.Agent) {
 		character := agent.GetCharacter()
 
 		dpm := character.AutoAttacks.NewDynamicProcManagerForWeaponEffect(BladeOfInquisition, 1.0, 0)
 
-		buffAura := character.NewTemporaryStatsAura("Scarlet Inquisition", core.ActionID{SpellID: 1223342}, stats.Stats{stats.Strength: 250}, time.Second*15)
+		buffAura := character.NewTemporaryStatsAura("Scarlet Inquisition", core.ActionID{SpellID: 1223342}, stats.Stats{stats.Strength: 175}, time.Second*15)
 
 		triggerAura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
 			Name:              "Blade of Inquisition Trigger",

sim/common/sod/item_effects/phase_8.go

@@ -267,29 +267,64 @@ func init() {
 	// https://www.wowhead.com/classic-ptr/item=240852/crimson-cleaver
 	// Chance on hit: Your next 2 instances of Nature damage are increased by 20%. Lasts 12 sec. (100ms cooldown)
 	// Confirmed PPM 1.0
-	itemhelpers.CreateWeaponProcAura(CrimsonCleaver, "Crimson Cleaver", 1.0, func(character *core.Character) *core.Aura {
-		duration := time.Second * 12
+	core.NewItemEffect(CrimsonCleaver, func(agent core.Agent) {
+		character := agent.GetCharacter()
+
+		procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
+
 		icd := core.Cooldown{
 			Timer:    character.NewTimer(),
 			Duration: time.Millisecond * 100,
 		}
 
-		// Confirmed on Wago - Harmful Spells and Melee Specials, plus Can proc from procs
-		procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
-
-		return character.RegisterAura(core.Aura{
+		buffAura := character.RegisterAura(core.Aura{
 			ActionID:  core.ActionID{SpellID: 1231456},
 			Label:     "Crimson Crusade",
-			Duration:  duration,
-			MaxStacks: 2,
+			Duration:  time.Second * 12,
+			MaxStacks: 4,
 			OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 				if spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolNature) && icd.IsReady(sim) {
-					icd.Use(sim)
 					aura.RemoveStack(sim)
 				}
 			},
 		}).AttachMultiplicativePseudoStatBuff(&character.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexNature], 1.20)
+
+		core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+			Name:     "Crimson Cleaver Trigger",
+			Callback: core.CallbackOnSpellHitDealt,
+			Outcome:  core.OutcomeLanded,
+			ProcMask: core.ProcMaskMelee,
+			PPM:      1.0,
+			ICD:      time.Millisecond * 100,
+			Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+				buffAura.Activate(sim)
+				buffAura.SetStacks(sim, buffAura.MaxStacks)
+			},
+		})
 	})
+	// itemhelpers.CreateWeaponProcAura(CrimsonCleaver, "Crimson Cleaver", 1.0, func(character *core.Character) *core.Aura {
+	// 	duration := time.Second * 12
+	// 	icd := core.Cooldown{
+	// 		Timer:    character.NewTimer(),
+	// 		Duration: time.Millisecond * 100,
+	// 	}
+
+	// 	// Confirmed on Wago - Harmful Spells and Melee Specials, plus Can proc from procs
+	// 	procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
+
+	// 	return character.RegisterAura(core.Aura{
+	// 		ActionID:  core.ActionID{SpellID: 1231456},
+	// 		Label:     "Crimson Crusade",
+	// 		Duration:  duration,
+	// 		MaxStacks: 2,
+	// 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+	// 			if spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolNature) && icd.IsReady(sim) {
+	// 				icd.Use(sim)
+	// 				aura.RemoveStack(sim)
+	// 			}
+	// 		},
+	// 	}).AttachMultiplicativePseudoStatBuff(&character.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexNature], 1.20)
+	// })
 
 	// https://www.wowhead.com/classic-ptr/item=240922/deception
 	// Equip: 2% chance on melee hit to gain 1 extra attack. (Proc chance: 2%, 100ms cooldown)
@@ -352,7 +387,7 @@ func init() {
 			SpellSchool: core.SpellSchoolFire,
 			DefenseType: core.DefenseTypeMagic,
 			ProcMask:    core.ProcMaskSpellDamage,
-			Flags:       core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell,
+			Flags:       core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | core.SpellFlagIgnoreAttackerModifiers | core.SpellFlagIgnoreTargetModifiers,
 
 			DamageMultiplier: 1,
 			ThreatMultiplier: 1,
@@ -622,31 +657,66 @@ func init() {
 	})
 
 	// https://www.wowhead.com/classic-ptr/item=240854/mercy
-	// Chance on hit: Your next 2 instances of Fire damage are increased by 20%.  Lasts 12 sec. (100ms cooldown)
+	// Chance on hit: Your next 4 instances of Fire damage are increased by 20%.  Lasts 12 sec. (100ms cooldown)
 	// Confirmed PPM 1.0
-	itemhelpers.CreateWeaponProcAura(Mercy, "Mercy", 1.0, func(character *core.Character) *core.Aura {
-		duration := time.Second * 12
+	core.NewItemEffect(Mercy, func(agent core.Agent) {
+		character := agent.GetCharacter()
+
+		procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
+
 		icd := core.Cooldown{
 			Timer:    character.NewTimer(),
 			Duration: time.Millisecond * 100,
 		}
 
-		// Confirmed on Wago - Harmful Spells and Melee Specials, plus Can proc from procs
-		procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
-
-		return character.RegisterAura(core.Aura{
+		buffAura := character.RegisterAura(core.Aura{
 			ActionID:  core.ActionID{SpellID: 1231498},
 			Label:     "Mercy by Fire",
-			Duration:  duration,
-			MaxStacks: 2,
+			Duration:  time.Second * 12,
+			MaxStacks: 4,
 			OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 				if spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolFire) && icd.IsReady(sim) {
-					icd.Use(sim)
 					aura.RemoveStack(sim)
 				}
 			},
 		}).AttachMultiplicativePseudoStatBuff(&character.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexFire], 1.20)
+
+		core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+			Name:     "Mercy Trigger",
+			Callback: core.CallbackOnSpellHitDealt,
+			Outcome:  core.OutcomeLanded,
+			ProcMask: core.ProcMaskMelee,
+			PPM:      1.0,
+			ICD:      time.Millisecond * 100,
+			Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+				buffAura.Activate(sim)
+				buffAura.SetStacks(sim, buffAura.MaxStacks)
+			},
+		})
 	})
+	// itemhelpers.CreateWeaponProcAura(Mercy, "Mercy", 1.0, func(character *core.Character) *core.Aura {
+	// 	duration := time.Second * 12
+	// 	icd := core.Cooldown{
+	// 		Timer:    character.NewTimer(),
+	// 		Duration: time.Millisecond * 100,
+	// 	}
+
+	// 	// Confirmed on Wago - Harmful Spells and Melee Specials, plus Can proc from procs
+	// 	procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
+
+	// 	return character.RegisterAura(core.Aura{
+	// 		ActionID:  core.ActionID{SpellID: 1231498},
+	// 		Label:     "Mercy by Fire",
+	// 		Duration:  duration,
+	// 		MaxStacks: 2,
+	// 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+	// 			if spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolFire) && icd.IsReady(sim) {
+	// 				icd.Use(sim)
+	// 				aura.RemoveStack(sim)
+	// 			}
+	// 		},
+	// 	}).AttachMultiplicativePseudoStatBuff(&character.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexFire], 1.20)
+	// })
 
 	// https://www.wowhead.com/classic-ptr/item=241003/mirage-rod-of-illusion
 	// Equip: Chance on landing a damaging spell to create a Mirage on top of your target that deals arcane damage to nearby enemies for 30 sec. (Proc chance: 10%, 30s cooldown)
@@ -684,7 +754,7 @@ func init() {
 					Label: "Mirage",
 				},
 				NumberOfTicks: 10,
-				TickLength:    time.Second * 3,
+				TickLength:    core.GCDDefault,
 				OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
 					explosionSpell.Cast(sim, target)
 				},