Merge branch 'master' of https://github.com/wowsims/wotlk into apl

wowsims · Jan 5, 2024 · cb0f632 · cb0f632
2 parents 762070a + cada47b
commit cb0f632
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/sim/core/database.go b/sim/core/database.go
@@ -396,7 +396,7 @@ func ColorIntersects(g proto.GemColor, o proto.GemColor) bool {
 		return true
 	}
 	if g == proto.GemColor_GemColorMeta {
-		return o == proto.GemColor_GemColorUnknown
+		return o == proto.GemColor_GemColorMeta
 	}
 	if g == proto.GemColor_GemColorRed {
 		return o == proto.GemColor_GemColorOrange || o == proto.GemColor_GemColorPurple

diff --git a/sim/druid/feral/feral_test.go b/sim/druid/feral/feral_test.go
@@ -40,6 +40,7 @@ func TestFeral(t *testing.T) {
 			{Label: "Default-NoBleed", SpecOptions: PlayerOptionsMonoCatNoBleed},
 			{Label: "Flower-Aoe", SpecOptions: PlayerOptionsFlowerCatAoe},
 		},
+		Rotation:   core.GetAplRotation("../../../ui/feral_druid/apls", "default"),
 		ItemFilter: FeralItemFilter,
 	}))
 }
@@ -190,26 +191,3 @@ var FullConsumes = &proto.Consumes{
 	DefaultPotion:   proto.Potions_HastePotion,
 	DefaultConjured: proto.Conjured_ConjuredDarkRune,
 }
-
-var P2GearDoubleArmorPenTrinkets = core.EquipmentSpecFromJsonString(`
-{
-	"items": [
-	{"id":46161,"enchant":3817,"gems":[41398,40002]},
-	{"id":45517,"gems":[40002]},
-	{"id":45245,"enchant":3808,"gems":[40002,40002]},
-	{"id":46032,"enchant":3605,"gems":[40002,40058]},
-	{"id":45473,"enchant":3832,"gems":[40002,40002,40002]},
-	{"id":45869,"enchant":3845,"gems":[40037,0]},
-	{"id":46158,"enchant":3604,"gems":[40002,0]},
-	{"id":46095,"gems":[40002,40002,40002]},
-	{"id":45536,"enchant":3823,"gems":[39996,39996,39996]},
-	{"id":45564,"enchant":3606,"gems":[39996,39996]},
-	{"id":46048,"gems":[45862]},
-	{"id":45608,"gems":[39996]},
-	{"id":45931},
-	{"id":40256},
-	{"id":45613,"enchant":3789,"gems":[40037,42702]},
-	{},
-	{"id":40713}
-  ]
-}`)