Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes Rogue #18

Merged
merged 2 commits into from
Nov 23, 2024
Merged

Removes Rogue #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc0fe4b
Removes Rogue
sanguinerarogue Nov 23, 2024
ec3080e
Merge branch 'master' into DeleteTankRogue
sanguinerarogue Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed assets/img/tank_rogue_background.png
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions proto/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion proto/common.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ enum Spec {
SpecProtectionPaladin = 13;
SpecRetributionPaladin = 3;
SpecRogue = 7;
SpecTankRogue = 22;
SpecHealingPriest = 17;
SpecShadowPriest = 4;
SpecWarlock = 5;
Expand Down
2 changes: 0 additions & 2 deletions sim/register_all.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -51,7 +50,6 @@ func RegisterAll() {
// healingPriest.RegisterHealingPriest()
shadow.RegisterShadowPriest()
dpsrogue.RegisterDpsRogue()
tankrogue.RegisterTankRogue()
dpsWarrior.RegisterDpsWarrior()
tankWarrior.RegisterTankWarrior()
// holyPaladin.RegisterHolyPaladin()
Expand Down
54 changes: 0 additions & 54 deletions sim/rogue/tank_rogue/tank_rogue.go
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions tools/database/gen_db/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion ui/core/components/sim_title_dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 0 additions & 4 deletions ui/core/launched_sims.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
58 changes: 3 additions & 55 deletions ui/core/proto_utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -131,7 +131,6 @@ export const naturalSpecOrder: Array<Spec> = [
Spec.SpecHealingPriest,
Spec.SpecShadowPriest,
Spec.SpecRogue,
Spec.SpecTankRogue,
Spec.SpecElementalShaman,
Spec.SpecEnhancementShaman,
Spec.SpecRestorationShaman,
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -522,7 +513,6 @@ export type SpecProtoUnion =
| Hunter
| Mage
| Rogue
| TankRogue
| HolyPaladin
| ProtectionPaladin
| RetributionPaladin
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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);
}
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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: [] },
Expand Down
47 changes: 10 additions & 37 deletions ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 0 additions & 2 deletions ui/raid/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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),
Expand Down
1 change: 0 additions & 1 deletion ui/scss/sims/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Loading
Loading