Replace all gear presets with blank ones, remove all but one lvl 60 t…

…est case for specs
wowsims · Nov 21, 2024 · 5634c85 · 5634c85
1 parent cefe945
commit 5634c85
Show file tree

Hide file tree

Showing 217 changed files with 2,256 additions and 20,076 deletions.
diff --git a/sim/common/sod/item_effects/phase_6.go b/sim/common/sod/item_effects/phase_6.go
@@ -77,7 +77,7 @@ func init() {
 	core.NewItemEffect(ObsidianChampion, func(agent core.Agent) {
 		character := agent.GetCharacter()
 		vanilla.StrengthOfTheChampionAura(character)
-		vanilla.EnrageAura446327(character)
+		//vanilla.EnrageAura446327(character)
 		ObsidianEdgedAura(ObsidianChampion, agent)
 	})
 

diff --git a/sim/common/vanilla/item_effects.go b/sim/common/vanilla/item_effects.go
diff --git a/sim/core/bulksim.go b/sim/core/bulksim.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"math"
 	"runtime"
-	"runtime/debug"
 	"sort"
 	"strings"
 	"sync/atomic"
@@ -57,11 +56,11 @@ type singleBulkSim struct {
 
 func (b *bulkSimRunner) Run(signals simsignals.Signals, progress chan *proto.ProgressMetrics) (result *proto.BulkSimResult) {
 	defer func() {
-		if err := recover(); err != nil {
-			result = &proto.BulkSimResult{
-				Error: &proto.ErrorOutcome{Message: fmt.Sprintf("%v\nStack Trace:\n%s", err, string(debug.Stack()))},
-			}
-		}
+		// if err := recover(); err != nil {
+		// 	result = &proto.BulkSimResult{
+		// 		Error: &proto.ErrorOutcome{Message: fmt.Sprintf("%v\nStack Trace:\n%s", err, string(debug.Stack()))},
+		// 	}
+		// }
 		signals.Abort.Trigger()
 	}()
 

diff --git a/sim/core/simsignals/api_test.go b/sim/core/simsignals/api_test.go
@@ -18,14 +18,14 @@ func TestAbort(t *testing.T) {
 		Level:     60,
 		Race:      proto.Race_RaceOrc,
 		Class:     proto.Class_ClassWarrior,
-		Equipment: core.GetGearSet("../../../ui/warrior/gear_sets", "phase_4_2h").GearSet,
+		Equipment: core.GetGearSet("../../../ui/tank_warrior/gear_sets", "placeholder").GearSet,
 		Rotation:  &proto.APLRotation{},
 		Consumes:  &proto.Consumes{},
 		Spec: &proto.Player_Warrior{
 			Warrior: &proto.Warrior{
 				Options: &proto.Warrior_Options{
-					StartingRage:    50,
-					Shout:           proto.WarriorShout_WarriorShoutBattle,
+					StartingRage: 50,
+					Shout:        proto.WarriorShout_WarriorShoutBattle,
 				},
 			},
 		},
@@ -175,7 +175,7 @@ func TestAbort(t *testing.T) {
 			BaseSettings: rsr,
 			BulkSettings: &proto.BulkSettings{
 				Combinations:       true,
-				Items:              []*proto.ItemSpec{{Id: 19168}, {Id: 228757}},
+				Items:              []*proto.ItemSpec{{Id: 19168}, {Id: 10761}},
 				IterationsPerCombo: 9999,
 				FastMode:           false,
 			},