Removes Rogue

makefile

@@ -18,7 +18,6 @@ HTML_INDECIES := ui/balance_druid/index.html \
 				 ui/hunter/index.html \
 				 ui/mage/index.html \
 				 ui/rogue/index.html \
-				 ui/tank_rogue/index.html \
 				 ui/holy_paladin/index.html \
 				 ui/protection_paladin/index.html \
 				 ui/retribution_paladin/index.html \

proto/api.proto

@@ -28,7 +28,7 @@ message Player {
 	Consumes consumes = 6;
 	UnitStats bonus_stats = 7;
 
-	bool enable_item_swap = 46;
+	bool enable_item_swap = 40;
 	ItemSwap item_swap = 45;
 
 	IndividualBuffs buffs = 8;
@@ -72,7 +72,6 @@ message Player {
 		HealingPriest healing_priest = 29;
 		ShadowPriest shadow_priest = 30;
 		Rogue rogue = 32;
-		TankRogue tank_rogue = 40;
 		ElementalShaman elemental_shaman = 33;
 		EnhancementShaman enhancement_shaman = 34;
 		RestorationShaman restoration_shaman = 35;

proto/common.proto

@@ -19,7 +19,6 @@ enum Spec {
 	SpecProtectionPaladin = 13;
 	SpecRetributionPaladin = 3;
 	SpecRogue = 7;
-	SpecTankRogue = 22;
 	SpecHealingPriest = 17;
 	SpecShadowPriest = 4;
 	SpecWarlock = 5;

sim/register_all.go

@@ -5,7 +5,6 @@ import (
 	"github.com/wowsims/classic/sim/druid/balance"
 	"github.com/wowsims/classic/sim/paladin/retribution"
 	dpsrogue "github.com/wowsims/classic/sim/rogue/dps_rogue"
-	tankrogue "github.com/wowsims/classic/sim/rogue/tank_rogue"
 	"github.com/wowsims/classic/sim/shaman/elemental"
 	"github.com/wowsims/classic/sim/shaman/enhancement"
 	"github.com/wowsims/classic/sim/shaman/warden"
@@ -51,7 +50,6 @@ func RegisterAll() {
 	// healingPriest.RegisterHealingPriest()
 	shadow.RegisterShadowPriest()
 	dpsrogue.RegisterDpsRogue()
-	tankrogue.RegisterTankRogue()
 	dpsWarrior.RegisterDpsWarrior()
 	tankWarrior.RegisterTankWarrior()
 	// holyPaladin.RegisterHolyPaladin()

tools/database/gen_db/main.go

@@ -460,13 +460,6 @@ func GetAllRotationSpellIds() map[string][]int32 {
 			Equipment: &proto.EquipmentSpec{},
 			Rotation:  &proto.APLRotation{},
 		}, &proto.Player_Rogue{Rogue: &proto.Rogue{}}), nil, nil, nil)},
-		// TODO: Rogue Tank Sim
-		// {Name: "tank rogue", Raid: core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{
-		// 	Class:     proto.Class_ClassRogue,
-		// 	Level:     60,
-		// 	Equipment: &proto.EquipmentSpec{},
-		// 	Rotation:  &proto.APLRotation{},
-		// }, &proto.Player_TankRogue{TankRogue: &proto.TankRogue{}}), nil, nil, nil)},
 		{Name: "warrior", Raid: core.SinglePlayerRaidProto(core.WithSpec(&proto.Player{
 			Class:     proto.Class_ClassWarrior,
 			Level:     60,

ui/core/components/sim_title_dropdown.tsx

@@ -52,7 +52,6 @@ export class SimTitleDropdown extends Component {
 		[Spec.SpecHunter]: 'Hunter',
 		[Spec.SpecMage]: 'Mage',
 		[Spec.SpecRogue]: 'DPS',
-		[Spec.SpecTankRogue]: 'Tank',
 		[Spec.SpecHolyPaladin]: 'Holy',
 		[Spec.SpecProtectionPaladin]: 'Protection',
 		[Spec.SpecRetributionPaladin]: 'Retribution',

ui/core/launched_sims.ts

@@ -68,10 +68,6 @@ export const simLaunchStatuses: Record<Spec, SimStatus> = {
 		phase: Phase.Phase5,
 		status: LaunchStatus.Alpha,
 	},
-	[Spec.SpecTankRogue]: {
-		phase: Phase.Phase5,
-		status: LaunchStatus.Alpha,
-	},
 	[Spec.SpecHolyPaladin]: {
 		phase: Phase.Phase1,
 		status: LaunchStatus.Unlaunched,

ui/core/proto_utils/utils.ts

@@ -55,7 +55,7 @@ import {
 	ShadowPriest_Options as ShadowPriestOptions,
 	ShadowPriest_Rotation as ShadowPriestRotation,
 } from '../proto/priest.js';
-import { Rogue, Rogue_Rotation as RogueRotation, RogueOptions as RogueOptions, RogueTalents, TankRogue } from '../proto/rogue.js';
+import { Rogue, Rogue_Rotation as RogueRotation, RogueOptions as RogueOptions, RogueTalents } from '../proto/rogue.js';
 import {
 	ElementalShaman,
 	ElementalShaman_Options as ElementalShamanOptions,
@@ -89,7 +89,7 @@ export type HunterSpecs = Spec.SpecHunter;
 export type MageSpecs = Spec.SpecMage;
 export type PaladinSpecs = Spec.SpecHolyPaladin | Spec.SpecRetributionPaladin | Spec.SpecProtectionPaladin;
 export type PriestSpecs = Spec.SpecHealingPriest | Spec.SpecShadowPriest;
-export type RogueSpecs = Spec.SpecRogue | Spec.SpecTankRogue;
+export type RogueSpecs = Spec.SpecRogue;
 export type ShamanSpecs = Spec.SpecElementalShaman | Spec.SpecEnhancementShaman | Spec.SpecRestorationShaman | Spec.SpecWardenShaman;
 export type WarlockSpecs = Spec.SpecWarlock | Spec.SpecTankWarlock;
 export type WarriorSpecs = Spec.SpecWarrior | Spec.SpecTankWarrior;
@@ -131,7 +131,6 @@ export const naturalSpecOrder: Array<Spec> = [
 	Spec.SpecHealingPriest,
 	Spec.SpecShadowPriest,
 	Spec.SpecRogue,
-	Spec.SpecTankRogue,
 	Spec.SpecElementalShaman,
 	Spec.SpecEnhancementShaman,
 	Spec.SpecRestorationShaman,
@@ -166,7 +165,6 @@ export const specNames: Record<Spec, string> = {
 	[Spec.SpecHunter]: 'Hunter',
 	[Spec.SpecMage]: 'Mage',
 	[Spec.SpecRogue]: 'Rogue',
-	[Spec.SpecTankRogue]: 'Tank Rogue',
 	[Spec.SpecHolyPaladin]: 'Holy Paladin',
 	[Spec.SpecProtectionPaladin]: 'Protection Paladin',
 	[Spec.SpecRetributionPaladin]: 'Retribution Paladin',
@@ -250,7 +248,6 @@ export const titleIcons: Record<Spec, string> = {
 	[Spec.SpecHunter]: 'https://wow.zamimg.com/images/wow/icons/large/class_hunter.jpg',
 	[Spec.SpecMage]: 'https://wow.zamimg.com/images/wow/icons/large/class_mage.jpg',
 	[Spec.SpecRogue]: 'https://wow.zamimg.com/images/wow/icons/large/class_rogue.jpg',
-	[Spec.SpecTankRogue]: 'https://wow.zamimg.com/images/wow/icons/large/ability_rogue_bloodyeye.jpg',
 	[Spec.SpecHolyPaladin]: 'https://wow.zamimg.com/images/wow/icons/large/spell_holy_holybolt.jpg',
 	[Spec.SpecProtectionPaladin]: 'https://wow.zamimg.com/images/wow/icons/large/spell_holy_devotionaura.jpg',
 	[Spec.SpecRetributionPaladin]: 'https://wow.zamimg.com/images/wow/icons/large/spell_holy_auraoflight.jpg',
@@ -371,8 +368,6 @@ export type SpecRotation<T extends Spec> = T extends Spec.SpecBalanceDruid
 	? MageRotation
 	: T extends Spec.SpecRogue
 	? RogueRotation
-	: T extends Spec.SpecTankRogue
-	? RogueRotation
 	: T extends Spec.SpecHolyPaladin
 	? HolyPaladinRotation
 	: T extends Spec.SpecProtectionPaladin
@@ -425,8 +420,6 @@ export type SpecTalents<T extends Spec> = T extends Spec.SpecBalanceDruid
 	? MageTalents
 	: T extends Spec.SpecRogue
 	? RogueTalents
-	: T extends Spec.SpecTankRogue
-	? RogueTalents
 	: T extends Spec.SpecHolyPaladin
 	? PaladinTalents
 	: T extends Spec.SpecProtectionPaladin
@@ -488,8 +481,6 @@ export type SpecOptions<T extends Spec> = T extends Spec.SpecBalanceDruid
 	? MageOptions
 	: T extends Spec.SpecRogue
 	? RogueOptions
-	: T extends Spec.SpecTankRogue
-	? RogueOptions
 	: T extends Spec.SpecHolyPaladin
 	? HolyPaladinOptions
 	: T extends Spec.SpecProtectionPaladin
@@ -522,7 +513,6 @@ export type SpecProtoUnion =
 	| Hunter
 	| Mage
 	| Rogue
-	| TankRogue
 	| HolyPaladin
 	| ProtectionPaladin
 	| RetributionPaladin
@@ -554,8 +544,6 @@ export type SpecProto<T extends Spec> = T extends Spec.SpecBalanceDruid
 	? Mage
 	: T extends Spec.SpecRogue
 	? Rogue
-	: T extends Spec.SpecTankRogue
-	? TankRogue
 	: T extends Spec.SpecHolyPaladin
 	? HolyPaladin
 	: T extends Spec.SpecProtectionPaladin
@@ -901,27 +889,6 @@ export const specTypeFunctions: Record<Spec, SpecTypeFunctions<any>> = {
 		optionsFromJson: obj => RogueOptions.fromJson(obj),
 		optionsFromPlayer: player => (player.spec.oneofKind == 'rogue' ? player.spec.rogue.options || RogueOptions.create() : RogueOptions.create()),
 	},
-	[Spec.SpecTankRogue]: {
-		// TODO: Check this is fine
-		rotationCreate: () => RogueRotation.create(),
-		rotationEquals: (a, b) => RogueRotation.equals(a as RogueRotation, b as RogueRotation),
-		rotationCopy: a => RogueRotation.clone(a as RogueRotation),
-		rotationToJson: a => RogueRotation.toJson(a as RogueRotation),
-		rotationFromJson: obj => RogueRotation.fromJson(obj),
-
-		talentsCreate: () => RogueTalents.create(),
-		talentsEquals: (a, b) => RogueTalents.equals(a as RogueTalents, b as RogueTalents),
-		talentsCopy: a => RogueTalents.clone(a as RogueTalents),
-		talentsToJson: a => RogueTalents.toJson(a as RogueTalents),
-		talentsFromJson: obj => RogueTalents.fromJson(obj),
-
-		optionsCreate: () => RogueOptions.create(),
-		optionsEquals: (a, b) => RogueOptions.equals(a as RogueOptions, b as RogueOptions),
-		optionsCopy: a => RogueOptions.clone(a as RogueOptions),
-		optionsToJson: a => RogueOptions.toJson(a as RogueOptions),
-		optionsFromJson: obj => RogueOptions.fromJson(obj),
-		optionsFromPlayer: player => (player.spec.oneofKind == 'tankRogue' ? player.spec.tankRogue.options || RogueOptions.create() : RogueOptions.create()),
-	},
 	[Spec.SpecHealingPriest]: {
 		rotationCreate: () => HealingPriestRotation.create(),
 		rotationEquals: (a, b) => HealingPriestRotation.equals(a as HealingPriestRotation, b as HealingPriestRotation),
@@ -1078,7 +1045,6 @@ export const specToClass: Record<Spec, Class> = {
 	[Spec.SpecHunter]: Class.ClassHunter,
 	[Spec.SpecMage]: Class.ClassMage,
 	[Spec.SpecRogue]: Class.ClassRogue,
-	[Spec.SpecTankRogue]: Class.ClassRogue,
 	[Spec.SpecHolyPaladin]: Class.ClassPaladin,
 	[Spec.SpecProtectionPaladin]: Class.ClassPaladin,
 	[Spec.SpecRetributionPaladin]: Class.ClassPaladin,
@@ -1119,7 +1085,6 @@ export const specToEligibleRaces: Record<Spec, Array<Race>> = {
 	[Spec.SpecProtectionPaladin]: paladinRaces,
 	[Spec.SpecRetributionPaladin]: paladinRaces,
 	[Spec.SpecRogue]: rogueRaces,
-	[Spec.SpecTankRogue]: rogueRaces,
 	[Spec.SpecHealingPriest]: priestRaces,
 	[Spec.SpecShadowPriest]: priestRaces,
 	[Spec.SpecWarlock]: warlockRaces,
@@ -1136,14 +1101,7 @@ export function canDualWield(player: Player<Spec>): boolean {
 	return dualWieldClasses.includes(player.getClass());
 }
 
-const tankSpecs: Array<Spec> = [
-	Spec.SpecFeralTankDruid,
-	Spec.SpecProtectionPaladin,
-	Spec.SpecTankWarrior,
-	Spec.SpecTankWarlock,
-	Spec.SpecTankRogue,
-	Spec.SpecWardenShaman,
-];
+const tankSpecs: Array<Spec> = [Spec.SpecFeralTankDruid, Spec.SpecProtectionPaladin, Spec.SpecTankWarrior, Spec.SpecTankWarlock, Spec.SpecWardenShaman];
 export function isTankSpec(spec: Spec): boolean {
 	return tankSpecs.includes(spec);
 }
@@ -1178,7 +1136,6 @@ export const specToLocalStorageKey: Record<Spec, string> = {
 	[Spec.SpecProtectionPaladin]: '__classic_protection_paladin',
 	[Spec.SpecRetributionPaladin]: '__classic_retribution_paladin',
 	[Spec.SpecRogue]: '__classic_rogue',
-	[Spec.SpecTankRogue]: '__classic_tank_rogue',
 	[Spec.SpecHealingPriest]: '__classic_healing_priest',
 	[Spec.SpecShadowPriest]: '__classic_shadow_priest',
 	[Spec.SpecWarlock]: '__classic_warlock',
@@ -1304,14 +1261,6 @@ export function withSpecProto<SpecType extends Spec>(spec: Spec, player: PlayerP
 				}),
 			};
 			return copy;
-		case Spec.SpecTankRogue:
-			copy.spec = {
-				oneofKind: 'tankRogue',
-				tankRogue: Rogue.create({
-					options: specOptions as RogueOptions,
-				}),
-			};
-			return copy;
 		case Spec.SpecHealingPriest:
 			copy.spec = {
 				oneofKind: 'healingPriest',
@@ -1753,7 +1702,6 @@ export function makeDefaultBlessings(numPaladins: number): BlessingsAssignments
 		{ spec: Spec.SpecHealingPriest, blessings: [Blessings.BlessingOfKings, Blessings.BlessingOfWisdom] },
 		{ spec: Spec.SpecShadowPriest, blessings: [Blessings.BlessingOfKings, Blessings.BlessingOfWisdom] },
 		{ spec: Spec.SpecRogue, blessings: [Blessings.BlessingOfKings, Blessings.BlessingOfMight] },
-		{ spec: Spec.SpecTankRogue, blessings: [Blessings.BlessingOfKings, Blessings.BlessingOfMight] },
 		{ spec: Spec.SpecElementalShaman, blessings: [] },
 		{ spec: Spec.SpecEnhancementShaman, blessings: [] },
 		{ spec: Spec.SpecRestorationShaman, blessings: [] },

ui/index.html

@@ -73,8 +73,8 @@ <h3 class="expansion-title w-100 mb-0">Classic</h3>
 				<div class="container homepage-content-container">
 					<div class="info-container">
 						<p class="wowsims-info">
-							Welcome to WoWSims - Classic! This is a community-driven project to provide class and raid simulations for World of
-							Warcraft® Classic together with the leading theorycrafters and class representatives.
+							Welcome to WoWSims - Classic! This is a community-driven project to provide class and raid simulations for World of Warcraft®
+							Classic together with the leading theorycrafters and class representatives.
 						</p>
 					</div>
 					<div class="sim-links-container">
@@ -149,42 +149,15 @@ <h3 class="expansion-title w-100 mb-0">Classic</h3>
 								</ul>
 							</div>
 
-							<div class="dropend sim-link-dropdown">
-								<a href="javascript:void(0)" class="sim-link text-rogue" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-									<div class="sim-link-content">
-										<img src="https://wow.zamimg.com/images/wow/icons/large/class_rogue.jpg" class="sim-link-icon" />
-										<div class="d-flex flex-column">
-											<span class="sim-link-title">Rogue</span>
-										</div>
+							<a href="/classic/rogue/" class="sim-link text-rogue">
+								<div class="sim-link-content">
+									<img src="https://wow.zamimg.com/images/wow/icons/large/class_rogue.jpg" class="sim-link-icon" />
+									<div class="d-flex flex-column">
+										<span class="sim-link-title">Rogue</span>
+										<span class="launch-status-label text-brand">Phase 1 - Alpha</span>
 									</div>
-								</a>
-								<ul class="dropdown-menu w-100">
-									<li>
-										<a href="/classic/rogue/" class="sim-link text-rogue">
-											<div class="sim-link-content">
-												<img src="https://wow.zamimg.com/images/wow/icons/large/class_rogue.jpg" class="sim-link-icon" />
-												<div class="d-flex flex-column">
-													<span class="sim-link-label">Rogue</span>
-													<span class="sim-link-title">DPS</span>
-													<span class="launch-status-label text-brand">Phase 5 - Alpha</span>
-												</div>
-											</div>
-										</a>
-									</li>
-									<li>
-										<a href="/classic/tank_rogue/" class="sim-link text-rogue">
-											<div class="sim-link-content">
-												<img src="https://wow.zamimg.com/images/wow/icons/large/ability_rogue_bloodyeye.jpg" class="sim-link-icon" />
-												<div class="d-flex flex-column">
-													<span class="sim-link-label">Rogue</span>
-													<span class="sim-link-title">Tank</span>
-													<span class="launch-status-label text-brand">Phase 5 - Alpha</span>
-												</div>
-											</div>
-										</a>
-									</li>
-								</ul>
-							</div>
+								</div>
+							</a>
 
 							<a href="/classic/hunter/" class="sim-link text-hunter">
 								<div class="sim-link-content">

ui/raid/presets.ts

@@ -17,7 +17,6 @@ import { RestorationShamanSimUI } from '../restoration_shaman/sim.js';
 import { RetributionPaladinSimUI } from '../retribution_paladin/sim.js';
 import { RogueSimUI } from '../rogue/sim.js';
 import { ShadowPriestSimUI } from '../shadow_priest/sim.js';
-import { TankRogueSimUI } from '../tank_rogue/sim.js';
 import { TankWarlockSimUI } from '../tank_warlock/sim.js';
 import { TankWarriorSimUI } from '../tank_warrior/sim.js';
 import { WardenShamanSimUI } from '../warden_shaman/sim.js';
@@ -36,7 +35,6 @@ export const specSimFactories: Record<Spec, (parentElem: HTMLElement, player: Pl
 	[Spec.SpecHunter]: (parentElem: HTMLElement, player: Player<any>) => new HunterSimUI(parentElem, player),
 	[Spec.SpecMage]: (parentElem: HTMLElement, player: Player<any>) => new MageSimUI(parentElem, player),
 	[Spec.SpecRogue]: (parentElem: HTMLElement, player: Player<any>) => new RogueSimUI(parentElem, player),
-	[Spec.SpecTankRogue]: (parentElem: HTMLElement, player: Player<any>) => new TankRogueSimUI(parentElem, player),
 	[Spec.SpecHolyPaladin]: (parentElem: HTMLElement, player: Player<any>) => new HolyPaladinSimUI(parentElem, player),
 	[Spec.SpecProtectionPaladin]: (parentElem: HTMLElement, player: Player<any>) => new ProtectionPaladinSimUI(parentElem, player),
 	[Spec.SpecRetributionPaladin]: (parentElem: HTMLElement, player: Player<any>) => new RetributionPaladinSimUI(parentElem, player),

ui/scss/sims/index.scss

@@ -15,7 +15,6 @@
 @import 'restoration_shaman/sim';
 @import 'retribution_paladin/sim';
 @import 'rogue/sim';
-@import 'tank_rogue/sim';
 @import 'shadow_priest/sim';
 @import 'warlock/sim';
 @import 'tank_warlock/sim';