A first pass on warlock

makefile

@@ -25,7 +25,6 @@ HTML_INDECIES := ui/balance_druid/index.html \
 				 ui/healing_priest/index.html \
 				 ui/shadow_priest/index.html \
 				 ui/warlock/index.html \
-				 ui/tank_warlock/index.html \
 				 ui/warrior/index.html \
 				 ui/tank_warrior/index.html \
 				 ui/raid/index.html \

proto/api.proto

@@ -15,7 +15,7 @@ import "shaman.proto";
 import "warlock.proto";
 import "warrior.proto";
 
-// NextIndex: 49
+// NextIndex: 47
 message Player {
 	// Label used for logging.
 	string name = 1;
@@ -76,9 +76,8 @@ message Player {
 		ElementalShaman elemental_shaman = 33;
 		EnhancementShaman enhancement_shaman = 34;
 		RestorationShaman restoration_shaman = 35;
-		WardenShaman warden_shaman = 47;
+		WardenShaman warden_shaman = 39;
 		Warlock warlock = 36;
-		TankWarlock tank_warlock = 39;
 		Warrior warrior = 37;
 		TankWarrior tank_warrior = 38;
 	}

proto/common.proto

@@ -3,7 +3,7 @@ package proto;
 
 option go_package = "./proto";
 
-// NextIndex: 24
+// NextIndex: 23
 enum Spec {
 	SpecBalanceDruid = 0;
 	SpecFeralDruid = 12;
@@ -12,7 +12,7 @@ enum Spec {
 	SpecElementalShaman = 1;
 	SpecEnhancementShaman = 9;
 	SpecRestorationShaman = 19;
-	SpecWardenShaman = 23;
+	SpecWardenShaman = 21;
 	SpecHunter = 8;
 	SpecMage = 2;
 	SpecHolyPaladin = 20;
@@ -23,7 +23,6 @@ enum Spec {
 	SpecHealingPriest = 17;
 	SpecShadowPriest = 4;
 	SpecWarlock = 5;
-	SpecTankWarlock = 21;
 	SpecWarrior = 6;
 	SpecTankWarrior = 11;
 }

proto/warlock.proto

@@ -61,46 +61,6 @@ message WarlockTalents {
 	bool conflagrate = 50;
 }
 
-enum WarlockRune {
-	WarlockRuneNone = 0;
-
-	RuneHelmVengeance							= 426195;
-	RuneHelmPandemic							= 427712;
-	RuneHelmBackdraft							= 427713;
-
-	RuneCloakMarkOfChaos					= 440892;
-	RuneCloakInfernalArmor				= 440882;
-	RuneCloakSoulSiphon						= 403511;
-
-	RuneChestLakeOfFire						= 403666;
-	RuneChestMasterChanneler			= 403668;
-	RuneChestDemonicTactics				= 412727;
-
-	RuneBracerUnstableAffliction  = 427717;
-	RuneBracerImmolationAura			= 427726;
-	RuneBracerIncinerate					= 412758;
-	RuneBracerSummonFelguard			= 427733;
-
-	RuneHandsHaunt								= 403501;
-	RuneHandsChaosBolt						= 403629;
-	RuneHandsShadowBoltVolley			= 403628;
-	RuneHandsMetamorphosis				= 403789;
-
-	RuneBeltInvocation						= 426243;
-	RuneBeltGrimoireOfSynergy			= 426301;
-	RuneBeltShadowAndFlame				= 426316;
-
-	RuneLegsEverlastingAffliction	= 412689;
-	RuneLegsDemonicGrace					= 425463;
-	RuneLegsDemonicPact						= 425464;
-
-	RuneBootsDemonicKnowledge			= 412732;
-	RuneBootsDanceOfTheWicked			= 412798;
-	RuneBootsShadowflame					= 426320;
-	RuneBootsDecimation						= 440870;
-
-}
-
 message WarlockRotation {
 }
 
@@ -111,13 +71,11 @@ message WarlockOptions {
 		Voidwalker = 2;
 		Succubus = 3;
 		Felhunter = 4;
-		Felguard = 5;
 	}
 
 	enum Armor {
 		NoArmor = 0;
 		DemonArmor = 1;
-		FelArmor = 2;
 	}
 
 	enum WeaponImbue {

sim/common/vanilla/item_sets/crafted.go

@@ -2,6 +2,7 @@ package item_sets
 
 import (
 	"github.com/wowsims/classic/sim/core"
+	"github.com/wowsims/classic/sim/core/proto"
 	"github.com/wowsims/classic/sim/core/stats"
 )
 
@@ -63,9 +64,11 @@ var ItemSetBloodvineGarb = core.NewItemSet(core.ItemSet{
 	Name: "Bloodvine Garb",
 	Bonuses: map[int32]core.ApplyEffect{
 		// Improves your chance to get a critical strike with spells by 2%.
-		2: func(agent core.Agent) {
+		3: func(agent core.Agent) {
 			character := agent.GetCharacter()
-			character.AddStat(stats.SpellCrit, 2*core.SpellCritRatingPerCritChance)
+			if character.HasProfession(proto.Profession_Tailoring) {
+				character.AddStat(stats.SpellCrit, 2*core.SpellCritRatingPerCritChance)
+			}
 		},
 	},
 })

sim/register_all.go

@@ -25,7 +25,6 @@ import (
 
 	// restoShaman "github.com/wowsims/classic/sim/shaman/restoration"
 	dpsWarlock "github.com/wowsims/classic/sim/warlock/dps"
-	tankWarlock "github.com/wowsims/classic/sim/warlock/tank"
 	dpsWarrior "github.com/wowsims/classic/sim/warrior/dps_warrior"
 	tankWarrior "github.com/wowsims/classic/sim/warrior/tank_warrior"
 )
@@ -58,5 +57,4 @@ func RegisterAll() {
 	protection.RegisterProtectionPaladin()
 	retribution.RegisterRetributionPaladin()
 	dpsWarlock.RegisterDpsWarlock()
-	tankWarlock.RegisterTankWarlock()
 }