diff --git a/resources/bozja_encounters.ts b/resources/bozja_encounters.ts
index 6fa8cf6a48..2bbb9ac724 100644
--- a/resources/bozja_encounters.ts
+++ b/resources/bozja_encounters.ts
@@ -132,7 +132,7 @@ const data: CeInfoType = {
       'en': 'The Fires of War',
       'fr': 'Brasier de guerre',
       'ja': '炎獣使い「火焔百人隊」',
-      'ko': '화염마수 조련사 \'화염백인대\'',
+      'ko': '화염마수조련사 \'화염백인대\'',
       'tc': '炎獸訓練師——火焰百夫隊',
     },
   },
diff --git a/resources/content_type.ts b/resources/content_type.ts
index 4ef744a5bf..0caeb6e607 100644
--- a/resources/content_type.ts
+++ b/resources/content_type.ts
@@ -41,6 +41,7 @@ const data = {
   'UltimateRaids': 28,
   'VCDungeonFinder': 30,
   'WondrousTails': 24,
+  'xbm': 40,
 } as const;
 
 export default data;
diff --git a/resources/effect_id.ts b/resources/effect_id.ts
index 377161d808..80ffd9163a 100644
--- a/resources/effect_id.ts
+++ b/resources/effect_id.ts
@@ -110,6 +110,10 @@ const data = {
   'AlexandrianBarrier': '12E8',
   'AlexandrianSwiftdodge': '12EA',
   'AlexandrianSwiftstep': '12EB',
+  'AllEvens': '141C',
+  'AllOdds': '141D',
+  'AllPrime': '141E',
+  'AllThree': '141F',
   'AllaganField': '1C6',
   'AllaganImmunity': '14E',
   'AllaganRot': '14D',
@@ -141,8 +145,13 @@ const data = {
   'AnotherVictim': '2EE',
   'Anthropomorph': '2FE',
   'AntiCoagulant': '3EC',
+  'Antiblind': '12F4',
   'Antibody': '19A',
   'Anticipation': '4AA',
+  'Antiparalysis': '12F3',
+  'Antipetrification': '12F5',
+  'Antipoison': '12F2',
+  'Antisleep': '12F6',
   'Apathetic_5C0': '5C0',
   'Apathetic_69F': '69F',
   'ApexBlades': 'EDC',
@@ -191,6 +200,8 @@ const data = {
   'ArtificiallyEnhanced_6E4': '6E4',
   'ArtificiallyEnhanced_6E5': '6E5',
   'Ascended': 'E02',
+  'AshKinship_1201': '1201',
+  'AshKinship_122B': '122B',
   'Ashen': '56C',
   'AspectedBenefic': '343',
   'AspectedHelios': '344',
@@ -202,6 +213,7 @@ const data = {
   'Assassinated': '522',
   'Assimilated': '42D',
   'Assimilation': '42C',
+  'AstralAscendancy': '144E',
   'AstralAttenuation': '849',
   'AstralCloak': '6B0',
   'AstralEffect': '8BE',
@@ -305,7 +317,10 @@ const data = {
   'BattleLitany_586': '586',
   'BattleVoice': '8D',
   'BattlesClangor': '109C',
+  'BeastKinship_11FA': '11FA',
+  'BeastKinship_1224': '1224',
   'BeastkingsBoon': '482',
+  'Beastskin': '120D',
   'Beckoned': '793',
   'BeckoningDark_EB3': 'EB3',
   'BeckoningDark_ED2': 'ED2',
@@ -335,6 +350,10 @@ const data = {
   'Bind_10F4': '10F4',
   'Bind_118': '118',
   'Bind_119E': '119E',
+  'Bind_1535': '1535',
+  'Bind_154F': '154F',
+  'Bind_15B3': '15B3',
+  'Bind_164E': '164E',
   'Bind_1C9': '1C9',
   'Bind_234': '234',
   'Bind_3DA': '3DA',
@@ -381,6 +400,7 @@ const data = {
   'BlastArrowReady_A84': 'A84',
   'BlastArrowReady_C46': 'C46',
   'BlazeSpikes_11E3': '11E3',
+  'BlazeSpikes_1559': '1559',
   'BlazeSpikes_C5': 'C5',
   'BlazingAramitama': '6EE',
   'BlazingBane': '12B7',
@@ -390,7 +410,9 @@ const data = {
   'Bleeding_111': '111',
   'Bleeding_140': '140',
   'Bleeding_153': '153',
+  'Bleeding_1542': '1542',
   'Bleeding_157': '157',
+  'Bleeding_157D': '157D',
   'Bleeding_282': '282',
   'Bleeding_283': '283',
   'Bleeding_3AC': '3AC',
@@ -418,13 +440,17 @@ const data = {
   'Blight_175': '175',
   'Blight_293': '293',
   'Blight_890': '890',
+  'BlindResistanceUp': '1360',
   'BlindToGrief': '8A1',
   'BlindToRage': '8A0',
+  'Blind_1505': '1505',
+  'Blind_150D': '150D',
   'Blind_23B': '23B',
   'Blind_440': '440',
   'Blind_5F4': '5F4',
   'Blind_DA6': 'DA6',
   'Blind_F': 'F',
+  'Blink': '12F1',
   'BlizzardCharged': '5CC',
   'Bloated_2BE': '2BE',
   'Bloated_708': '708',
@@ -492,8 +518,10 @@ const data = {
   'BracingSuds_CE9': 'CE9',
   'BrainRot': 'CD2',
   'BrandOfTheFallen': '429',
-  'BrandOfTheIreful': '27D',
-  'BrandOfTheSullen': '27C',
+  'BrandOfTheIreful_15A1': '15A1',
+  'BrandOfTheIreful_27D': '27D',
+  'BrandOfTheSullen_15A0': '15A0',
+  'BrandOfTheSullen_27C': '27C',
   'BraveNewWorld': '161',
   'Bravery': '117F',
   'BraveryL': '66E',
@@ -505,7 +533,8 @@ const data = {
   'BreathOfTheGorgon': 'CFF',
   'Breathless_595': '595',
   'Breathless_A70': 'A70',
-  'Briar': '1B4',
+  'Briar_1438': '1438',
+  'Briar_1B4': '1B4',
   'BrightPulse': 'E9C',
   'BrightwingedFortitude': 'A64',
   'BrightwingedFury': 'A68',
@@ -519,7 +548,8 @@ const data = {
   'BrinyMirror': '1B0',
   'BrinyVeil_1B1': '1B1',
   'BrinyVeil_1D3': '1D3',
-  'BroodRage': '174',
+  'BroodRage_1539': '1539',
+  'BroodRage_174': '174',
   'Brotherhood_4A1': '4A1',
   'Brotherhood_87E': '87E',
   'BrotherlyLove_136C': '136C',
@@ -550,6 +580,7 @@ const data = {
   'Burns_1197': '1197',
   'Burns_119F': '119F',
   'Burns_11C': '11C',
+  'Burns_1577': '1577',
   'Burns_1F7': '1F7',
   'Burns_212': '212',
   'Burns_26B': '26B',
@@ -597,6 +628,7 @@ const data = {
   'CallOfThePortal': 'CCC',
   'Camouflage': '728',
   'CandyCane': 'E3A',
+  'CapturingInterest': '1210',
   'CardDrawn': '33A',
   'CardHeld': '33C',
   'CarnalChill': '365',
@@ -689,6 +721,8 @@ const data = {
   'CloseCaloric': 'E05',
   'ClosedPosition_71F': '71F',
   'ClosedPosition_7EA': '7EA',
+  'CloudKinship_11FC': '11FC',
+  'CloudKinship_1226': '1226',
   'CloudyCaress': '10B8',
   'CloyingCondensation': '9E4',
   'CocoonOfThePenitent': '70F',
@@ -827,6 +861,7 @@ const data = {
   'CritterResistance_3D6': '3D6',
   'CritterVulnerability': '3CE',
   'CrownOfTheGorgon': 'D18',
+  'CrucibleItemPenalty': '12EF',
   'CrumblingBulwark': '64F',
   'Cryomania': '1076',
   'CrypticCommunications_14E4': '14E4',
@@ -857,6 +892,8 @@ const data = {
   'DamageDown_1112': '1112',
   'DamageDown_1113': '1113',
   'DamageDown_11A2': '11A2',
+  'DamageDown_130A': '130A',
+  'DamageDown_154B': '154B',
   'DamageDown_274': '274',
   'DamageDown_2B8': '2B8',
   'DamageDown_3E': '3E',
@@ -876,7 +913,11 @@ const data = {
   'DamageUp_11BA': '11BA',
   'DamageUp_122': '122',
   'DamageUp_12C': '12C',
+  'DamageUp_141B': '141B',
   'DamageUp_14C': '14C',
+  'DamageUp_150F': '150F',
+  'DamageUp_1521': '1521',
+  'DamageUp_154A': '154A',
   'DamageUp_193': '193',
   'DamageUp_1BB': '1BB',
   'DamageUp_1F9': '1F9',
@@ -1084,6 +1125,7 @@ const data = {
   'Doom_1440': '1440',
   'Doom_1441': '1441',
   'Doom_1443': '1443',
+  'Doom_152D': '152D',
   'Doom_1561': '1561',
   'Doom_38E': '38E',
   'Doom_6CA': '6CA',
@@ -1148,6 +1190,7 @@ const data = {
   'Dropsy_110': '110',
   'Dropsy_11B': '11B',
   'Dropsy_121': '121',
+  'Dropsy_1578': '1578',
   'Dropsy_1E5': '1E5',
   'Dropsy_213': '213',
   'Dropsy_6C8': '6C8',
@@ -1173,6 +1216,7 @@ const data = {
   'Duality': '316',
   'DuelOrDie': '9F1',
   'DuodmoniacBonds': 'DDF',
+  'DurantHeart': '11F5',
   'DustPoisoning': '197',
   'DutiesAsAssigned_1084': '1084',
   'DutiesAsAssigned_96F': '96F',
@@ -1180,10 +1224,12 @@ const data = {
   'DynamicFluid_641': '641',
   'EarthAndWater': '16F',
   'EarthAspected': 'B02',
+  'EarthResistanceDown': '13A1',
   'EarthResistanceDownIi_41D': '41D',
   'EarthResistanceDownIi_831': '831',
   'EarthResistanceDownIi_D2C': 'D2C',
-  'EarthResistanceUp': '20C',
+  'EarthResistanceUp_1389': '1389',
+  'EarthResistanceUp_20C': '20C',
   'EarthResonance': 'C63',
   'EarthborneEnd': '1127',
   'EarthenAccord': '30A',
@@ -1206,6 +1252,7 @@ const data = {
   'EerieAir': '1A9',
   'EggstremeEggAcuity': '1148',
   'Ekpyrosis': 'AB',
+  'EldritchHeart': '11F6',
   'ElectricalCharge': 'F8B',
   'ElectricalCondenser': 'F9F',
   'Electrified': '8B9',
@@ -1215,6 +1262,7 @@ const data = {
   'Electrocution_1198': '1198',
   'Electrocution_11E9': '11E9',
   'Electrocution_120': '120',
+  'Electrocution_157A': '157A',
   'Electrocution_215': '215',
   'Electrocution_29A': '29A',
   'Electrocution_530': '530',
@@ -1293,7 +1341,8 @@ const data = {
   'Enlarged_7B7': '7B7',
   'Enlarged_8E8': '8E8',
   'Enliven': '305',
-  'EnmityUp': 'D1E',
+  'EnmityUp_15D2': '15D2',
+  'EnmityUp_D1E': 'D1E',
   'Enochian': '364',
   'Enshielded': '76D',
   'Enshrouded_A21': 'A21',
@@ -1361,7 +1410,8 @@ const data = {
   'EwerHeld': '39C',
   'Exaltation': 'A9D',
   'ExcavatorReady': 'F19',
-  'Excellence': 'CE5',
+  'Excellence_1557': '1557',
+  'Excellence_CE5': 'CE5',
   'Excogitation_4C4': '4C4',
   'Excogitation_886': '886',
   'Executioner': 'F12',
@@ -1523,9 +1573,13 @@ const data = {
   'FireResistanceDownIi_832': '832',
   'FireResistanceDownIi_B56': 'B56',
   'FireResistanceDownIi_B79': 'B79',
+  'FireResistanceDown_139F': '139F',
+  'FireResistanceDown_14D8': '14D8',
   'FireResistanceDown_26D': '26D',
   'FireResistanceDown_29E': '29E',
   'FireResistanceUp_1167': '1167',
+  'FireResistanceUp_1385': '1385',
+  'FireResistanceUp_15AF': '15AF',
   'FireResistanceUp_208': '208',
   'FireResistanceUp_5ED': '5ED',
   'FireResonance': 'C62',
@@ -1658,6 +1712,7 @@ const data = {
   'FreezingCounter': '3B6',
   'FreezingUp_9EC': '9EC',
   'FreezingUp_DC3': 'DC3',
+  'Freezing_1439': '1439',
   'Freezing_8CB': '8CB',
   'Freezing_B53': 'B53',
   'Frenzied': '278',
@@ -1675,6 +1730,7 @@ const data = {
   'FrostBrand': '20F',
   'Frostbite_10C': '10C',
   'Frostbite_11D': '11D',
+  'Frostbite_157C': '157C',
   'Frostbite_217': '217',
   'Frostbite_25D': '25D',
   'Frostbite_6FC': '6FC',
@@ -1802,7 +1858,8 @@ const data = {
   'Grounded': '588',
   'GroupOriented': '698',
   'GrowingConception': 'D0E',
-  'GrowingDread': '1410',
+  'GrowingDread_1410': '1410',
+  'GrowingDread_143A': '143A',
   'GrowingPanic': '1411',
   'Growing_17F': '17F',
   'Growing_186': '186',
@@ -1818,6 +1875,7 @@ const data = {
   'GuardianWill': '11DE',
   'GuardiansAegis': '6D4',
   'GuardiansWill': 'EF6',
+  'GuerrillaTactics': '131D',
   'GuidedMissileKyriosIncoming_D60': 'D60',
   'GuidedMissileKyriosIncoming_DA7': 'DA7',
   'GuidedMissileKyriosIncoming_DA8': 'DA8',
@@ -1851,7 +1909,9 @@ const data = {
   'Harvest': '252',
   'Haste_1025': '1025',
   'Haste_126E': '126E',
+  'Haste_1362': '1362',
   'Haste_14A': '14A',
+  'Haste_150E': '150E',
   'Haste_1AC': '1AC',
   'Haste_1E0': '1E0',
   'Haste_28B': '28B',
@@ -1866,6 +1926,7 @@ const data = {
   'Hastilude_797': '797',
   'Hastilude_92E': '92E',
   'HastyMirage': '109F',
+  'HastySpirit': '12FA',
   'HatedOfEmbers': '8BC',
   'HatedOfFrost': '8D4',
   'HatedOfLevin': '8C5',
@@ -1924,6 +1985,8 @@ const data = {
   'HeavyThrust': '73',
   'Heavy_10F5': '10F5',
   'Heavy_13B4': '13B4',
+  'Heavy_1437': '1437',
+  'Heavy_14EC': '14EC',
   'Heavy_276': '276',
   'Heavy_453': '453',
   'Heavy_475': '475',
@@ -1974,7 +2037,7 @@ const data = {
   'Hidden_454': '454',
   'Hidden_524': '524',
   'Hidden_6A9': '6A9',
-  'Hide': '7A0',
+  'Hidden_7A0': '7A0',
   'Higanbana_4CC': '4CC',
   'Higanbana_527': '527',
   'HighAndMighty': '1D5',
@@ -1984,6 +2047,8 @@ const data = {
   'HighPoweredSniperCannonFodder': 'D62',
   'HighThunder_F1F': 'F1F',
   'HighThunder_F20': 'F20',
+  'HighWire_1513': '1513',
+  'HighWire_15BA': '15BA',
   'HighWire_3F4': '3F4',
   'HighWire_F79': 'F79',
   'Higi': 'F0A',
@@ -2084,9 +2149,11 @@ const data = {
   'IceConvergence': '4FC',
   'IceLoaded': 'E2B',
   'IceOoze': '115A',
-  'IceResistanceDown': '6A6',
   'IceResistanceDownIi_9A1': '9A1',
   'IceResistanceDownIi_B57': 'B57',
+  'IceResistanceDown_13A2': '13A2',
+  'IceResistanceDown_6A6': '6A6',
+  'IceResistanceUp_138A': '138A',
   'IceResistanceUp_20D': '20D',
   'IceResistanceUp_6E1': '6E1',
   'IceSpikes_51B': '51B',
@@ -2190,6 +2257,7 @@ const data = {
   'Inspiration': 'E69',
   'Intemperate': '8E3',
   'IntensifiedWailing': 'DEC',
+  'InterestCaptured': '1212',
   'InternalRelease': '64',
   'Intersection_761': '761',
   'Intersection_FC8': 'FC8',
@@ -2253,7 +2321,8 @@ const data = {
   'Kardion_B38': 'B38',
   'Kassatsu': '1F1',
   'Katabasis': 'A6E',
-  'KeenEdge': '479',
+  'KeenEdge_12F0': '12F0',
+  'KeenEdge_479': '479',
   'KeenFlurry': '72',
   'Kerachole': 'A3A',
   'Kerakeia': 'B7A',
@@ -2385,10 +2454,13 @@ const data = {
   'LightningResistanceDownIi_861': '861',
   'LightningResistanceDownIi_BB6': 'BB6',
   'LightningResistanceDown_1122': '1122',
+  'LightningResistanceDown_13A0': '13A0',
+  'LightningResistanceDown_15B0': '15B0',
   'LightningResistanceDown_240': '240',
   'LightningResistanceDown_382': '382',
   'LightningResistanceDown_943': '943',
-  'LightningResistanceUp': '20B',
+  'LightningResistanceUp_1388': '1388',
+  'LightningResistanceUp_20B': '20B',
   'LightningRod': 'A0E',
   'LightningShot': '958',
   'LightningWeakness': '14CC',
@@ -2402,6 +2474,12 @@ const data = {
   'Limp': '572',
   'LindwurmsPortent': '129D',
   'LingeringEchoes': 'CDC',
+  'LingeringVantage': '1206',
+  'LiquidConstitution': '12FF',
+  'LiquidEvasion': '12FE',
+  'LiquidIntensity': '12FD',
+  'LiquidMagic': '12FC',
+  'LiquidStrength': '12FB',
   'LiturgyOfTheBell': 'A95',
   'LiveBrazier': 'E17',
   'LiveCandle': 'E18',
@@ -2472,6 +2550,8 @@ const data = {
   'MagicBurst': '674',
   'MagicDamageDown_3A': '3A',
   'MagicDamageDown_79C': '79C',
+  'MagicDamageUp_139C': '139C',
+  'MagicDamageUp_14DC': '14DC',
   'MagicDamageUp_39': '39',
   'MagicDamageUp_3FB': '3FB',
   'MagicDamageUp_484': '484',
@@ -2485,12 +2565,15 @@ const data = {
   'MagicResistance_3AE': '3AE',
   'MagicResistance_E25': 'E25',
   'MagicShell': '12B4',
+  'MagicVulnerabilityDown_1364': '1364',
   'MagicVulnerabilityDown_14B': '14B',
+  'MagicVulnerabilityDown_1510': '1510',
   'MagicVulnerabilityDown_246': '246',
   'MagicVulnerabilityDown_258': '258',
   'MagicVulnerabilityDown_32C': '32C',
   'MagicVulnerabilityDown_3B': '3B',
   'MagicVulnerabilityDown_E37': 'E37',
+  'MagicVulnerabilityUp_143D': '143D',
   'MagicVulnerabilityUp_1EE': '1EE',
   'MagicVulnerabilityUp_292': '292',
   'MagicVulnerabilityUp_3C': '3C',
@@ -2657,6 +2740,7 @@ const data = {
   'Moonseal': '470',
   'Moonshadowed': '603',
   'MoonsporeSpurred': 'DB8',
+  'Moonstalker': '11F8',
   'MorbidMeal': '1272',
   'MoreThanSatisfied': '1278',
   'MortalAtonement': 'B51',
@@ -2733,6 +2817,7 @@ const data = {
   'Nectar': '39F',
   'NeedlePoised': '116B',
   'NeedleVeil': 'EA7',
+  'NeedlesOut': '1419',
   'NegativeCharge_11C8': '11C8',
   'NegativeCharge_12D6': '12D6',
   'NegativeCharge_12D8': '12D8',
@@ -2750,7 +2835,8 @@ const data = {
   'NeutralSect_7FC': '7FC',
   'NeutralSect_F94': 'F94',
   'NewMoon': '600',
-  'Nightmare': '1A7',
+  'Nightmare_1507': '1507',
+  'Nightmare_1A7': '1A7',
   'NineLives': 'F5B',
   'NoMercy_727': '727',
   'NoMercy_BE2': 'BE2',
@@ -2819,6 +2905,7 @@ const data = {
   'OnFire': '9F3',
   'OneMind': '9F9',
   'OneTwoMemory': 'FD0',
+  'OneWithNature': '11F9',
   'Onslaught': 'BD5',
   'OpoOpoForm': '6B',
   'Opposition': '757',
@@ -2865,12 +2952,16 @@ const data = {
   'ParadiseFound': '11E5',
   'ParadiseRegained': '7B6',
   'Paradox': 'C97',
+  'ParalysisResistanceUp': '135E',
   'Paralysis_11': '11',
+  'Paralysis_1506': '1506',
+  'Paralysis_150C': '150C',
   'Paralysis_1E2': '1E2',
   'Paralysis_3DC': '3DC',
   'Paralysis_D8': 'D8',
   'Paralysis_D87': 'D87',
   'Paralysis_F7B': 'F7B',
+  'ParalyzingSpikes': '153A',
   'Partygoer': 'B01',
   'PassageOfArms': '497',
   'Passenger': '45E',
@@ -2899,8 +2990,10 @@ const data = {
   'PerformanceDebugger': 'D69',
   'PerpetualConflagration': '101A',
   'PetrificationResistance': '1C2',
+  'PetrificationResistanceUp': '135F',
   'Petrification_1': '1',
   'Petrification_115D': '115D',
+  'Petrification_131B': '131B',
   'Petrification_262': '262',
   'Petrification_5E7': '5E7',
   'Petrification_BBF': 'BBF',
@@ -2950,6 +3043,9 @@ const data = {
   'PhysicalDamageDown_119': '119',
   'PhysicalDamageDown_18B': '18B',
   'PhysicalDamageDown_36': '36',
+  'PhysicalDamageUp_139B': '139B',
+  'PhysicalDamageUp_14DB': '14DB',
+  'PhysicalDamageUp_1549': '1549',
   'PhysicalDamageUp_35': '35',
   'PhysicalDamageUp_3F9': '3F9',
   'PhysicalDamageUp_3FA': '3FA',
@@ -2957,12 +3053,15 @@ const data = {
   'PhysicalDamageUp_81A': '81A',
   'PhysicalDamageUp_9FB': '9FB',
   'PhysicalField': '154',
+  'PhysicalVulnerabilityDown_1363': '1363',
+  'PhysicalVulnerabilityDown_1511': '1511',
   'PhysicalVulnerabilityDown_247': '247',
   'PhysicalVulnerabilityDown_259': '259',
   'PhysicalVulnerabilityDown_37': '37',
   'PhysicalVulnerabilityDown_383': '383',
   'PhysicalVulnerabilityDown_E36': 'E36',
   'PhysicalVulnerabilityUp_1042': '1042',
+  'PhysicalVulnerabilityUp_143C': '143C',
   'PhysicalVulnerabilityUp_1ED': '1ED',
   'PhysicalVulnerabilityUp_291': '291',
   'PhysicalVulnerabilityUp_2B7': '2B7',
@@ -3000,8 +3099,11 @@ const data = {
   'PoisonL': '672',
   'PoisonNPop': 'F5E',
   'PoisonResistanceDownIi': 'F5F',
-  'PoisonResistanceUp': '280',
+  'PoisonResistanceUp_1361': '1361',
+  'PoisonResistanceUp_280': '280',
   'Poison_12': '12',
+  'Poison_1414': '1414',
+  'Poison_1415': '1415',
   'Poison_1531': '1531',
   'Poison_155D': '155D',
   'Poison_22F': '22F',
@@ -3022,6 +3124,7 @@ const data = {
   'PomMuse': '100D',
   'PomSketch': '101C',
   'Pombination': '1D6',
+  'PopotoSkin': '152F',
   'PoppetResistance_3CC': '3CC',
   'PoppetResistance_3D8': '3D8',
   'PoppetVulnerability': '3D0',
@@ -3167,6 +3270,7 @@ const data = {
   'Raise_474': '474',
   'Raise_94': '94',
   'Rampage': '117C',
+  'RampantHeart': '11F4',
   'Rampart_1048': '1048',
   'Rampart_47': '47',
   'Rampart_4A7': '4A7',
@@ -3208,7 +3312,8 @@ const data = {
   'Reassembled': '353',
   'Reawakened_E56': 'E56',
   'Reawakened_FFE': 'FFE',
-  'Recharge': '159',
+  'Recharge_151E': '151E',
+  'Recharge_159': '159',
   'Recitation_768': '768',
   'Recitation_C16': 'C16',
   'Reclaim': '104',
@@ -3240,6 +3345,7 @@ const data = {
   'Regen_9E': '9E',
   'Rehabilitation_105F': '105F',
   'Rehabilitation_117': '117',
+  'Rehabilitation_1512': '1512',
   'Rehabilitation_1DF': '1DF',
   'Rehabilitation_288': '288',
   'Rehabilitation_3DD': '3DD',
@@ -3275,7 +3381,8 @@ const data = {
   'Requiescat_558': '558',
   'Requiescat_559': '559',
   'RequisitionedMagitek': 'AB0',
-  'Reraise': '933',
+  'Reraise_12EE': '12EE',
+  'Reraise_933': '933',
   'Resilience': 'CB0',
   'Resin': '2A2',
   'ResonantArrowReady': 'F16',
@@ -3406,10 +3513,14 @@ const data = {
   'SaltsBane': 'BDE',
   'Salvage': '494',
   'Sanction': 'F5',
+  'Sandstill': '1306',
   'SaplingsCrown': '1273',
   'Satisfied': '1277',
   'ScaleFlakes': '1AD',
+  'ScaleKinship_11FF': '11FF',
+  'ScaleKinship_1229': '1229',
   'Scalebound': '5D7',
+  'Scaleskin': '120F',
   'ScarletFlame': 'C9F',
   'ScatteredWailing': 'DEB',
   'Schiltron': 'E2F',
@@ -3449,7 +3560,10 @@ const data = {
   'Seduced_E28': 'E28',
   'Seduced_E3': 'E3',
   'SeedCrystals': 'EE1',
+  'SeedKinship_11FD': '11FD',
+  'SeedKinship_1227': '1227',
   'SeedOfLife': '3F7',
+  'SeedsSown': '120E',
   'Seized_191': '191',
   'Seized_261': '261',
   'Seized_3C1': '3C1',
@@ -3587,6 +3701,7 @@ const data = {
   'SlashingResistanceDown_9CC': '9CC',
   'SlashingResistanceDown_C3A': 'C3A',
   'SlashingResistanceUp': '2D0',
+  'SleepResistanceUp': '135D',
   'SleepResistance_54A': '54A',
   'SleepResistance_7AF': '7AF',
   'Sleep_131E': '131E',
@@ -3614,6 +3729,8 @@ const data = {
   'Slipstream_C9A': 'C9A',
   'Slither': 'FFF',
   'SlowResistance': '548',
+  'Slow_1514': '1514',
+  'Slow_16AC': '16AC',
   'Slow_1AB': '1AB',
   'Slow_1BA': '1BA',
   'Slow_231': '231',
@@ -3628,6 +3745,7 @@ const data = {
   'Slow_DA5': 'DA5',
   'Sludge_10E': '10E',
   'Sludge_11F': '11F',
+  'Sludge_157B': '157B',
   'Sludge_216': '216',
   'Sludge_56A': '56A',
   'Sludge_825': '825',
@@ -3659,6 +3777,8 @@ const data = {
   'SomanouticBarrier': 'B1C',
   'SonicBreak': '72D',
   'Soteria': 'A32',
+  'SoulKinship_1200': '1200',
+  'SoulKinship_122A': '122A',
   'SoulOfDevotion': 'ABD',
   'SoulOfFire_6D7': '6D7',
   'SoulOfFire_6F7': '6F7',
@@ -3847,6 +3967,7 @@ const data = {
   'Stun_1151': '1151',
   'Stun_13B3': '13B3',
   'Stun_1523': '1523',
+  'Stun_16AB': '16AB',
   'Stun_2': '2',
   'Stun_53F': '53F',
   'Stun_5E9': '5E9',
@@ -3884,6 +4005,7 @@ const data = {
   'SunSign': 'F38',
   'SunderingWaters': '73E',
   'Sunseal': '46F',
+  'Sunstrider': '11F7',
   'Suntouched': 'F37',
   'SuperSprint': '422',
   'Superbolide': '72C',
@@ -3918,6 +4040,7 @@ const data = {
   'SustainedLightDamage': 'B55',
   'Swarmed': '1C0',
   'SweepingWaters': '73F',
+  'Swelling': '143E',
   'Sweltering': '1161',
   'Swift': '117D',
   'SwiftDeception': 'B8D',
@@ -4101,6 +4224,12 @@ const data = {
   'ThrillOfWar': '5B0',
   'Throttle_2BC': '2BC',
   'Throttle_3AA': '3AA',
+  'ThroughEarth': '1302',
+  'ThroughFire': '1300',
+  'ThroughIce': '1305',
+  'ThroughThunder': '1303',
+  'ThroughWater': '1301',
+  'ThroughWind': '1304',
   'ThrownForALoop': '192',
   'ThunderAlchemy': 'AC1',
   'ThunderCharged': '5CD',
@@ -4138,12 +4267,14 @@ const data = {
   'Toad_1B9': '1B9',
   'Toad_44D': '44D',
   'Toad_A6F': 'A6F',
+  'TokenBenefits': '12F8',
   'TopOfTheHive': '102F',
   'TorcleaverReady': '10C1',
   'TornadoEdict': '696',
   'TorrentialRuin': '9CE',
   'TouchOfDeath': '6A',
   'TouchOfFrost': '9BE',
+  'ToughSkin': '12F9',
   'TowerDefense_597': '597',
   'TowerDefense_598': '598',
   'ToxicAlchemy': 'AC2',
@@ -4151,6 +4282,10 @@ const data = {
   'ToxicMinerals': '115C',
   'Toxicosis_111B': '111B',
   'Toxicosis_122C': '122C',
+  'Toxicosis_143F': '143F',
+  'Toxicosis_150B': '150B',
+  'Toxicosis_15B1': '15B1',
+  'Toxicosis_15B2': '15B2',
   'Toxicosis_AAF': 'AAF',
   'Toxicosis_BB8': 'BB8',
   'Toxicosis_C09': 'C09',
@@ -4160,6 +4295,7 @@ const data = {
   'Toxicosis_F8E': 'F8E',
   'Toxikon': 'C29',
   'TpBleed': '14',
+  'Trailblazing': '1442',
   'TrainedPerfection': 'EE5',
   'Transcendent_1A2': '1A2',
   'Transcendent_A58': 'A58',
@@ -4232,6 +4368,7 @@ const data = {
   'TwistingViper': 'B92',
   'TwoSwipeMemory': 'FD5',
   'UltrosSimulation': '5D1',
+  'UmbralAscendancy': '144F',
   'UmbralAttenuation': '84A',
   'UmbralCloak': '6B1',
   'UmbralEffect': '8BF',
@@ -4271,6 +4408,7 @@ const data = {
   'UnrelentingCounter': '3BA',
   'Unsealed': '10F3',
   'UnsealedSeitonTenchu': 'C78',
+  'UnseenForce': '14DD',
   'UnshakableLoyalty': 'BC0',
   'Unstable': '8C9',
   'UnstableFactor': 'E09',
@@ -4315,6 +4453,9 @@ const data = {
   'VeteranTrade': '491',
   'Vigilance': '10B5',
   'Vigilant': 'F3E',
+  'VileKinship_11FB': '11FB',
+  'VileKinship_1225': '1225',
+  'Vileskin': '120C',
   'Virus_5D5': '5D5',
   'Virus_B6': 'B6',
   'ViscousAetheroplasm_171': '171',
@@ -4330,11 +4471,13 @@ const data = {
   'VoiceOfValor_133': '133',
   'Voidblood': '310',
   'Voidbound': '1D4',
+  'VolantHeart': '11F3',
   'VortexBarrier': 'BC4',
   'Vril': '50A',
   'VulnerabilityDown_1154': '1154',
   'VulnerabilityDown_135B': '135B',
   'VulnerabilityDown_14C6': '14C6',
+  'VulnerabilityDown_14DA': '14DA',
   'VulnerabilityDown_155B': '155B',
   'VulnerabilityDown_15E': '15E',
   'VulnerabilityDown_196': '196',
@@ -4388,18 +4531,24 @@ const data = {
   'Warmonger_94C': '94C',
   'WasteNot': 'FC',
   'WasteNotIi': '101',
-  'WaterResistanceDown': '1AF',
   'WaterResistanceDownIi_401': '401',
   'WaterResistanceDownIi_485': '485',
   'WaterResistanceDownIi_82E': '82E',
   'WaterResistanceDownIi_860': '860',
-  'WaterResistanceUp': '209',
+  'WaterResistanceDown_139D': '139D',
+  'WaterResistanceDown_14D9': '14D9',
+  'WaterResistanceDown_1AF': '1AF',
+  'WaterResistanceUp_1386': '1386',
+  'WaterResistanceUp_209': '209',
   'Watersnaking': '136F',
   'WateryGrave_12DD': '12DD',
   'WateryGrave_1E6': '1E6',
   'WateryGrave_6E8': '6E8',
+  'WaveKinship_11FE': '11FE',
+  'WaveKinship_1228': '1228',
   'Wavelength_116E': '116E',
   'Wavelength_116F': '116F',
+  'WaveringHeart': '1223',
   'WaxenFlesh': '15A',
   'WaxingNocturne': '6B6',
   'Waymark': '8C7',
@@ -4442,15 +4591,20 @@ const data = {
   'WindAspected': 'B04',
   'WindResistanceDownIi_41C': '41C',
   'WindResistanceDownIi_830': '830',
+  'WindResistanceDown_139E': '139E',
   'WindResistanceDown_2AD': '2AD',
   'WindResistanceDown_37E': '37E',
-  'WindResistanceUp': '20A',
+  'WindResistanceUp_1387': '1387',
+  'WindResistanceUp_20A': '20A',
   'WindResonance': '7D7',
   'WindWeakness': '14CD',
   'Windbite': '81',
   'WindborneEnd': '1128',
   'Windburn_10D': '10D',
   'Windburn_11E': '11E',
+  'Windburn_1310': '1310',
+  'Windburn_1508': '1508',
+  'Windburn_1579': '1579',
   'Windburn_214': '214',
   'Windburn_5E4': '5E4',
   'Windburn_6BB': '6BB',
@@ -4474,6 +4628,7 @@ const data = {
   'WingedShield': '76C',
   'Wingmark': '1162',
   'WingsOfTheRaptor': '3B3',
+  'WinnersKeepers': '12F7',
   'WisdomOfTheAetherweaver': '65F',
   'WisdomOfTheBreathtaker': '668',
   'WisdomOfTheDuelist': '6CC',
@@ -4490,6 +4645,8 @@ const data = {
   'WisdomOfTheWatcher': '665',
   'Withering': '531',
   'WithoutSin': '11D9',
+  'WitsEnd_141A': '141A',
+  'WitsEnd_1530': '1530',
   'Woken_5F9': '5F9',
   'Woken_637': '637',
   'WolfsHeartKit': '47D',
diff --git a/resources/north_horn_encounters.ts b/resources/north_horn_encounters.ts
index 943cc505d5..ae09da0d5b 100644
--- a/resources/north_horn_encounters.ts
+++ b/resources/north_horn_encounters.ts
@@ -150,7 +150,7 @@ const data: CeInfoType = {
   'TheForkedTowerMagic': {
     'directorId': '389',
     'name': {
-      'cn': '两岐塔 魔之塔',
+      'cn': '两歧塔 魔之塔',
       'de': 'Der Turm der Magie',
       'en': 'The Forked Tower: Magic',
       'fr': 'Tour fourchue de la Magie',
diff --git a/resources/pet_names.ts b/resources/pet_names.ts
index af90cf5b5d..d3fd8a5344 100644
--- a/resources/pet_names.ts
+++ b/resources/pet_names.ts
@@ -33,6 +33,56 @@ const data: PetData = {
     '琥珀宝石兽',
     '黑曜宝石兽',
     '烈日巴哈姆特',
+    '库西',
+    '松鼠',
+    '迷途羊羔',
+    '陆鱼',
+    '奥猴',
+    '渡渡鸟',
+    '矿爬虫',
+    '凶蛛蝎',
+    '巨型陆蟹',
+    '胡蜂',
+    '兀鹫',
+    '蔓德拉',
+    '死魂',
+    '跳蜥',
+    '壳蟹',
+    '螳螂',
+    '粘液怪',
+    '无头骑士',
+    '蝙蝠',
+    '陷阱草',
+    '席兹',
+    '仙人刺',
+    '巨像',
+    '碧企鹅',
+    '精金龟',
+    '大水牛',
+    '乌菊石',
+    '巨虫',
+    '魔石精',
+    '古菩猩猩',
+    '巨蟾蜍',
+    '蜂鸟',
+    '长须豹',
+    '盗龙',
+    '烈阳火蛟',
+    '树精',
+    '灵蚁',
+    '奇美拉',
+    '魔界花',
+    '幽灵',
+    '蝾螈',
+    '眼镜蛇',
+    '海德拉',
+    '灯心蜻蛉',
+    '腐坏古菩猩猩',
+    '祖',
+    '寒冰巨像',
+    '真红龙虾',
+    '大王花',
+    '贝希摩斯',
   ],
   'de': [
     'Smaragd-Karfunkel',
@@ -59,6 +109,56 @@ const data: PetData = {
     'Bernstein-Karfunkel',
     'Obsidian-Karfunkel',
     'Sol-Bahamut',
+    'Cu Sith',
+    'Baumhörnchen',
+    'Schaf',
+    'Pugil',
+    'Opo-Opo',
+    'Dodo',
+    'Kobalos',
+    'Schaudermilbe',
+    'Megalokrabbe',
+    'Vespula',
+    'Kapgeier',
+    'Mandragora',
+    'Gespenst',
+    'Puk',
+    'Krabbe',
+    'Mantis',
+    'Schleim',
+    'Dullahan',
+    'Fledermaus',
+    'Fliegenfalle',
+    'Ziz',
+    'Kaktor',
+    'Golem',
+    'Apkallu',
+    'Adaman-Taimai',
+    'Büffel',
+    'Uragnit',
+    'Riesenwurm',
+    'Spriggan',
+    'Goobbue',
+    'Karpfenkröte',
+    'Kolibri',
+    'Coeurl',
+    'Raptor',
+    'Drakon',
+    'Baumschrat',
+    'Treiberameise',
+    'Chimäre',
+    'Morbol',
+    'Geist',
+    'Salamander',
+    'Kobra',
+    'Hydra',
+    'Kleinlibelle',
+    'Verrottende Goobbue',
+    'Montisaurus',
+    'Eisgolem',
+    'Karlabos',
+    'Rafflesia',
+    'Behemoth',
   ],
   'en': [
     'Emerald Carbuncle',
@@ -85,6 +185,56 @@ const data: PetData = {
     'Amber Carbuncle',
     'Obsidian Carbuncle',
     'Solar Bahamut',
+    'Cu Sith',
+    'squirrel',
+    'lamb',
+    'pugil',
+    'opo-opo',
+    'dodo',
+    'coblyn',
+    'diremite',
+    'megalocrab',
+    'wespe',
+    'vulture',
+    'mandragora',
+    'geshunpest',
+    'puk',
+    'crab',
+    'mantis',
+    'slime',
+    'dullahan',
+    'bat',
+    'flying trap',
+    'ziz',
+    'sabotender',
+    'golem',
+    'apkallu',
+    'adamantoise',
+    'buffalo',
+    'uragnite',
+    'worm',
+    'spriggan',
+    'goobbue',
+    'gigantoad',
+    'colibri',
+    'coeurl',
+    'raptor',
+    'drake',
+    'treant',
+    'antling',
+    'chimera',
+    'morbol',
+    'ghost',
+    'salamander',
+    'cobra',
+    'hydra',
+    'damselfly',
+    'rotting goobbue',
+    'zu',
+    'ice golem',
+    'Karlabos',
+    'rafflesia',
+    'behemoth',
   ],
   'fr': [
     'Carbuncle émeraude',
@@ -111,6 +261,56 @@ const data: PetData = {
     'Carbuncle ambre',
     'Carbuncle obsidienne',
     'Sol-Bahamut',
+    'cu sith',
+    'écureuil',
+    'mouton',
+    'pugil',
+    'opo-opo',
+    'dodo',
+    'coblyn',
+    'acarus',
+    'mégalocrabe',
+    'frelon',
+    'vautour',
+    'mandragore',
+    'gespenst',
+    'puk',
+    'crabe',
+    'mante',
+    'gluant',
+    'dullahan',
+    'chauve-souris',
+    'piège-volant',
+    'ziz',
+    'pampa',
+    'golem',
+    'apkallu',
+    'adamankhélone',
+    'buffle',
+    'uragnite',
+    'ver géant',
+    'spriggan',
+    'goobbue',
+    'crapaud géant',
+    'colibri',
+    'coeurl',
+    'raptor',
+    'draconide',
+    'tréant',
+    'fourmi',
+    'chimère',
+    'morbol',
+    'fantôme',
+    'salamandre',
+    'cobra',
+    'hydre',
+    'demoiselle',
+    'goobbue putrescent',
+    'zu',
+    'golem de glace',
+    'karlabos',
+    'rafflesia',
+    'béhémoth',
   ],
   'ja': [
     'カーバンクル・エメラルド',
@@ -137,6 +337,56 @@ const data: PetData = {
     'カーバンクル・アンバー',
     'カーバンクル・オブシダン',
     'ソルバハムート',
+    'クーシー',
+    'スクウィレル',
+    'シープ',
+    'プギル',
+    'オポオポ',
+    'ドードー',
+    'コブラン',
+    'ダイアマイト',
+    'メガロクラブ',
+    'ヴェスパ',
+    'ヴァルチャー',
+    'マンドラゴラ',
+    'ゲシュンペスト',
+    'プーク',
+    'クラブ',
+    'マンティス',
+    'スライム',
+    'デュラハン',
+    'バット',
+    'フライングトラップ',
+    'ジズ',
+    'サボテンダー',
+    'ゴーレム',
+    'アプカル',
+    'アダマンタス',
+    'バッファロー',
+    'ウラグナイト',
+    'ジャイアントウォーム',
+    'スプリガン',
+    'グゥーブー',
+    'ギガントード',
+    'コリブリ',
+    'クァール',
+    'ラプトル',
+    'ドレイク',
+    'トレント',
+    'アントリング',
+    'キマイラ',
+    'モルボル',
+    'ゴースト',
+    'サラマンダー',
+    'コブラ',
+    'ハイドラ',
+    'ダムゼルフライ',
+    'ロッティング・グゥーブー',
+    'ズー',
+    'アイスゴーレム',
+    'カーラボス',
+    'ラフレシア',
+    'ベヒーモス',
   ],
   'ko': [
     '카벙클 에메랄드',
@@ -163,6 +413,56 @@ const data: PetData = {
     '카벙클 앰버',
     '카벙클 옵시디언',
     '솔 바하무트',
+    '쿠시',
+    '청설모',
+    '양',
+    '푸길',
+    '오포오포',
+    '도도',
+    '코브란',
+    '거미전갈',
+    '대왕게',
+    '땅벌',
+    '대머리수리',
+    '만드라고라',
+    '게슌페스트',
+    '푸크',
+    '게',
+    '사마귀',
+    '슬라임',
+    '둘라한',
+    '박쥐',
+    '파리풀',
+    '지즈',
+    '사보텐더',
+    '골렘',
+    '아프칼루',
+    '금강거북',
+    '물소',
+    '오징어조개',
+    '거대지렁이',
+    '스프리건',
+    '구부',
+    '왕두꺼비',
+    '콜리브리',
+    '커얼',
+    '랍토르',
+    '도마뱀',
+    '나무정령',
+    '거대개미',
+    '키마이라',
+    '몰볼',
+    '유령',
+    '불도롱뇽',
+    '코브라',
+    '하이드라',
+    '실잠자리',
+    '부패한 구부',
+    '즈',
+    '얼음 골렘',
+    '칼라보스',
+    '라플레시아',
+    '베히모스',
   ],
   'tc': [
     '卡邦庫爾-綠寶石',
diff --git a/resources/zadnor_encounters.ts b/resources/zadnor_encounters.ts
index ff788e0646..ecf21fdadb 100644
--- a/resources/zadnor_encounters.ts
+++ b/resources/zadnor_encounters.ts
@@ -151,7 +151,7 @@ const data: CeInfoType = {
   'ThereWouldBeBlood': {
     'directorId': '210',
     'name': {
-      'cn': '异界魔王——汉比',
+      'cn': '异界废王——汉比',
       'de': 'Hanbi, König im Exil',
       'en': 'There Would Be Blood',
       'fr': 'Le Roi des cendres',
diff --git a/resources/zone_id.ts b/resources/zone_id.ts
index 1a74a0a696..7cbff2ab32 100644
--- a/resources/zone_id.ts
+++ b/resources/zone_id.ts
@@ -10,6 +10,7 @@ const data = {
   'ARelicRebornTheChimera': 368,
   'ARelicRebornTheHydra': 369,
   'ARequiemForHeroes': 830,
+  'ARushOfColdWind': 1371,
   'ASleepDisturbed': 914,
   'ASpectacleForTheAges': 533,
   'AacCruiserweightM1': 1256,
@@ -255,6 +256,8 @@ const data = {
   'FadedMemories': 932,
   'FangsOfTheViper': 1235,
   'FinalExercise': 552,
+  'FirstBoardOfTheUnbroken': 1339,
+  'FirstMastersBoard': 1342,
   'FitForAQueen': 955,
   'FlickingSticksAndTakingNames': 219,
   'ForlornGlory': 1051,
@@ -386,6 +389,8 @@ const data = {
   'Sastasha': 1036,
   'SastashaHard': 387,
   'SealRockSeize': 431,
+  'SecondBoardOfTheUnbroken': 1340,
+  'SecondMastersBoard': 1343,
   'Shaaloani': 1190,
   'ShadowAndClaw': 223,
   'ShinryusDomainUnreal': 1372,
@@ -680,6 +685,7 @@ const data = {
   'TheWreathOfSnakes': 824,
   'TheWreathOfSnakesExtreme': 825,
   'TheWreathOfSnakesUnreal': 1302,
+  'ThirdBoardOfTheUnbroken': 1341,
   'ThokAstThokExtreme': 446,
   'ThokAstThokHard': 432,
   'ThornmarchExtreme': 364,
diff --git a/resources/zone_info.ts b/resources/zone_info.ts
index 6743053bf4..3122f44ec6 100644
--- a/resources/zone_info.ts
+++ b/resources/zone_info.ts
@@ -12004,6 +12004,86 @@ const data: ZoneInfoType = {
     'sizeFactor': 100,
     'weatherRate': 149,
   },
+  1339: {
+    'contentType': 40,
+    'exVersion': 5,
+    'name': {
+      'cn': '斗兽奇弈 第一盘',
+      'de': 'Erstes Brett der Bestie',
+      'en': 'First Board of the Unbroken',
+      'fr': 'Dédale bestial - 1er plateau',
+      'ja': '闘獣練 第一盤',
+      'ko': '마수 시련장 첫 번째 시련',
+    },
+    'offsetX': 700,
+    'offsetY': 38,
+    'sizeFactor': 400,
+    'weatherRate': 0,
+  },
+  1340: {
+    'contentType': 40,
+    'exVersion': 5,
+    'name': {
+      'cn': '斗兽奇弈 第二盘',
+      'de': 'Zweites Brett der Bestie',
+      'en': 'Second Board of the Unbroken',
+      'fr': 'Dédale bestial - 2e plateau',
+      'ja': '闘獣練 第二盤',
+      'ko': '마수 시련장 두 번째 시련',
+    },
+    'offsetX': 700,
+    'offsetY': 42,
+    'sizeFactor': 400,
+    'weatherRate': 0,
+  },
+  1341: {
+    'contentType': 40,
+    'exVersion': 5,
+    'name': {
+      'cn': '斗兽奇弈 第三盘',
+      'de': 'Drittes Brett der Bestie',
+      'en': 'Third Board of the Unbroken',
+      'fr': 'Dédale bestial - 3e plateau',
+      'ja': '闘獣練 第三盤',
+      'ko': '마수 시련장 세 번째 시련',
+    },
+    'offsetX': 700,
+    'offsetY': 50,
+    'sizeFactor': 400,
+    'weatherRate': 0,
+  },
+  1342: {
+    'contentType': 40,
+    'exVersion': 5,
+    'name': {
+      'cn': '斗兽奇弈高段 第一盘',
+      'de': 'Erstes Meisterbrett der Bestie',
+      'en': 'First Master\'s Board',
+      'fr': 'Dédale bestial - 1er plateau expert',
+      'ja': '闘獣練 特一盤',
+      'ko': '마수 시련장 첫 번째 특급 시련',
+    },
+    'offsetX': 700,
+    'offsetY': 36,
+    'sizeFactor': 400,
+    'weatherRate': 0,
+  },
+  1343: {
+    'contentType': 40,
+    'exVersion': 5,
+    'name': {
+      'cn': '斗兽奇弈高段 第二盘',
+      'de': 'Zweites Meisterbrett der Bestie',
+      'en': 'Second Master\'s Board',
+      'fr': 'Dédale bestial - 2e plateau expert',
+      'ja': '闘獣練 特二盤',
+      'ko': '마수 시련장 두 번째 특급 시련',
+    },
+    'offsetX': 700,
+    'offsetY': 41,
+    'sizeFactor': 400,
+    'weatherRate': 0,
+  },
   1345: {
     'contentType': 2,
     'exVersion': 5,
@@ -12182,6 +12262,22 @@ const data: ZoneInfoType = {
     'sizeFactor': 200,
     'weatherRate': 150,
   },
+  1371: {
+    'contentType': 7,
+    'exVersion': 5,
+    'name': {
+      'cn': '寒风来临之时',
+      'de': 'Wo die kalten Winde wehen',
+      'en': 'A Rush of Cold Wind',
+      'fr': 'L\'heure de briser la glace',
+      'ja': '寒風の吹くとき',
+      'ko': '차디찬 바람이 불 때',
+    },
+    'offsetX': 2,
+    'offsetY': -8,
+    'sizeFactor': 400,
+    'weatherRate': 0,
+  },
   1372: {
     'contentType': 4,
     'exVersion': 5,
diff --git a/util/coverage/coverage.ts b/util/coverage/coverage.ts
index ca31e71b5d..199ddd7625 100644
--- a/util/coverage/coverage.ts
+++ b/util/coverage/coverage.ts
@@ -264,6 +264,14 @@ const contentTypeToLabel: {
       tc: '假面狂歡',
     },
   },
+  [ContentType.xbm]: {
+    full: {
+      en: 'Crucible of the Unbroken',
+    },
+    short: {
+      en: 'BST',
+    },
+  },
   [ContentType.Eureka]: {
     full: {
       en: 'Eureka',
@@ -1177,6 +1185,7 @@ const buildZoneTable = (container: HTMLElement, lang: Lang, coverage: Coverage)
 
     // @TODO: Remap categories to group them better
     ContentType.TheMaskedCarnivale,
+    ContentType.xbm,
     ContentType.Eureka,
     ContentType.SaveTheQueen,
     ContentType.OccultCrescent,
diff --git a/util/logtools/encounter_tools.ts b/util/logtools/encounter_tools.ts
index 6cb8f92f49..3b360eed49 100644
--- a/util/logtools/encounter_tools.ts
+++ b/util/logtools/encounter_tools.ts
@@ -193,6 +193,7 @@ export class EncounterFinder {
       ContentType.Trials,
       ContentType.UltimateRaids,
       ContentType.VCDungeonFinder,
+      ContentType.xbm,
     ];
 
     return !keepTypes.includes(content);