data update

Bloodmallet · Oct 26, 2024 · 738d980 · 738d980
1 parent d1bd81c
commit 738d980
Show file tree

Hide file tree

Showing 41 changed files with 55 additions and 39 deletions.
diff --git a/simc_support/game_data/Instance.py b/simc_support/game_data/Instance.py
@@ -78,6 +78,9 @@ class Instance(int, enum.Enum):
     AMIRDRASSIL_THE_DREAMS_HOPE = 1207
     NERUBAR_PALACE = 1273
 
+    ## event raids
+    BLACKROCK_DEPTHS_EVENT = 1301
+
 
 class RaidTier(int, enum.Enum):
     UNKNOWN = enum.auto()
@@ -104,6 +107,9 @@ def get_raid_tier_from_encounter_id(encounter_id: int) -> "RaidTier":
             # Nerub-ar Palace
             2607,  # Ulgrax the Devourer
             2611,  # The Bloodbound Horror
+            # Blackrock Depths (event)
+            2663,  # Lord Roccor
+            2664,  # Bael'Gar
         ):
             return RaidTier.LOW
         elif encounter_id in (
@@ -118,6 +124,9 @@ def get_raid_tier_from_encounter_id(encounter_id: int) -> "RaidTier":
             # Nerub-ar Palace
             2599,  # Sikran, Captain of the Sureki
             2609,  # Rasha'nan
+            # Blackrock Depths (event)
+            2666,  # Golem Lord Argelmach
+            2667,  # The Seven
         ):
             return RaidTier.MID
         elif encounter_id in (
@@ -133,6 +142,9 @@ def get_raid_tier_from_encounter_id(encounter_id: int) -> "RaidTier":
             # Nerub-ar Palace
             2612,  # Broodtwister Ovi'nax
             2601,  # Nexus-Princess Ky'veza
+            # Blackrock Depths (event)
+            2669,  # Ambassador Flamelash
+            2668,  # General Angerforge
         ):
             return RaidTier.HIGH
         elif encounter_id in (
@@ -145,6 +157,8 @@ def get_raid_tier_from_encounter_id(encounter_id: int) -> "RaidTier":
             # Nerub-ar Palace
             2608,  # The Silken Court
             2602,  # Queen Ansurek
+            # Blackrock Depths (event)
+            2670,  # Emperor Dagran Thaurissan
         ):
             return RaidTier.HIGHER
         return RaidTier.UNKNOWN
diff --git a/simc_support/game_data/Season.py b/simc_support/game_data/Season.py
@@ -98,6 +98,7 @@ def get_seasons_from_instance(
             Instance.GRIM_BATOL,
             # raids
             Instance.NERUBAR_PALACE,
+            Instance.BLACKROCK_DEPTHS_EVENT,
         )
 
         if instance in tww_s1_instances:

diff --git a/simc_support/game_data/Trinket.py b/simc_support/game_data/Trinket.py
@@ -548,6 +548,7 @@ def raid_tier(self) -> typing.Optional[RaidTier]:
             Instance.ABERUS_THE_SHADOWED_CRUCIBLE,
             Instance.AMIRDRASSIL_THE_DREAMS_HOPE,
             Instance.NERUBAR_PALACE,
+            Instance.BLACKROCK_DEPTHS_EVENT,
         ):
             return None
 

diff --git a/simc_support/game_data/data_files/trees/death_knight_blood.json b/simc_support/game_data/data_files/trees/death_knight_blood.json
diff --git a/simc_support/game_data/data_files/trees/death_knight_frost.json b/simc_support/game_data/data_files/trees/death_knight_frost.json
diff --git a/simc_support/game_data/data_files/trees/demon_hunter_havoc.json b/simc_support/game_data/data_files/trees/demon_hunter_havoc.json
diff --git a/simc_support/game_data/data_files/trees/demon_hunter_vengeance.json b/simc_support/game_data/data_files/trees/demon_hunter_vengeance.json
diff --git a/simc_support/game_data/data_files/trees/druid_balance.json b/simc_support/game_data/data_files/trees/druid_balance.json
diff --git a/simc_support/game_data/data_files/trees/druid_feral.json b/simc_support/game_data/data_files/trees/druid_feral.json
diff --git a/simc_support/game_data/data_files/trees/druid_guardian.json b/simc_support/game_data/data_files/trees/druid_guardian.json
diff --git a/simc_support/game_data/data_files/trees/druid_restoration.json b/simc_support/game_data/data_files/trees/druid_restoration.json
diff --git a/simc_support/game_data/data_files/trees/evoker_augmentation.json b/simc_support/game_data/data_files/trees/evoker_augmentation.json
diff --git a/simc_support/game_data/data_files/trees/evoker_devastation.json b/simc_support/game_data/data_files/trees/evoker_devastation.json
diff --git a/simc_support/game_data/data_files/trees/evoker_preservation.json b/simc_support/game_data/data_files/trees/evoker_preservation.json
diff --git a/simc_support/game_data/data_files/trees/hunter_beast_mastery.json b/simc_support/game_data/data_files/trees/hunter_beast_mastery.json
diff --git a/simc_support/game_data/data_files/trees/hunter_marksmanship.json b/simc_support/game_data/data_files/trees/hunter_marksmanship.json
diff --git a/simc_support/game_data/data_files/trees/hunter_survival.json b/simc_support/game_data/data_files/trees/hunter_survival.json
diff --git a/simc_support/game_data/data_files/trees/mage_arcane.json b/simc_support/game_data/data_files/trees/mage_arcane.json
diff --git a/simc_support/game_data/data_files/trees/mage_fire.json b/simc_support/game_data/data_files/trees/mage_fire.json
diff --git a/simc_support/game_data/data_files/trees/mage_frost.json b/simc_support/game_data/data_files/trees/mage_frost.json
diff --git a/simc_support/game_data/data_files/trees/monk_brewmaster.json b/simc_support/game_data/data_files/trees/monk_brewmaster.json
diff --git a/simc_support/game_data/data_files/trees/monk_mistweaver.json b/simc_support/game_data/data_files/trees/monk_mistweaver.json
diff --git a/simc_support/game_data/data_files/trees/monk_windwalker.json b/simc_support/game_data/data_files/trees/monk_windwalker.json
diff --git a/simc_support/game_data/data_files/trees/paladin_holy.json b/simc_support/game_data/data_files/trees/paladin_holy.json
diff --git a/simc_support/game_data/data_files/trees/paladin_protection.json b/simc_support/game_data/data_files/trees/paladin_protection.json
diff --git a/simc_support/game_data/data_files/trees/paladin_retribution.json b/simc_support/game_data/data_files/trees/paladin_retribution.json
diff --git a/simc_support/game_data/data_files/trees/priest_discipline.json b/simc_support/game_data/data_files/trees/priest_discipline.json
diff --git a/simc_support/game_data/data_files/trees/priest_holy.json b/simc_support/game_data/data_files/trees/priest_holy.json
diff --git a/simc_support/game_data/data_files/trees/raw_raidbots_talent_information.json b/simc_support/game_data/data_files/trees/raw_raidbots_talent_information.json
diff --git a/simc_support/game_data/data_files/trees/rogue_assassination.json b/simc_support/game_data/data_files/trees/rogue_assassination.json
diff --git a/simc_support/game_data/data_files/trees/rogue_outlaw.json b/simc_support/game_data/data_files/trees/rogue_outlaw.json
diff --git a/simc_support/game_data/data_files/trees/rogue_subtlety.json b/simc_support/game_data/data_files/trees/rogue_subtlety.json
diff --git a/simc_support/game_data/data_files/trees/shaman_elemental.json b/simc_support/game_data/data_files/trees/shaman_elemental.json
diff --git a/simc_support/game_data/data_files/trees/shaman_enhancement.json b/simc_support/game_data/data_files/trees/shaman_enhancement.json
diff --git a/simc_support/game_data/data_files/trees/shaman_restoration.json b/simc_support/game_data/data_files/trees/shaman_restoration.json
diff --git a/simc_support/game_data/data_files/trees/warlock_affliction.json b/simc_support/game_data/data_files/trees/warlock_affliction.json
diff --git a/simc_support/game_data/data_files/trees/warrior_arms.json b/simc_support/game_data/data_files/trees/warrior_arms.json
diff --git a/simc_support/game_data/data_files/trees/warrior_fury.json b/simc_support/game_data/data_files/trees/warrior_fury.json
diff --git a/simc_support/game_data/data_files/trees/warrior_protection.json b/simc_support/game_data/data_files/trees/warrior_protection.json
diff --git a/simc_support/game_data/data_files/trinkets.json b/simc_support/game_data/data_files/trinkets.json
diff --git a/simc_support/update/trinkets.py b/simc_support/update/trinkets.py
@@ -141,11 +141,11 @@ def combine_into_json(self, data: typing.Dict[str, LOCALE_TABLES]) -> None:
             if isinstance(effect["id_parent"], int):
                 if effect["id_parent"] in itemxitemeffects:
                     itemxitemeffects[effect["id_parent"]].append(
-                        itemeffects[effect["id_item_effect"]][0]
+                        itemeffects.get(effect["id_item_effect"], [-1])[0]
                     )
                 else:
                     itemxitemeffects[effect["id_parent"]] = [
-                        itemeffects[effect["id_item_effect"]][0]
+                        itemeffects.get(effect["id_item_effect"], [-1])[0]
                     ]
 
         logger.info("id_dict: JournalEncounterItem")