Skip to content

Commit

Permalink
Merge pull request #35 from TheBackstabi/master
Browse files Browse the repository at this point in the history 
Add Phase Filtering and Individual Raid Filter Options
  • Loading branch information
@sanguinerarogue
sanguinerarogue authored Dec 7, 2024
2 parents b22ad57 + 662765a commit baf03e2
Show file tree
Hide file tree
Showing 14 changed files with 2,096 additions and 1,896 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
3,315 changes: 1,665 additions & 1,650 deletions assets/database/db.json
View file

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
View file
Binary file not shown.
29 changes: 4 additions & 25 deletions assets/database/leftover_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1406,35 +1406,14 @@
{"id":22280,"name":"Lovely Purple Dress","icon":"inv_chest_cloth_17","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"sources":[{"quest":{"id":9029,"name":"A Bubbling Cauldron"}}]},
{"id":22281,"name":"Blue Dinner Suit","icon":"inv_shirt_blue_01","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"sources":[{"quest":{"id":9029,"name":"A Bubbling Cauldron"}}]},
{"id":22282,"name":"Purple Dinner Suit","icon":"inv_shirt_purple_01","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"sources":[{"quest":{"id":9029,"name":"A Bubbling Cauldron"}}]},
{"id":22679,"phase":6},
{"id":22742,"name":"Bloodsail Shirt","icon":"inv_shirt_08","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"sources":[{"drop":{"npcId":22746}},{"rep":{"repFactionId":87,"repLevel":5}}]},
{"id":22744,"name":"Bloodsail Boots","icon":"inv_boots_05","type":10,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"sources":[{"drop":{"npcId":22746}}]},
{"id":22745,"name":"Bloodsail Pants","icon":"inv_pants_cloth_02","type":9,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"sources":[{"drop":{"npcId":22746}},{"rep":{"repFactionId":87,"repLevel":5}}]},
{"id":23323,"name":"Crown of the Fire Festival","icon":"inv_helmet_08","type":1,"armorType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1},
{"id":23324,"name":"Mantle of the Fire Festival","icon":"inv_shoulder_23","type":3,"armorType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"sources":[{"quest":{"id":9323,"name":"Wild Fires in the Eastern Kingdoms"}}]},
{"id":23714,"name":"Perpetual Purple Firework","icon":"inv_misc_missilesmall_purple","type":12,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":20,"phase":1,"quality":1},
{"id":23716,"name":"Carved Ogre Idol","icon":"inv_misc_idol_01","type":12,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"unique":true},
{"id":213343,"sources":[{"quest":{"id":80324,"name":"The Mad King"}},{"quest":{"id":80325,"name":"The Mad King"}}]},
{"id":213344,"sources":[{"quest":{"id":80324,"name":"The Mad King"}},{"quest":{"id":80325,"name":"The Mad King"}}]},
{"id":213345,"sources":[{"quest":{"id":80324,"name":"The Mad King"}},{"quest":{"id":80325,"name":"The Mad King"}}]},
{"id":213346,"sources":[{"quest":{"id":80324,"name":"The Mad King"}},{"quest":{"id":80325,"name":"The Mad King"}}]},
{"id":217245,"sources":[{"crafted":{"profession":11,"spellId":439085}}]},
{"id":217246,"sources":[{"crafted":{"profession":11,"spellId":439086}}]},
{"id":217252,"sources":[{"crafted":{"profession":11,"spellId":439094}}]},
{"id":217257,"sources":[{"crafted":{"profession":11,"spellId":439102}}]},
{"id":217259,"sources":[{"crafted":{"profession":8,"spellId":439105}}]},
{"id":217261,"sources":[{"crafted":{"profession":8,"spellId":439108}}]},
{"id":217268,"sources":[{"crafted":{"profession":8,"spellId":439116}}]},
{"id":217270,"sources":[{"crafted":{"profession":8,"spellId":439118}}]},
{"id":217277,"sources":[{"crafted":{"profession":2,"spellId":439124}}]},
{"id":217279,"sources":[{"crafted":{"profession":2,"spellId":439126}}]},
{"id":217285,"sources":[{"crafted":{"profession":2,"spellId":439132}}]},
{"id":220626,"sources":[{"quest":{"id":82081,"name":"A Broken Ritual"}},{"quest":{"id":82083,"name":"A Broken Ritual"}}]},
{"id":220627,"sources":[{"quest":{"id":82081,"name":"A Broken Ritual"}},{"quest":{"id":82083,"name":"A Broken Ritual"}}]},
{"id":220628,"sources":[{"quest":{"id":82081,"name":"A Broken Ritual"}},{"quest":{"id":82083,"name":"A Broken Ritual"}}]},
{"id":220629,"sources":[{"quest":{"id":82081,"name":"A Broken Ritual"}},{"quest":{"id":82083,"name":"A Broken Ritual"}}]},
{"id":220630,"sources":[{"quest":{"id":82081,"name":"A Broken Ritual"}},{"quest":{"id":82083,"name":"A Broken Ritual"}}]},
{"id":221457,"rangedWeaponType":5},
{"id":221464,"rangedWeaponType":7}
{"id":23716,"name":"Carved Ogre Idol","icon":"inv_misc_idol_01","type":12,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"phase":1,"quality":1,"unique":true}
],
"randomSuffixes":[
],
Expand All @@ -1456,8 +1435,8 @@
{"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down Expand Up @@ -1559,8 +1538,8 @@
{"effectId":1893,"spellId":20028,"name":"Enchant Chest - Major Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1894,"spellId":20029,"name":"Enchant Weapon - Icy Chill","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1896,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1897,"spellId":20031,"name":"Enchant Weapon - Superior Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":1897,"spellId":20031,"name":"Enchant Weapon - Superior Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1898,"spellId":20032,"name":"Enchant Weapon - Lifestealing","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":1899,"spellId":20033,"name":"Enchant Weapon - Unholy Weapon","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1900,"spellId":20034,"name":"Enchant Weapon - Crusader","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down
13 changes: 3 additions & 10 deletions proto/ui.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,11 @@ enum DungeonFilterOption {
}

enum RaidFilterOption {
RaidUnknown = 0;
RaidBlackfathomDeeps = 719;
RaidGnomeregan = 721;
RaidSunkenTemple = 1477;
RaidUnknown = 0;
RaidMoltenCore = 2717;
RaidOnyxiasLair = 2159;
RaidBlackwingLair = 2677;
RaidZulGurub = 1977;
RaidZulGurub = 1977;
RaidRuinsOfAQ = 3428;
RaidTempleOfAQ = 3429;
RaidNaxxramas = 3456;
Expand All @@ -235,11 +233,6 @@ enum RaidFilterOption {
// Zones not yet available to players
enum ExcludedZones {
ZoneUnknown = 0;
// ZoneZulGurub = 1977;
// ZoneBlackwingLair = 2677;
// ZoneRuinsOfAQ = 3428;
// ZoneTempleOfAQ = 3429;
ZoneNaxxramas = 3456;
}

// Next tag: 23
Expand Down
14 changes: 14 additions & 0 deletions sim/warlock/dps/TestWarlockDSRuin.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ dps_results: {
tps: 970.72577
}
}
dps_results: {
key: "TestWarlockDSRuin-Phase1-AllItems-DeathmistRaiment"
value: {
dps: 861.87319
tps: 922.49357
}
}
dps_results: {
key: "TestWarlockDSRuin-Phase1-AllItems-Demoniac'sThreads"
value: {
Expand Down Expand Up @@ -145,6 +152,13 @@ dps_results: {
tps: 982.8502
}
}
dps_results: {
key: "TestWarlockDSRuin-Phase1-AllItems-PlagueheartRaiment"
value: {
dps: 1007.47674
tps: 1069.18079
}
}
dps_results: {
key: "TestWarlockDSRuin-Phase1-AllItems-Warlord'sThreads"
value: {
Expand Down
14 changes: 14 additions & 0 deletions sim/warlock/dps/TestWarlockSMRuin.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ dps_results: {
tps: 954.62077
}
}
dps_results: {
key: "TestWarlockSMRuin-Phase1-AllItems-DeathmistRaiment"
value: {
dps: 1080.97179
tps: 903.66134
}
}
dps_results: {
key: "TestWarlockSMRuin-Phase1-AllItems-Demoniac'sThreads"
value: {
Expand Down Expand Up @@ -145,6 +152,13 @@ dps_results: {
tps: 961.2941
}
}
dps_results: {
key: "TestWarlockSMRuin-Phase1-AllItems-PlagueheartRaiment"
value: {
dps: 1235.01715
tps: 1049.06851
}
}
dps_results: {
key: "TestWarlockSMRuin-Phase1-AllItems-Warlord'sThreads"
value: {
Expand Down
Loading

0 comments on commit baf03e2

Please sign in to comment.