Skip to content

Disable broken code due to talents and glyphs. Remove Prime glyphs #6

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

Merged
1337LutZ merged 2 commits into from
Apr 29, 2025
Merged

Disable broken code due to talents and glyphs. Remove Prime glyphs #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2b5cc4
Disable broken code due to talents and glyphs. Remove Prime glyphs
1337LutZ Apr 25, 2025
f6410e9
Remove FE prime glyph references
1337LutZ Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 0 additions & 15 deletions proto/death_knight.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,6 @@ message DeathKnightTalents {
int32 sudden_doom = 59;
bool summon_gargoyle = 60;
}

enum DeathKnightPrimeGlyph {
DeathKnightPrimeGlyphNone = 0;
GlyphOfDeathAndDecay = 43542;
GlyphOfDeathCoil = 45804;
GlyphOfDeathStrike = 43827;
GlyphOfFrostStrike = 43543;
GlyphOfHeartStrike = 43534;
GlyphOfHowlingBlast = 45806;
GlyphOfIcyTouch = 43546;
GlyphOfObliterate = 43547;
GlyphOfRaiseDead = 43549;
GlyphOfRuneStrike = 43550;
GlyphOfScourgeStrike = 43551;
}
enum DeathKnightMajorGlyph {
DeathKnightMajorGlyphNone = 0;
GlyphOfAntiMagicShell = 43533;
Expand Down
19 changes: 0 additions & 19 deletions proto/druid.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,6 @@ message DruidTalents {
bool tree_of_life = 63;
}

enum DruidPrimeGlyph {
DruidPrimeGlyphNone = 0;
GlyphOfBerserk = 45601;
GlyphOfBloodletting = 40901;
GlyphOfInsectSwarm = 40919;
GlyphOfLacerate = 67484;
GlyphOfLifebloom = 40915;
GlyphOfMangle = 40900;
GlyphOfMoonfire = 40923;
GlyphOfRegrowth = 40912;
GlyphOfRejuvenation = 40913;
GlyphOfRip = 40902;
GlyphOfSavageRoar = 45604;
GlyphOfStarfire = 40916;
GlyphOfStarsurge = 45603;
GlyphOfSwiftmend = 40906;
GlyphOfTigersFury = 67487;
GlyphOfWrath = 40922;
}
enum DruidMajorGlyph {
DruidMajorGlyphNone = 0;
GlyphOfBarkskin = 45623;
Expand Down
13 changes: 0 additions & 13 deletions proto/hunter.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,6 @@ message HunterTalents {
int32 serpent_spread = 57;
bool black_arrow = 58;
}
enum HunterPrimeGlyph {
HunterPrimeGlyphNone = 0;
GlyphOfAimedShot = 42897;
GlyphOfArcaneShot = 42898;
GlyphOfChimeraShot = 45625;
GlyphOfDazzledPrey = 42909;
GlyphOfExplosiveShot = 45731;
GlyphOfKillCommand = 42915;
GlyphOfKillShot = 45732;
GlyphOfRapidFire = 42911;
GlyphOfSerpentSting = 42912;
GlyphOfSteadyShot = 42914;
}
enum HunterMajorGlyph {
HunterMajorGlyphNone = 0;
GlyphOfBestialWrath = 42902;
Expand Down
16 changes: 0 additions & 16 deletions proto/mage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,6 @@ message MageTalents {
int32 frostfire_orb = 60;
bool deep_freeze = 61;
}
enum MagePrimeGlyph {
MagePrimeGlyphNone = 0;
GlyphOfArcaneBarrage = 45738;
GlyphOfArcaneBlast = 44955;
GlyphOfArcaneMissiles = 42735;
GlyphOfConeOfCold = 42753;
GlyphOfDeepFreeze = 45736;
GlyphOfFireball = 42739;
GlyphOfFrostbolt = 42742;
GlyphOfFrostfire = 44684;
GlyphOfIceLance = 42745;
GlyphOfLivingBomb = 63539;
GlyphOfMageArmor = 42749;
GlyphOfMoltenArmor = 42751;
GlyphOfPyroblast = 42743;
}
enum MageMajorGlyph {
MageMajorGlyphNone = 0;
GlyphOfArcanePower = 42736;
Expand Down
5 changes: 0 additions & 5 deletions proto/monk.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ message MonkTalents {
bool invoke_xuen_the_white_tiger = 17;
bool chi_torpedo = 18;
}

enum MonkPrimeGlyph {
MonkPrimeGlyphNone = 0;
}

enum MonkMajorGlyph {
MonkMajorGlyphNone = 0;
MonkMajorGlyphAfterlife = 87891;
Expand Down
15 changes: 1 addition & 14 deletions proto/paladin.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,7 @@ message PaladinTalents {
int32 acts_of_sacrifice = 59;
bool zealotry = 60;
}
enum PaladinPrimeGlyph {
PaladinPrimeGlyphNone = 0;
GlyphOfCrusaderStrike = 41098;
GlyphOfDivineFavor = 41106;
GlyphOfExorcism = 41103;
GlyphOfHammerOfTheRighteous = 45742;
GlyphOfHolyShock = 45746;
GlyphOfJudgement = 41092;
GlyphOfSealOfInsight = 41110;
GlyphOfSealOfTruth = 43869;
GlyphOfShieldOfTheRighteous = 45744;
GlyphOfTemplarSVerdict = 45743;
GlyphOfWordOfGlory = 41105;
}

enum PaladinMajorGlyph {
PaladinMajorGlyphNone = 0;
GlyphOfBeaconOfLight = 45741;
Expand Down
16 changes: 0 additions & 16 deletions proto/priest.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,6 @@ message PriestTalents {
int32 shadowy_apparition = 62;
bool dispersion = 63;
}

enum PriestPrimeGlyph {
PriestPrimeGlyphNone = 0;
GlyphOfDispersion = 45753;
GlyphOfFlashHeal = 42400;
GlyphOfGuardianSpirit = 45755;
GlyphOfLightwell = 42403;
GlyphOfMindFlay = 42415;
GlyphOfPenance = 45756;
GlyphOfPowerWordBarrier = 42407;
GlyphOfPowerWordShield = 42408;
GlyphOfPrayerOfHealing = 42409;
GlyphOfRenew = 42411;
GlyphOfShadowWordDeath = 42414;
GlyphOfShadowWordPain = 42406;
}
enum PriestMajorGlyph {
PriestMajorGlyphNone = 0;
GlyphOfCircleOfHealing = 42396;
Expand Down
16 changes: 0 additions & 16 deletions proto/rogue.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,6 @@ message RogueTalents {
int32 serrated_blades = 56;
bool shadow_dance = 57;
}

enum RoguePrimeGlyph {
RoguePrimeGlyphNone = 0;
GlyphOfAdrenalineRush = 42954;
GlyphOfBackstab = 42956;
GlyphOfEviscerate = 42961;
GlyphOfHemorrhage = 42967;
GlyphOfKillingSpree = 45762;
GlyphOfMutilate = 45768;
GlyphOfRevealingStrike = 42965;
GlyphOfRupture = 42969;
GlyphOfShadowDance = 45764;
GlyphOfSinisterStrike = 42972;
GlyphOfSliceAndDice = 42973;
GlyphOfVendetta = 45761;
}
enum RogueMajorGlyph {
RogueMajorGlyphNone = 0;
GlyphOfAmbush = 42955;
Expand Down
18 changes: 0 additions & 18 deletions proto/shaman.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,6 @@ message ShamanTalents {
int32 blessing_of_the_eternals = 57;
bool riptide = 58;
}
enum ShamanPrimeGlyph {
ShamanPrimeGlyphNone = 0;
GlyphOfEarthShield = 45775;
GlyphOfEarthlivingWeapon = 41527;
GlyphOfFeralSpirit = 45771;
GlyphOfFireElementalTotem = 41529;
GlyphOfFlameShock = 41531;
GlyphOfFlametongueWeapon = 41532;
GlyphOfLavaBurst = 41524;
GlyphOfLavaLash = 41540;
GlyphOfLightningBolt = 41536;
GlyphOfRiptide = 45772;
GlyphOfShocking = 41526;
GlyphOfStormstrike = 41539;
GlyphOfUnleashedLightning = 71155;
GlyphOfWaterShield = 41541;
GlyphOfWindfuryWeapon = 41542;
}
enum ShamanMajorGlyph {
ShamanMajorGlyphNone = 0;
GlyphOfChainHeal = 41517;
Expand Down
17 changes: 0 additions & 17 deletions proto/warlock.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,6 @@ message WarlockTalents {
bool bane_of_havoc = 55;
bool chaos_bolt = 56;
}

enum WarlockPrimeGlyph {
WarlockPrimeGlyphNone = 0;
GlyphOfBaneOfAgony = 42456;
GlyphOfChaosBolt = 45781;
GlyphOfConflagrate = 42454;
GlyphOfCorruption = 42455;
GlyphOfFelguard = 42459;
GlyphOfHaunt = 45779;
GlyphOfImmolate = 42464;
GlyphOfImp = 42465;
GlyphOfIncinerate = 42453;
GlyphOfLashOfPain = 50077;
GlyphOfMetamorphosis = 45780;
GlyphOfShadowburn = 42468;
GlyphOfUnstableAffliction = 42472;
}
enum WarlockMajorGlyph {
WarlockMajorGlyphNone = 0;
GlyphOfDeathCoilWl = 42457;
Expand Down
12 changes: 0 additions & 12 deletions proto/warrior.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,6 @@ message WarriorTalents {
int32 sword_and_board = 60;
bool shockwave = 61;
}
enum WarriorPrimeGlyph {
WarriorPrimeGlyphNone = 0;
GlyphOfBladestorm = 45790;
GlyphOfBloodthirst = 43416;
GlyphOfDevastate = 43415;
GlyphOfMortalStrike = 43421;
GlyphOfOverpower = 43422;
GlyphOfRagingBlow = 43432;
GlyphOfRevenge = 43424;
GlyphOfShieldSlam = 43425;
GlyphOfSlam = 43423;
}
enum WarriorMajorGlyph {
WarriorMajorGlyphNone = 0;
GlyphOfCleaving = 43414;
Expand Down
12 changes: 1 addition & 11 deletions sim/core/sim_concurrent_test.go → sim/core/_sim_concurrent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ func getTestPlayerMM() *proto.Player {
}
var MMTalents = "032002-2302320032120231221-03"

var MMGlyphs = &proto.Glyphs{
Prime1: int32(proto.HunterPrimeGlyph_GlyphOfArcaneShot),
Prime2: int32(proto.HunterPrimeGlyph_GlyphOfRapidFire),
Prime3: int32(proto.HunterPrimeGlyph_HunterPrimeGlyphNone),
}
var MMGlyphs = &proto.Glyphs{}
var FerocityTalents = &proto.HunterPetTalents{
SerpentSwiftness: 2,
Dive: true,
Expand Down Expand Up @@ -67,9 +63,6 @@ func getTestPlayerMM() *proto.Player {
func getTestPlayerBloodDk() *proto.Player {
var BloodTalents = "03323203132212311321--003"
var BloodDefaultGlyphs = &proto.Glyphs{
Prime1: int32(proto.DeathKnightPrimeGlyph_GlyphOfDeathStrike),
Prime2: int32(proto.DeathKnightPrimeGlyph_GlyphOfHeartStrike),
Prime3: int32(proto.DeathKnightPrimeGlyph_GlyphOfRuneStrike),
Major1: int32(proto.DeathKnightMajorGlyph_GlyphOfVampiricBlood),
Major2: int32(proto.DeathKnightMajorGlyph_GlyphOfDancingRuneWeapon),
Major3: int32(proto.DeathKnightMajorGlyph_GlyphOfBoneShield),
Expand Down Expand Up @@ -109,9 +102,6 @@ func getTestPlayerBloodDk() *proto.Player {
func getTestPlayerFeralCat() *proto.Player {
var StandardTalents = "-2320322312012121202301-020301"
var StandardGlyphs = &proto.Glyphs{
Prime1: int32(proto.DruidPrimeGlyph_GlyphOfRip),
Prime2: int32(proto.DruidPrimeGlyph_GlyphOfBloodletting),
Prime3: int32(proto.DruidPrimeGlyph_GlyphOfBerserk),
Major1: int32(proto.DruidMajorGlyph_GlyphOfThorns),
Major2: int32(proto.DruidMajorGlyph_GlyphOfFeralCharge),
Major3: int32(proto.DruidMajorGlyph_GlyphOfRebirth),
Expand Down
7 changes: 2 additions & 5 deletions sim/core/character.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ type Character struct {

professions [2]proto.Profession

glyphs [9]int32
glyphs [6]int32
PrimaryTalentTree uint8

// Used for effects like "Increased Armor Value from Items"
Expand Down Expand Up @@ -136,10 +136,7 @@ func NewCharacter(party *Party, partyIndex int, player *proto.Player) Character
character.Label = fmt.Sprintf("%s (#%d)", character.Name, character.Index+1)

if player.Glyphs != nil {
character.glyphs = [9]int32{
player.Glyphs.Prime1,
player.Glyphs.Prime2,
player.Glyphs.Prime3,
character.glyphs = [6]int32{
player.Glyphs.Major1,
player.Glyphs.Major2,
player.Glyphs.Major3,
Expand Down
0 sim/core/simsignals/api_test.go → sim/core/simsignals/_api_test.go
View file
Open in desktop
File renamed without changes.
0 sim/death_knight/anti_magic_shell.go → sim/death_knight/_anti_magic_shell.go
View file
Open in desktop
File renamed without changes.
0 sim/death_knight/army_of_the_dead.go → sim/death_knight/_army_of_the_dead.go
View file
Open in desktop
File renamed without changes.
0 sim/death_knight/blood_boil.go → sim/death_knight/_blood_boil.go
View file
Open in desktop
File renamed without changes.
Loading
Loading