Skip to content

Commit

Permalink
Merge pull request #7 from FelixPflaum/core-proto-cleanup
Browse files Browse the repository at this point in the history 
Remove runes and SoD proto values from core and UI
  • Loading branch information
@ericbtaylorjr
ericbtaylorjr authored Nov 21, 2024
2 parents 3dc3731 + ca318a4 commit 39a9c1a
Show file tree
Hide file tree
Showing 139 changed files with 1,464 additions and 4,329 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
7 changes: 2 additions & 5 deletions assets/database/db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8740,8 +8740,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":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":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":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 @@ -8843,8 +8843,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":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":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":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 Expand Up @@ -13044,7 +13044,6 @@
{"id":409552,"name":"Explosive Shot","icon":"ability_hunter_explosiveshot","requiresLevel":1,"hasBuff":true},
{"id":409554,"name":"Explosive Shot","icon":"ability_hunter_explosiveshot","requiresLevel":1,"hasBuff":true},
{"id":409580,"name":"Heart of the Lion","icon":"ability_hunter_pet_cat","requiresLevel":1,"hasBuff":true},
{"id":409583,"name":"Heart of the Lion","icon":"ability_hunter_pet_cat","requiresLevel":1,"hasBuff":true},
{"id":409593,"name":"Kill Shot","icon":"ability_hunter_assassinate2","requiresLevel":1},
{"id":409691,"name":"Raptor Strike","icon":"ability_meleedamage","requiresLevel":1},
{"id":409693,"name":"Raptor Strike","icon":"ability_meleedamage","requiresLevel":8},
Expand Down Expand Up @@ -13122,7 +13121,6 @@
{"id":415071,"name":"Exorcism","icon":"spell_holy_excorcism_02","requiresLevel":44},
{"id":415072,"name":"Exorcism","icon":"spell_holy_excorcism_02","requiresLevel":52},
{"id":415073,"name":"Exorcism","icon":"spell_holy_excorcism_02","requiresLevel":60},
{"id":415105,"name":"Power Surge","icon":"inv_misc_orb_05","requiresLevel":1,"hasBuff":true},
{"id":415236,"name":"Healing Rain","icon":"spell_nature_tranquility","hasBuff":true},
{"id":415242,"name":"Healing Rain","icon":"spell_nature_tranquility","requiresLevel":1},
{"id":415320,"name":"Flanking Strike","icon":"ability_hunter_harass","requiresLevel":1,"hasBuff":true},
Expand Down Expand Up @@ -13333,7 +13331,6 @@
{"id":440492,"name":"Engrave Cloak - Fresh Meat","icon":"inv_misc_cape_20","requiresLevel":1},
{"id":440494,"name":"Engrave Cloak - Sudden Death","icon":"inv_misc_cape_20","requiresLevel":1},
{"id":440496,"name":"Engrave Cloak - Shockwave","icon":"inv_misc_cape_20","requiresLevel":1},
{"id":440520,"name":"Improved Volley","icon":"ability_hunter_focusedaim","requiresLevel":1},
{"id":440677,"name":"Righteous Vengeance","icon":"ability_paladin_righteousvengeance","requiresLevel":1},
{"id":440802,"name":"Frozen Orb","icon":"spell_frost_frozencore","requiresLevel":1},
{"id":440809,"name":"Frozen Orb","icon":"spell_frost_frozencore","requiresLevel":1,"hasBuff":true},
Expand Down
2 changes: 1 addition & 1 deletion assets/database/leftover_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1559,8 +1559,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":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":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":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
2 changes: 0 additions & 2 deletions assets/db_inputs/atlasloot_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5071,8 +5071,6 @@
],
"enchants":[
],
"runes":[
],
"zones":[
{"id":209,"name":"Shadowfang Keep","expansion":1},
{"id":491,"name":"Razorfen Kraul","expansion":1},
Expand Down
3 changes: 1 addition & 2 deletions proto/api.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ message Player {
double distance_from_target = 17;

// ISB Info
bool isb_using_shadowflame = 47;
double isb_sb_frequency = 41;
double isb_crit = 42;
int32 isb_warlocks = 43;
Expand All @@ -77,7 +76,7 @@ message Player {
ElementalShaman elemental_shaman = 33;
EnhancementShaman enhancement_shaman = 34;
RestorationShaman restoration_shaman = 35;
WardenShaman warden_shaman = 48;
WardenShaman warden_shaman = 47;
Warlock warlock = 36;
TankWarlock tank_warlock = 39;
Warrior warrior = 37;
Expand Down
17 changes: 9 additions & 8 deletions proto/apl.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ message APLAction {
}
}

// NextIndex: 75
// NextIndex: 74
message APLValue {
oneof value {
// Operators
Expand Down Expand Up @@ -112,7 +112,7 @@ message APLValue {
APLValueCurrentEnergy current_energy = 15;
APLValueCurrentComboPoints current_combo_points = 16;
APLValueTimeToEnergyTick time_to_energy_tick = 66;
APLValueEnergyThreshold energy_threshold = 73;
APLValueEnergyThreshold energy_threshold = 72;

// GCD values
APLValueGCDIsReady gcd_is_ready = 17;
Expand All @@ -129,7 +129,7 @@ message APLValue {
APLValueSpellTimeToReady spell_time_to_ready = 21;
APLValueSpellCastTime spell_cast_time = 35;
APLValueSpellTravelTime spell_travel_time = 37;
APLValueSpellInFlight spell_in_flight = 74;
APLValueSpellInFlight spell_in_flight = 73;
APLValueSpellCPM spell_cpm = 42;
APLValueSpellIsChanneling spell_is_channeling = 56;
APLValueSpellChanneledTicks spell_channeled_ticks = 57;
Expand All @@ -145,8 +145,8 @@ message APLValue {
APLValueAuraICDIsReadyWithReactionTime aura_icd_is_ready_with_reaction_time = 51;
APLValueAuraShouldRefresh aura_should_refresh = 43;

// Rune values
APLValueRuneIsEquipped rune_is_equipped = 69;
// Rune values TODO: remove once APLs for classes are updated
APLValueRuneIsEquipped rune_is_equipped = 74;

// Dot values
APLValueDotIsActive dot_is_active = 6;
Expand All @@ -170,9 +170,9 @@ message APLValue {
// Warlock
APLValueWarlockShouldRecastDrainSoul warlock_should_recast_drain_soul = 59;
APLValueWarlockShouldRefreshCorruption warlock_should_refresh_corruption = 60;
APLValueWarlockCurrentPetMana warlock_current_pet_mana = 70;
APLValueWarlockCurrentPetManaPercent warlock_current_pet_mana_percent = 71;
APLValueWarlockPetIsActive warlock_pet_is_active = 72;
APLValueWarlockCurrentPetMana warlock_current_pet_mana = 69;
APLValueWarlockCurrentPetManaPercent warlock_current_pet_mana_percent = 70;
APLValueWarlockPetIsActive warlock_pet_is_active = 71;
// Paladin
APLValueCurrentSealRemainingTime current_seal_remaining_time = 65;
}
Expand Down Expand Up @@ -489,6 +489,7 @@ message APLValueAuraShouldRefresh {
APLValue max_overlap = 3;
}

// TODO: remove once APLs for classes are updated
message APLValueRuneIsEquipped {
ActionID rune_id = 1;
}
Expand Down
Loading

0 comments on commit 39a9c1a

Please sign in to comment.