fix meta gem socket bonus. ignite should not proc clearcasting. lower…

… evocate threshold (#3717)
wowsims · Sep 21, 2023 · a0e1086 · a0e1086
1 parent d4c824d
commit a0e1086
Show file tree

Hide file tree

Showing 11 changed files with 708 additions and 709 deletions.
diff --git a/sim/core/database.go b/sim/core/database.go
@@ -2,7 +2,6 @@ package core
 
 import (
 	"fmt"
-
 	"github.com/wowsims/wotlk/sim/core/proto"
 	"github.com/wowsims/wotlk/sim/core/stats"
 	"google.golang.org/protobuf/encoding/protojson"
@@ -397,7 +396,7 @@ func ColorIntersects(g proto.GemColor, o proto.GemColor) bool {
 		return true
 	}
 	if g == proto.GemColor_GemColorMeta {
-		return false // meta gems o nothing.
+		return o == proto.GemColor_GemColorUnknown
 	}
 	if g == proto.GemColor_GemColorRed {
 		return o == proto.GemColor_GemColorOrange || o == proto.GemColor_GemColorPurple

diff --git a/sim/deathknight/ghoul_frenzy.go b/sim/deathknight/ghoul_frenzy.go
@@ -66,7 +66,7 @@ func (dk *Deathknight) registerGhoulFrenzySpell() {
 		Label:    "Ghoul Frenzy",
 		Duration: time.Second * 30.0,
 		OnReset: func(aura *core.Aura, sim *core.Simulation) {
-			if dk.Inputs.PrecastGhoulFrenzy {
+			if !dk.IsUsingAPL && dk.Inputs.PrecastGhoulFrenzy {
 				dk.GhoulFrenzyAura.Activate(sim)
 				dk.GhoulFrenzyAura.UpdateExpires(sim.CurrentTime + time.Second*20)
 			}
@@ -78,7 +78,7 @@ func (dk *Deathknight) registerGhoulFrenzySpell() {
 		Label:    "Ghoul Frenzy",
 		Duration: time.Second * 30.0,
 		OnReset: func(aura *core.Aura, sim *core.Simulation) {
-			if dk.Inputs.PrecastGhoulFrenzy {
+			if !dk.IsUsingAPL && dk.Inputs.PrecastGhoulFrenzy {
 				dk.Ghoul.GhoulFrenzyAura.Activate(sim)
 				dk.Ghoul.GhoulFrenzyAura.UpdateExpires(sim.CurrentTime + time.Second*20)
 			}

diff --git a/sim/deathknight/horn_of_winter.go b/sim/deathknight/horn_of_winter.go
@@ -21,7 +21,7 @@ func (dk *Deathknight) registerHornOfWinterSpell() {
 		ActionID: actionID,
 		Duration: duration,
 		OnReset: func(aura *core.Aura, sim *core.Simulation) {
-			if dk.Inputs.PrecastHornOfWinter && dk.Inputs.RefreshHornOfWinter {
+			if !dk.IsUsingAPL && dk.Inputs.PrecastHornOfWinter && dk.Inputs.RefreshHornOfWinter {
 				aura.Activate(sim)
 			}
 		},
@@ -52,7 +52,7 @@ func (dk *Deathknight) registerHornOfWinterSpell() {
 			IgnoreHaste: true,
 		},
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			if dk.Inputs.RefreshHornOfWinter {
+			if !dk.IsUsingAPL && dk.Inputs.RefreshHornOfWinter {
 				dk.HornOfWinterAura.Activate(sim)
 			}
 			dk.AddRunicPower(sim, 10, rpMetrics)

diff --git a/sim/druid/balance/TestBalancePhase3.results b/sim/druid/balance/TestBalancePhase3.results
@@ -523,8 +523,8 @@ dps_results: {
 dps_results: {
  key: "TestBalancePhase3-AllItems-LasherweaveRegalia"
  value: {
-  dps: 10121.88915
-  tps: 9902.7564
+  dps: 10122.42199
+  tps: 9903.28923
  }
 }
 dps_results: {

diff --git a/sim/druid/items.go b/sim/druid/items.go
@@ -109,8 +109,8 @@ var ItemSetLasherweaveRegalia = core.NewItemSet(core.ItemSet{
 					},
 				},
 				ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
+					spell.SpellMetrics[target.UnitIndex].Hits++
 					spell.Dot(target).ApplyOrReset(sim)
-					spell.CalcAndDealOutcome(sim, target, spell.OutcomeAlwaysHit)
 				},
 			})