[DBC] adjust expectedstatmod for fated raids

simulationcraft · Apr 27, 2024 · fa5dff7 · fa5dff7
1 parent d20f0f1
commit fa5dff7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/dbc_extract3/dbc/filter.py b/dbc_extract3/dbc/filter.py
@@ -820,7 +820,16 @@ def _filter(self, **kwargs):
 
         for c in self.db('MapDifficulty').values():
             if c.id_parent == map_id:
-                content_ids.append([c.id_content_tuning, c.difficulty])
+                id_ct = c.id_content_tuning
+
+                # check ConditionalContentTuning.db2 for fated redirects
+                for cct in self.db('ConditionalContentTuning').values():
+                    if cct.flag == 8 and cct.id_parent == id_ct:
+                        id_ct = cct.id_content_tuning
+                        break
+
+                content_ids.append([id_ct, c.difficulty])
+
             # NOTE: so far M+ content tuning ID has always been 1279, but we calculate it out just in case
             # item context 16 is for M+ dungeons
             elif len(dungeon_id) == 0 and c.item_context == 16 and c.parent_record().id_expansion == xpac:

diff --git a/dbc_extract3/formats/10.2.6.53840.json b/dbc_extract3/formats/10.2.6.53840.json
@@ -195,6 +195,14 @@
       { "data_type": "I", "field": "id_mastery", "elements": 2, "formats": { "cpp": "%6u" }, "ref": "SpellName" }
     ]
   },
+  "ConditionalContentTuning": {
+    "parent": "ContentTuning",
+    "fields": [
+      { "data_type": "i", "field": "index" },
+      { "data_type": "i", "field": "id_content_tuning", "ref": "ContentTuning" },
+      { "data_type": "i", "field": "flag" }
+    ]
+  },
   "ContentTuning": {
     "fields": [
       { "data_type": "i", "field": "flags" },
@@ -207,7 +215,8 @@
       { "data_type": "i", "field": "target_level_delta_max" },
       { "data_type": "i", "field": "target_level_min" },
       { "data_type": "i", "field": "target_level_max" },
-      { "data_type": "i", "field": "item_level_min" }
+      { "data_type": "i", "field": "item_level_min" },
+      { "data_type": "f", "field": "quest_xp_mult" }
     ]
   },
   "ContentTuningXExpected": {
@@ -1025,7 +1034,7 @@
       { "data_type": "i", "field": "item_context" },
       { "data_type": "i", "field": "item_context_picker_id" },
       { "data_type": "i", "field": "flags" },
-      { "data_type": "i", "field": "id_content_tuning" }
+      { "data_type": "i", "field": "id_content_tuning", "ref": "ContentTuning" }
     ]
   },
   "MCRSlotXMCRCategory": {