This makes the sim build and run

makefile

@@ -7,32 +7,23 @@ rwildcard = $(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(
 GOROOT := $(shell go env GOROOT)
 UI_SRC := $(shell find ui -name '*.ts' -o -name '*.tsx' -o -name '*.scss' -o -name '*.html')
 PAGE_INDECES := ui/druid/balance/index.html \
-				ui/druid/feral/index.html \
-				ui/druid/guardian/index.html \
+				ui/druid/feralcat/index.html \
+				ui/druid/feralbear/index.html \
 				ui/druid/restoration/index.html \
-				ui/hunter/beast_mastery/index.html \
-				ui/hunter/marksmanship/index.html \
-				ui/hunter/survival/index.html \
-				ui/mage/arcane/index.html \
-				ui/mage/fire/index.html \
-				ui/mage/frost/index.html \
+				ui/hunter/index.html \
+				ui/mage/index.html \
 				ui/paladin/holy/index.html \
 				ui/paladin/protection/index.html \
 				ui/paladin/retribution/index.html \
 				ui/priest/discipline/index.html \
 				ui/priest/holy/index.html \
 				ui/priest/shadow/index.html \
-				ui/rogue/assassination/index.html \
-				ui/rogue/combat/index.html \
-				ui/rogue/subtlety/index.html \
+				ui/rogue/index.html \
 				ui/shaman/elemental/index.html \
 				ui/shaman/enhancement/index.html \
 				ui/shaman/restoration/index.html \
-				ui/warlock/affliction/index.html \
-				ui/warlock/demonology/index.html \
-				ui/warlock/destruction/index.html \
-				ui/warrior/arms/index.html \
-				ui/warrior/fury/index.html \
+				ui/warlock/index.html \
+				ui/warrior/dps/index.html \
 				ui/warrior/protection/index.html \
 				ui/raid/full/index.html
 

sim/core/item_swaps.go

@@ -80,8 +80,8 @@ func (character *Character) enableItemSwap(itemSwap *proto.ItemSwap, mhCritMulti
 	equipmentStats := calcItemSwapStatsOffset(character.Equipment, swapItems, prepullBonusStats, slots, character.Spec)
 
 	character.ItemSwap = ItemSwap{
-		isFuryWarrior:        character.Spec == proto.Spec_SpecFuryWarrior,
-		isFeralDruid:         character.Spec == proto.Spec_SpecFeralDruid || character.Spec == proto.Spec_SpecGuardianDruid,
+		isFuryWarrior:        character.Spec == proto.Spec_SpecDPSWarrior,
+		isFeralDruid:         character.Spec == proto.Spec_SpecFeralCatDruid || character.Spec == proto.Spec_SpecFeralBearDruid,
 		mhCritMultiplier:     mhCritMultiplier,
 		ohCritMultiplier:     ohCritMultiplier,
 		rangedCritMultiplier: rangedCritMultiplier,

sim/core/test_utils.go

@@ -374,22 +374,10 @@ func getPlayerSpecOptions(player *proto.Player) interface{} {
 	if playerSpec, ok := player.Spec.(*proto.Player_RestorationDruid); ok {
 		return playerSpec
 	}
-	if playerSpec, ok := player.Spec.(*proto.Player_BeastMasteryHunter); ok {
+	if playerSpec, ok := player.Spec.(*proto.Player_Hunter); ok {
 		return playerSpec
 	}
-	if playerSpec, ok := player.Spec.(*proto.Player_MarksmanshipHunter); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_SurvivalHunter); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_ArcaneMage); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_FireMage); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_FrostMage); ok {
+	if playerSpec, ok := player.Spec.(*proto.Player_Mage); ok {
 		return playerSpec
 	}
 	if playerSpec, ok := player.Spec.(*proto.Player_HolyPaladin); ok {
@@ -410,13 +398,7 @@ func getPlayerSpecOptions(player *proto.Player) interface{} {
 	if playerSpec, ok := player.Spec.(*proto.Player_ShadowPriest); ok {
 		return playerSpec
 	}
-	if playerSpec, ok := player.Spec.(*proto.Player_AssassinationRogue); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_CombatRogue); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_SubtletyRogue); ok {
+	if playerSpec, ok := player.Spec.(*proto.Player_Rogue); ok {
 		return playerSpec
 	}
 	if playerSpec, ok := player.Spec.(*proto.Player_ElementalShaman); ok {
@@ -428,19 +410,10 @@ func getPlayerSpecOptions(player *proto.Player) interface{} {
 	if playerSpec, ok := player.Spec.(*proto.Player_RestorationShaman); ok {
 		return playerSpec
 	}
-	if playerSpec, ok := player.Spec.(*proto.Player_AfflictionWarlock); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_DemonologyWarlock); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_DestructionWarlock); ok {
-		return playerSpec
-	}
-	if playerSpec, ok := player.Spec.(*proto.Player_ArmsWarrior); ok {
+	if playerSpec, ok := player.Spec.(*proto.Player_Warlock); ok {
 		return playerSpec
 	}
-	if playerSpec, ok := player.Spec.(*proto.Player_FuryWarrior); ok {
+	if playerSpec, ok := player.Spec.(*proto.Player_DpsWarrior); ok {
 		return playerSpec
 	}
 	if playerSpec, ok := player.Spec.(*proto.Player_ProtectionWarrior); ok {

sim/druid/balance/balance.go

@@ -34,12 +34,12 @@ func NewBalanceDruid(character *core.Character, options *proto.Player) *BalanceD
 	selfBuffs := druid.SelfBuffs{}
 
 	moonkin := &BalanceDruid{
-		Druid:            druid.New(character, druid.Moonkin, selfBuffs, options.TalentsString),
-		Options:          balanceOptions.Options,
-		EclipseEnergyMap: make(EclipseEnergyMap),
+		Druid:   druid.New(character, druid.Moonkin, selfBuffs, options.TalentsString),
+		Options: balanceOptions.Options,
+		// EclipseEnergyMap: make(EclipseEnergyMap),
 	}
 
-	moonkin.registerTreants()
+	// moonkin.registerTreants()
 
 	moonkin.SelfBuffs.InnervateTarget = &proto.UnitReference{}
 	if balanceOptions.Options.ClassOptions.InnervateTarget != nil {
@@ -52,10 +52,10 @@ func NewBalanceDruid(character *core.Character, options *proto.Player) *BalanceD
 
 type BalanceDruid struct {
 	*druid.Druid
-	eclipseEnergyBar
+	// eclipseEnergyBar
 	Options *proto.BalanceDruid_Options
 
-	EclipseEnergyMap EclipseEnergyMap
+	// EclipseEnergyMap EclipseEnergyMap
 
 	LunarEclipseSpellMod       *core.SpellMod
 	SolarEclipseSpellMod       *core.SpellMod
@@ -87,36 +87,36 @@ func (moonkin *BalanceDruid) GetDruid() *druid.Druid {
 func (moonkin *BalanceDruid) Initialize() {
 	moonkin.Druid.Initialize()
 
-	moonkin.EnableEclipseBar()
-	moonkin.RegisterEclipseSpellMods()
-	moonkin.RegisterEclipseAuras()
-	moonkin.RegisterEclipseEnergyGainAura()
+	// moonkin.EnableEclipseBar()
+	// moonkin.RegisterEclipseSpellMods()
+	// moonkin.RegisterEclipseAuras()
+	// moonkin.RegisterEclipseEnergyGainAura()
 
-	moonkin.RegisterBalancePassives()
-	moonkin.RegisterBalanceSpells()
+	// moonkin.RegisterBalancePassives()
+	// moonkin.RegisterBalanceSpells()
 
 	moonkin.ManaMetric = moonkin.NewManaMetrics(core.ActionID{SpellID: 81070 /* Eclipse */})
 }
 
 func (moonkin *BalanceDruid) ApplyTalents() {
 	moonkin.Druid.ApplyTalents()
-	moonkin.ApplyBalanceTalents()
+	//moonkin.ApplyBalanceTalents()
 }
 
 func (moonkin *BalanceDruid) RegisterBalanceSpells() {
 	moonkin.RegisterMoonkinFormSpell()
 
-	moonkin.registerSunfireSpell()
-	moonkin.registerStarfireSpell()
-	moonkin.registerStarsurgeSpell()
-	moonkin.registerStarfallSpell()
-	moonkin.registerAstralCommunionSpell()
-	moonkin.registerCelestialAlignmentSpell()
-	moonkin.registerAstralStormSpell()
-	moonkin.registerWildMushrooms()
+	// moonkin.registerSunfireSpell()
+	// moonkin.registerStarfireSpell()
+	// moonkin.registerStarsurgeSpell()
+	// moonkin.registerStarfallSpell()
+	// moonkin.registerAstralCommunionSpell()
+	// moonkin.registerCelestialAlignmentSpell()
+	// moonkin.registerAstralStormSpell()
+	// moonkin.registerWildMushrooms()
 }
 
 func (moonkin *BalanceDruid) Reset(sim *core.Simulation) {
-	moonkin.eclipseEnergyBar.reset()
+	//moonkin.eclipseEnergyBar.reset()
 	moonkin.Druid.Reset(sim)
 }