diff --git a/resources/hunt.ts b/resources/hunt.ts index b81b4e4370d..7bb61f2f4e9 100644 --- a/resources/hunt.ts +++ b/resources/hunt.ts @@ -1285,7 +1285,7 @@ const data: HuntMap = { 'cn': '俄菲翁尼厄斯', 'de': 'Ophioneus', 'en': 'Ophioneus', - 'fr': 'Ophion', + 'fr': 'Ophioneus', 'ja': 'オピオネウス', 'ko': '오피오네우스', }, @@ -1577,6 +1577,18 @@ const data: HuntMap = { }, 'rank': 'A', }, + 'Sphatika': { + 'id': '10618', + 'name': { + 'cn': '颇胝迦', + 'de': 'Sphatika', + 'en': 'Sphatika', + 'fr': 'Sphatika', + 'ja': 'スパティカ', + 'ko': '스파티카', + }, + 'rank': 'S', + }, 'Squonk': { 'id': '4358', 'name': { @@ -2081,18 +2093,6 @@ const data: HuntMap = { }, 'rank': 'A', }, - 'sphatika': { - 'id': '10618', - 'name': { - 'cn': '颇胝迦', - 'de': 'Sphatika', - 'en': 'sphatika', - 'fr': 'Sphatika', - 'ja': 'スパティカ', - 'ko': '스파티카', - }, - 'rank': 'S', - }, 'stench blossom': { 'id': '4373', 'name': { diff --git a/resources/weather_rate.ts b/resources/weather_rate.ts index 325d447c21c..8e7cc165e50 100644 --- a/resources/weather_rate.ts +++ b/resources/weather_rate.ts @@ -1940,20 +1940,68 @@ const data: WeatherRateType = { ], }, 151: { - 'rates': [], - 'weathers': [], + 'rates': [ + 50, + 65, + 80, + 95, + 100, + ], + 'weathers': [ + 'Fair Skies', + 'Clouds', + 'Fog', + 'Rain', + 'Thunderstorms', + ], }, 152: { - 'rates': [], - 'weathers': [], + 'rates': [ + 50, + 65, + 80, + 95, + 100, + ], + 'weathers': [ + 'Fair Skies', + 'Clouds', + 'Fog', + 'Rain', + 'Showers', + ], }, 153: { - 'rates': [], - 'weathers': [], + 'rates': [ + 40, + 55, + 70, + 90, + 100, + ], + 'weathers': [ + 'Fair Skies', + 'Clouds', + 'Fog', + 'Wind', + 'Thunder', + ], }, 154: { - 'rates': [], - 'weathers': [], + 'rates': [ + 50, + 65, + 80, + 95, + 100, + ], + 'weathers': [ + 'Fair Skies', + 'Clouds', + 'Fog', + 'Rain', + 'Showers', + ], }, 155: { 'rates': [], diff --git a/resources/zone_id.ts b/resources/zone_id.ts index ca9df78628f..294834530db 100644 --- a/resources/zone_id.ts +++ b/resources/zone_id.ts @@ -22,7 +22,8 @@ const data = { 'Aglaia': 1054, 'AirForceOne': 832, 'AkadaemiaAnyder': 841, - 'AlaMhigo': 689, + 'AlaMhigo': 1146, + 'AlaMhigo63': 689, 'AlexanderTheArmOfTheFather': 444, 'AlexanderTheArmOfTheFatherSavage': 451, 'AlexanderTheArmOfTheSon': 522, @@ -48,7 +49,6 @@ const data = { 'AlexanderTheSoulOfTheCreator': 583, 'AlexanderTheSoulOfTheCreatorSavage': 587, 'AllsWellThatEndsInTheWell': 220, - 'AllsWellThatStartsWell': 796, 'AlphascapeV10': 798, 'AlphascapeV10Savage': 802, 'AlphascapeV20': 799, @@ -63,6 +63,14 @@ const data = { 'AmdaporKeepHard': 189, 'AmhAraeng': 815, 'AnUnforeseenBargain': 1120, + 'AnabaseiosTheEleventhCircle': 1151, + 'AnabaseiosTheEleventhCircleSavage': 1152, + 'AnabaseiosTheNinthCircle': 1147, + 'AnabaseiosTheNinthCircleSavage': 1148, + 'AnabaseiosTheTenthCircle': 1149, + 'AnabaseiosTheTenthCircleSavage': 1150, + 'AnabaseiosTheTwelfthCircle': 1153, + 'AnabaseiosTheTwelfthCircleSavage': 1154, 'AnamnesisAnyder': 898, 'AnnoyTheVoid': 222, 'AnotherSildihnSubterrane': 1075, @@ -83,7 +91,8 @@ const data = { 'AzysLla': 402, 'BaelsarsWall': 1114, 'BaelsarsWall62': 615, - 'BardamsMettle': 623, + 'BardamsMettle': 1143, + 'BardamsMettle63': 623, 'BasicTrainingEnemyParties': 214, 'BasicTrainingEnemyStrongholds': 215, 'BattleInTheBigKeep': 396, @@ -92,10 +101,10 @@ const data = { 'BrayfloxsLongstop': 1041, 'BrayfloxsLongstopHard': 362, 'CapeWestwind': 1049, - 'CastrumAbania': 661, + 'CastrumAbania': 1145, + 'CastrumAbania63': 661, 'CastrumFluminis': 778, 'CastrumMarinum': 934, - 'CastrumMarinumDrydocks': 967, 'CastrumMarinumExtreme': 935, 'CastrumMeridianum': 1043, 'CentralShroud': 148, @@ -117,6 +126,7 @@ const data = { 'ContainmentBayS1T7Unreal': 1090, 'ContainmentBayZ1T9': 637, 'ContainmentBayZ1T9Extreme': 638, + 'ContainmentBayZ1T9Unreal': 1157, 'CopperbellMines': 1038, 'CopperbellMinesHard': 349, 'CrystallineConflictCustomMatchCloudNine': 1060, @@ -140,7 +150,8 @@ const data = { 'DelubrumReginaeSavage': 937, 'Devastation': 1052, 'DohnMheg': 821, - 'DomaCastle': 660, + 'DomaCastle': 1144, + 'DomaCastle63': 660, 'DragonSound': 714, 'DragonsongsRepriseUltimate': 968, 'DunScaith': 627, @@ -273,7 +284,6 @@ const data = { 'NorthShroud': 154, 'NorthernThanalan': 147, 'NyelbertsLament': 876, - 'OceanFishing': 900, 'OldGridania': 133, 'OldSharlayan': 962, 'OneLifeForOneWorld': 592, @@ -318,7 +328,6 @@ const data = { 'SouthernThanalan': 146, 'SpecialEventI': 353, 'SpecialEventIi': 354, - 'SpecialEventIii': 509, 'StingingBack': 192, 'StormsCrown': 1071, 'StormsCrownExtreme': 1072, @@ -326,6 +335,7 @@ const data = { 'Thavnair': 957, 'TheAery': 1065, 'TheAery61': 435, + 'TheAetherfont': 1126, 'TheAetherochemicalResearchFacility': 1110, 'TheAetherochemicalResearchFacility62': 438, 'TheAitiascope': 978, @@ -499,7 +509,8 @@ const data = { 'TheShiftingOubliettesOfLyheGhiah': 924, 'TheSildihnSubterrane': 1069, 'TheSingularityReactor': 437, - 'TheSirensongSea': 626, + 'TheSirensongSea': 1142, + 'TheSirensongSea63': 626, 'TheStepsOfFaith': 1068, 'TheStepsOfFaith61': 143, 'TheStigmaDreamscape': 986, @@ -525,6 +536,8 @@ const data = { 'TheVault': 1066, 'TheVault61': 421, 'TheVoidArk': 508, + 'TheVoidcastDais': 1140, + 'TheVoidcastDaisExtreme': 1141, 'TheWanderersPalace': 159, 'TheWanderersPalaceHard': 188, 'TheWeaponsRefrainUltimate': 777, diff --git a/resources/zone_info.ts b/resources/zone_info.ts index dafc159f032..f045a6d0bfd 100644 --- a/resources/zone_info.ts +++ b/resources/zone_info.ts @@ -1142,8 +1142,8 @@ const data: ZoneInfoType = { 'fr': 'Lapis Manalis', 'ja': '雪山冥洞 ラピス・マナリス', }, - 'offsetX': -24, - 'offsetY': 744, + 'offsetX': -46, + 'offsetY': 570, 'sizeFactor': 200, 'weatherRate': 42, }, @@ -1501,6 +1501,254 @@ const data: ZoneInfoType = { 'sizeFactor': 400, 'weatherRate': 0, }, + 1126: { + 'contentType': 2, + 'exVersion': 4, + 'name': { + 'de': 'Ätherborn', + 'en': 'The Aetherfont', + 'fr': 'L\'île de Haam', + 'ja': '星霊間欠 ハーム島', + }, + 'offsetX': 368, + 'offsetY': -277, + 'sizeFactor': 200, + 'weatherRate': 0, + }, + 1140: { + 'contentType': 4, + 'exVersion': 4, + 'name': { + 'de': 'Prophetie - Golbez', + 'en': 'The Voidcast Dais', + 'fr': 'La Chaire de l\'Exilée', + 'ja': 'ゴルベーザ討滅戦', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 149, + }, + 1141: { + 'contentType': 4, + 'exVersion': 4, + 'name': { + 'de': 'Eschatos - Golbez', + 'en': 'The Voidcast Dais (Extreme)', + 'fr': 'La Chaire de l\'Exilée (extrême)', + 'ja': '極ゴルベーザ討滅戦', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 149, + }, + 1142: { + 'contentType': 2, + 'exVersion': 2, + 'name': { + 'cn': '漂流海域妖歌海', + 'de': 'Sirenen-See', + 'en': 'The Sirensong Sea', + 'fr': 'La Mer du Chant des sirènes', + 'ja': '漂流海域 セイレーン海', + 'ko': '세이렌 해', + }, + 'offsetX': 0, + 'offsetY': 0, + 'sizeFactor': 200, + 'weatherRate': 36, + }, + 1143: { + 'contentType': 2, + 'exVersion': 2, + 'name': { + 'cn': '试炼行路巴儿达木霸道', + 'de': 'Bardams Probe', + 'en': 'Bardam\'s Mettle', + 'fr': 'La Force de Bardam', + 'ja': '伝統試練 バルダム覇道', + 'ko': '바르담 패도', + }, + 'offsetX': 0, + 'offsetY': 0, + 'sizeFactor': 200, + 'weatherRate': 0, + }, + 1144: { + 'contentType': 2, + 'exVersion': 2, + 'name': { + 'cn': '解放决战多玛王城', + 'de': 'Burg Doma', + 'en': 'Doma Castle', + 'fr': 'Le Château de Doma', + 'ja': '解放決戦 ドマ城', + 'ko': '도마 성', + }, + 'offsetX': 0, + 'offsetY': 0, + 'sizeFactor': 200, + 'weatherRate': 0, + }, + 1145: { + 'contentType': 2, + 'exVersion': 2, + 'name': { + 'cn': '巨炮要塞帝国白山堡', + 'de': 'Castrum Abania', + 'en': 'Castrum Abania', + 'fr': 'Castrum Abania', + 'ja': '巨砲要塞 カストルム・アバニア', + 'ko': '카스트룸 아바니아', + }, + 'offsetX': 72, + 'offsetY': -186, + 'sizeFactor': 200, + 'weatherRate': 0, + }, + 1146: { + 'contentType': 2, + 'exVersion': 2, + 'name': { + 'cn': '鏖战红莲阿拉米格', + 'de': 'Ala Mhigo', + 'en': 'Ala Mhigo', + 'fr': 'Ala Mhigo', + 'ja': '紅蓮決戦 アラミゴ', + 'ko': '알라미고', + }, + 'offsetX': 292, + 'offsetY': -163, + 'sizeFactor': 200, + 'weatherRate': 0, + }, + 1147: { + 'contentType': 5, + 'exVersion': 4, + 'name': { + 'de': 'Anabaseios - Neunter Kreis', + 'en': 'Anabaseios: The Ninth Circle', + 'fr': 'Le Paradis du Pandæmonium - Métempsycose', + 'ja': '万魔殿パンデモニウム：天獄編1', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 0, + }, + 1148: { + 'contentType': 5, + 'exVersion': 4, + 'name': { + 'de': 'Anabaseios - Neunter Kreis (episch)', + 'en': 'Anabaseios: The Ninth Circle (Savage)', + 'fr': 'Le Paradis du Pandæmonium - Métempsycose (sadique)', + 'ja': '万魔殿パンデモニウム零式：天獄編1', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 0, + }, + 1149: { + 'contentType': 5, + 'exVersion': 4, + 'name': { + 'de': 'Anabaseios - Zehnter Kreis', + 'en': 'Anabaseios: The Tenth Circle', + 'fr': 'Le Paradis du Pandæmonium - Monochrome', + 'ja': '万魔殿パンデモニウム：天獄編2', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 145, + }, + 1150: { + 'contentType': 5, + 'exVersion': 4, + 'name': { + 'de': 'Anabaseios - Zehnter Kreis (episch)', + 'en': 'Anabaseios: The Tenth Circle (Savage)', + 'fr': 'Le Paradis du Pandæmonium - Monochrome (sadique)', + 'ja': '万魔殿パンデモニウム零式：天獄編2', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 145, + }, + 1151: { + 'contentType': 5, + 'exVersion': 4, + 'name': { + 'de': 'Anabaseios - Elfter Kreis', + 'en': 'Anabaseios: The Eleventh Circle', + 'fr': 'Le Paradis du Pandæmonium - Tribunal', + 'ja': '万魔殿パンデモニウム：天獄編3', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 145, + }, + 1152: { + 'contentType': 5, + 'exVersion': 4, + 'name': { + 'de': 'Anabaseios - Elfter Kreis (episch)', + 'en': 'Anabaseios: The Eleventh Circle (Savage)', + 'fr': 'Le Paradis du Pandæmonium - Tribunal (sadique)', + 'ja': '万魔殿パンデモニウム零式：天獄編3', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 145, + }, + 1153: { + 'contentType': 5, + 'exVersion': 4, + 'name': { + 'de': 'Anabaseios - Zwölfter Kreis', + 'en': 'Anabaseios: The Twelfth Circle', + 'fr': 'Le Paradis du Pandæmonium - Apothéose', + 'ja': '万魔殿パンデモニウム：天獄編4', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 145, + }, + 1154: { + 'contentType': 5, + 'exVersion': 4, + 'name': { + 'de': 'Anabaseios - Zwölfter Kreis (episch)', + 'en': 'Anabaseios: The Twelfth Circle (Savage)', + 'fr': 'Le Paradis du Pandæmonium - Apothéose (sadique)', + 'ja': '万魔殿パンデモニウム零式：天獄編4', + }, + 'offsetX': -100, + 'offsetY': -100, + 'sizeFactor': 400, + 'weatherRate': 145, + }, + 1157: { + 'contentType': 4, + 'exVersion': 4, + 'name': { + 'de': 'Traumprüfung - Zurvan', + 'en': 'Containment Bay Z1T9 (Unreal)', + 'fr': 'Unité de contention Z1P9 (irréel)', + 'ja': '幻鬼神ズルワーン討滅戦', + }, + 'offsetX': 0, + 'offsetY': 0, + 'sizeFactor': 400, + 'weatherRate': 75, + }, 128: { 'exVersion': 0, 'name': { @@ -3804,22 +4052,6 @@ const data: ZoneInfoType = { 'sizeFactor': 200, 'weatherRate': 37, }, - 509: { - 'contentType': 4, - 'exVersion': 0, - 'name': { - 'cn': '活动挑战1', - 'de': 'Event-Inhalt 3', - 'en': 'Special Event III', - 'fr': 'Défi spécial III', - 'ja': 'イベント用コンテンツ：3', - 'ko': '이벤트용 임무: 3', - }, - 'offsetX': 0, - 'offsetY': 0, - 'sizeFactor': 400, - 'weatherRate': 23, - }, 510: { 'contentType': 2, 'exVersion': 1, @@ -8659,21 +8891,6 @@ const data: ZoneInfoType = { 'sizeFactor': 200, 'weatherRate': 0, }, - 967: { - 'exVersion': 3, - 'name': { - 'cn': '帝国海上基地干船坞', - 'de': 'Trockendock von Castrum Marinum', - 'en': 'Castrum Marinum Drydocks', - 'fr': 'Cale sèche de Castrum Marinum', - 'ja': 'カステッルム・マリヌム・ドライドック', - 'ko': '카스트룸 마리눔 건선거', - }, - 'offsetX': -100, - 'offsetY': -100, - 'sizeFactor': 400, - 'weatherRate': 0, - }, 968: { 'contentType': 28, 'exVersion': 4, diff --git a/ui/fisher/static-data.ts b/ui/fisher/static-data.ts index d96dcba4b5d..88b037c7412 100644 --- a/ui/fisher/static-data.ts +++ b/ui/fisher/static-data.ts @@ -1226,7 +1226,7 @@ const data: FisherData = { '36519': '额外维度实体-9318', '36520': '未受生魂', '36521': '法拉伊那', - '36660': '种蛙', + '36660': '种子蛙', '36662': '圣洁绒球', '36663': '灰白珊瑚', '36679': '电吉他鱼', @@ -1247,6 +1247,18 @@ const data: FisherData = { '37851': '破军尾', '37852': '阿耳戈雄英', '37853': '水中辉星', + '38810': '鳍人海带', + '38812': '尊紫鳕', + '38814': '虹花贝', + '38830': '万虑鱼', + '38831': '苔绿腮鲑', + '38832': '雷云隆头鱼', + '38833': '棕香蕉鳗鱼', + '38834': '冰月壤龟', + '38835': '宇宙雾霾', + '38836': '大丽花冠鮨', + '38935': '近东虾', + '39240': '叶草鱼', }, 'de': { '4776': [ @@ -6318,6 +6330,358 @@ const data: FisherData = { 'Zingarnelen', ], '39240': 'Purinos', + '39879': [ + 'Onyx-Messerfisch', + 'Onyx-Messerfische', + ], + '39880': [ + 'wachsame Aufseher', + 'wachsamen Aufseher', + 'wachsames Aufseher', + 'wachsamer Aufseher', + ], + '39881': 'Riesen-Dorudon', + '39882': 'Eehs Fahn', + '39883': 'Gold-Dermogenys', + '39912': [ + 'Aegis der Furie', + 'Aegiden der Furie', + ], + '40521': [ + 'rosafarbene Garnele', + 'rosafarbenen Garnele', + 'rosafarbenes Garnele', + 'rosafarbener Garnele', + 'rosafarbene Garnelen', + 'rosafarbenen Garnelen', + 'rosafarbenes Garnelen', + 'rosafarbener Garnelen', + ], + '40522': [ + 'Sirenenmuschel', + 'Sirenenmuscheln', + ], + '40523': [ + 'Pfeilkopf', + 'Pfeilköpfe', + ], + '40524': [ + 'Tiefseesardine', + 'Tiefseesardinen', + ], + '40525': [ + 'singende Meeräsche', + 'singenden Meeräsche', + 'singendes Meeräsche', + 'singender Meeräsche', + 'singende Meeräschen', + 'singenden Meeräschen', + 'singendes Meeräschen', + 'singender Meeräschen', + ], + '40526': [ + 'Selkie-Kugelfisch', + 'Selkie-Kugelfische', + ], + '40527': [ + 'Meeres-Okarina', + 'Meeres-Okarinas', + ], + '40528': [ + 'Matanga-Hai', + 'Matanga-Haie', + ], + '40529': 'Spektral-Quastenflosser', + '40530': [ + 'Düsterhai', + 'Düsterhaie', + ], + '40531': [ + 'Meerjungfrauen-Schuppe', + 'Meerjungfrauen-Schuppen', + ], + '40532': [ + 'Breitkopf', + 'Breitköpfe', + ], + '40533': [ + 'rosastrahlende Garnele', + 'rosastrahlenden Garnele', + 'rosastrahlendes Garnele', + 'rosastrahlender Garnele', + 'rosastrahlende Garnelen', + 'rosastrahlenden Garnelen', + 'rosastrahlendes Garnelen', + 'rosastrahlender Garnelen', + ], + '40534': 'Tiefsee-Quastenflosser', + '40535': 'Sirenenteufel', + '40536': [ + 'schwarze Helicoprion', + 'schwarzen Helicoprion', + 'schwarzes Helicoprion', + 'schwarzer Helicoprion', + ], + '40537': [ + 'Tarnoktopus', + 'Tarnoktopoden', + ], + '40538': [ + 'Jadekrebs', + 'Jadekrebse', + ], + '40539': [ + 'Nymeia-Rad', + 'Nymeia-Räder', + ], + '40540': 'Taniwha', + '40541': [ + 'Kugane-Hering', + 'Kugane-Heringe', + ], + '40542': [ + 'Strudelschnecke', + 'Strudelschnecken', + ], + '40543': [ + 'gefleckte Garnele', + 'gefleckten Garnele', + 'geflecktes Garnele', + 'gefleckter Garnele', + 'gefleckte Garnelen', + 'gefleckten Garnelen', + 'geflecktes Garnelen', + 'gefleckter Garnelen', + ], + '40544': [ + 'Speer-Tintenfisch', + 'Speer-Tintenfische', + ], + '40545': [ + 'Laternenqualle', + 'Laternenquallen', + ], + '40546': [ + 'gefleckte Seepferdchen', + 'gefleckten Seepferdchen', + 'geflecktes Seepferdchen', + 'gefleckter Seepferdchen', + ], + '40547': 'Flaggen-Grundel', + '40548': [ + 'Rattenhai', + 'Rattenhaie', + ], + '40549': [ + 'Phantom-Lippfisch', + 'Phantom-Lippfische', + ], + '40550': [ + 'Ziernadel', + 'Ziernadeln', + ], + '40551': [ + 'Riechermuräne', + 'Riechermuränen', + ], + '40552': [ + 'Glitzergarnele', + 'Glitzergarnelen', + ], + '40553': [ + 'Giftmakrele', + 'Giftmakrelen', + ], + '40554': [ + 'Schwertkopf-Tintenfisch', + 'Schwertkopf-Tintenfische', + ], + '40555': [ + 'gerillte Schnepfenmesserfisch', + 'gerillten Schnepfenmesserfisch', + 'gerilltes Schnepfenmesserfisch', + 'gerillter Schnepfenmesserfisch', + 'gerillte Schnepfenmesserfische', + 'gerillten Schnepfenmesserfische', + 'gerilltes Schnepfenmesserfische', + 'gerillter Schnepfenmesserfische', + ], + '40556': [ + 'fliegende Gottesfisch', + 'fliegenden Gottesfisch', + 'fliegendes Gottesfisch', + 'fliegender Gottesfisch', + 'fliegende Gottesfische', + 'fliegenden Gottesfische', + 'fliegendes Gottesfische', + 'fliegender Gottesfische', + ], + '40557': [ + 'Tornadoschnecke', + 'Tornadoschnecken', + ], + '40558': [ + 'Teufelshai', + 'Teufelshaie', + ], + '40559': 'Geigenrochen', + '40560': [ + 'Lapisdrache', + 'Lapisdrachen', + ], + '40561': [ + 'Purpuralge', + 'Purpuralgen', + ], + '40562': [ + 'Riffkalmar', + 'Riffkalmare', + ], + '40563': [ + 'Kiefernrindenscholle', + 'Kiefernrindenschollen', + ], + '40564': [ + 'Blaukleidmuräne', + 'Blaukleidmuränen', + ], + '40565': [ + 'Shisui-Grundel', + 'Shisui-Grundeln', + ], + '40566': 'Sanbaso', + '40567': [ + 'Pferdegarnele', + 'Pferdegarnelen', + ], + '40568': 'Saphirwächter', + '40569': [ + 'Phantom-Riesenschlange', + 'Phantom-Riesenschlangen', + ], + '40570': 'Himmelstiger', + '40571': [ + 'Segelkalmar', + 'Segelkalmare', + ], + '40572': [ + 'bogenbärtige Pferdegarnele', + 'bogenbärtigen Pferdegarnele', + 'bogenbärtiges Pferdegarnele', + 'bogenbärtiger Pferdegarnele', + 'bogenbärtige Pferdegarnelen', + 'bogenbärtigen Pferdegarnelen', + 'bogenbärtiges Pferdegarnelen', + 'bogenbärtiger Pferdegarnelen', + ], + '40573': [ + 'Dunkelzahn-Seegurke', + 'Dunkelzahn-Seegurken', + ], + '40574': [ + 'Senbei-Oktopus', + 'Senbei-Oktopoden', + ], + '40575': 'Tintenvertilger', + '40576': [ + 'gepanzerte Lumpfisch', + 'gepanzerten Lumpfisch', + 'gepanzertes Lumpfisch', + 'gepanzerter Lumpfisch', + 'gepanzerte Lumpfische', + 'gepanzerten Lumpfische', + 'gepanzertes Lumpfische', + 'gepanzerter Lumpfische', + ], + '40577': [ + 'Wasserschwertlilie', + 'Wasserschwertlilien', + ], + '40578': 'Rubinwächter', + '40579': [ + 'Riesenflugkalmar', + 'Riesenflugkalmare', + ], + '40580': [ + 'Höllenkrabbe', + 'Höllenkrabben', + ], + '40581': [ + 'weiße Karausche', + 'weißen Karausche', + 'weißes Karausche', + 'weißer Karausche', + 'weiße Karauschen', + 'weißen Karauschen', + 'weißes Karauschen', + 'weißer Karauschen', + ], + '40582': [ + 'garleische Sonnenbarsch', + 'garleischen Sonnenbarsch', + 'garleisches Sonnenbarsch', + 'garleischer Sonnenbarsch', + 'garleische Sonnenbarsche', + 'garleischen Sonnenbarsche', + 'garleisches Sonnenbarsche', + 'garleischer Sonnenbarsche', + ], + '40583': [ + 'Yanxia-Schnappschildkröte', + 'Yanxia-Schnappschildkröten', + ], + '40584': [ + 'Prinzessinnenforelle', + 'Prinzessinnenforellen', + ], + '40585': [ + 'Kalligrafenfisch', + 'Kalligrafenfische', + ], + '40586': [ + 'Einzig-Garnele', + 'Einzig-Garnelen', + ], + '40587': [ + 'farbenprächtige Zierkarpfen', + 'farbenprächtigen Zierkarpfen', + 'farbenprächtiges Zierkarpfen', + 'farbenprächtiger Zierkarpfen', + ], + '40588': [ + 'Yanxia-Stör', + 'Yanxia-Störe', + ], + '40589': 'Phantom-Kotsu Zetsu', + '40590': [ + 'Dickichthai', + 'Dickichthaie', + ], + '40591': [ + 'Gensui-Garnele', + 'Gensui-Garnelen', + ], + '40592': 'Yato no Kami', + '40593': [ + 'Aal des Reihers', + 'Aale des Reihers', + ], + '40594': 'Krähenschatten', + '40595': [ + 'Yanxia-Grundel', + 'Yanxia-Grundeln', + ], + '40596': [ + 'Kristallforelle', + 'Kristallforellen', + ], + '40597': 'Ur-Namazuo', + '40598': 'Gakugyo', + '40599': 'Ginrin Goshiki', + '40600': [ + 'Pflaumenquellkröte', + 'Pflaumenquellkröten', + ], }, 'en': { '4776': [ @@ -9738,8 +10102,8 @@ const data: FisherData = { 'sophoi deka-okto', ], '36510': [ - 'class twenty-four', - 'class twenty-fours', + 'Class Twenty-four', + 'Class Twenty-fours', ], '36511': [ 'terrifyingway', @@ -9888,6 +10252,242 @@ const data: FisherData = { 'phyllinos', 'phyllinoi', ], + '39879': 'onyx knifefish', + '39880': [ + 'wakeful warden', + 'wakeful wardens', + ], + '39881': [ + 'basilosaurus rex', + 'basilosaurus rexes', + ], + '39882': 'eehs fan', + '39883': 'gilt dermogenys', + '39912': [ + 'the Fury\'s aegis', + 'the Fury\'s aegises', + ], + '40521': 'pink shrimp', + '40522': [ + 'Sirensong mussel', + 'Sirensong mussels', + ], + '40523': [ + 'arrowhead', + 'arrowheads', + ], + '40524': [ + 'deepshade sardine', + 'deepshade sardines', + ], + '40525': [ + 'Sirensong mullet', + 'Sirensong mullets', + ], + '40526': [ + 'selkie puffer', + 'selkie puffers', + ], + '40527': [ + 'poet\'s pipe', + 'poet\'s pipes', + ], + '40528': 'marine Matanga', + '40529': [ + 'spectral coelacanth', + 'spectral coelacanths', + ], + '40530': [ + 'dusk shark', + 'dusk sharks', + ], + '40531': [ + 'mermaid scale', + 'mermaid scales', + ], + '40532': [ + 'broadhead', + 'broadheads', + ], + '40533': 'vivid pink shrimp', + '40534': [ + 'sunken coelacanth', + 'sunken coelacanths', + ], + '40535': [ + 'siren\'s sigh', + 'siren\'s sighs', + ], + '40536': [ + 'black-jawed helicoprion', + 'black-jawed helicoprions', + ], + '40537': [ + 'impostopus', + 'impostopodes', + ], + '40538': 'jade shrimp', + '40539': [ + 'Nymeia\'s wheel', + 'Nymeia\'s wheels', + ], + '40540': 'taniwha', + '40541': 'Ruby herring', + '40542': [ + 'whirlpool turban', + 'whirlpool turbans', + ], + '40543': [ + 'leopard prawn', + 'leopard prawns', + ], + '40544': 'spear squid', + '40545': [ + 'floating lantern', + 'floating lanterns', + ], + '40546': 'rubescent tatsunoko', + '40547': 'hatatate', + '40548': [ + 'silent shark', + 'silent sharks', + ], + '40549': 'spectral wrasse', + '40550': 'mizuhiki', + '40551': 'snapping koban', + '40552': [ + 'silkweft prawn', + 'silkweft prawns', + ], + '40553': [ + 'stingfin trevally', + 'stingfin trevallies', + ], + '40554': 'swordtip squid', + '40555': 'mailfish', + '40556': [ + 'Idaten\'s bolt', + 'Idaten\'s bolts', + ], + '40557': [ + 'maelstrom turban', + 'maelstrom turbans', + ], + '40558': 'shoshitsuki', + '40559': 'spadefish', + '40560': [ + 'glass dragon', + 'glass dragons', + ], + '40561': [ + 'strip of crimson kelp', + 'strips of crimson kelp', + ], + '40562': 'reef squid', + '40563': 'pinebark flounder', + '40564': [ + 'mantle moray', + 'mantle morays', + ], + '40565': [ + 'Shisui goby', + 'Shisui gobies', + ], + '40566': 'sanbaso', + '40567': [ + 'barded lobster', + 'barded lobsters', + ], + '40568': [ + 'violet sentry', + 'violet sentries', + ], + '40569': [ + 'spectral snake eel', + 'spectral snake eels', + ], + '40570': [ + 'heavensent shark', + 'heavensent sharks', + ], + '40571': 'fleeting squid', + '40572': [ + 'bowbarb lobster', + 'bowbarb lobsters', + ], + '40573': [ + 'pitch pickle', + 'pitch pickles', + ], + '40574': [ + 'senbei octopus', + 'senbei octopodes', + ], + '40575': [ + 'tentacle thresher', + 'tentacle threshers', + ], + '40576': [ + 'bekko rockhugger', + 'bekko rockhuggers', + ], + '40577': [ + 'yellow iris', + 'yellow irises', + ], + '40578': [ + 'crimson sentry', + 'crimson sentries', + ], + '40579': 'flying squid', + '40580': [ + 'hells\' claw', + 'hells\' claws', + ], + '40581': 'catching carp', + '40582': 'Garlean bluegill', + '40583': [ + 'Yanxian softshell', + 'Yanxian softshells', + ], + '40584': 'princess salmon', + '40585': [ + 'calligraph', + 'calligraphs', + ], + '40586': 'singular shrimp', + '40587': 'brocade carp', + '40588': [ + 'Yanxian sturgeon', + 'Yanxian sturgeons', + ], + '40589': 'spectral kotsu zetsu', + '40590': [ + 'fishy shark', + 'fishy sharks', + ], + '40591': 'Gensui shrimp', + '40592': 'yato-no-kami', + '40593': [ + 'Heron\'s eel', + 'Heron\'s eels', + ], + '40594': [ + 'crowshadow mussel', + 'crowshadow mussels', + ], + '40595': [ + 'Yanxian goby', + 'Yanxian gobies', + ], + '40596': 'iridescent trout', + '40597': 'un-Namazu', + '40598': 'gakugyo', + '40599': 'ginrin goshiki', + '40600': [ + 'jewel of Plum Spring', + 'jewels of Plum Spring', + ], }, 'fr': { '4776': [ @@ -12459,7 +13059,7 @@ const data: FisherData = { '24990': 'Xenacanthus', '24991': 'Drepanaspis', '24992': 'Stethacanthus', - '24993': 'Koryu', + '24993': 'Kôryû', '24994': [ 'poisson-prisme arc-en-ciel', 'poissons-prismes arc-en-ciel', @@ -14171,7 +14771,7 @@ const data: FisherData = { ], '36461': [ 'pléco impérial', - 'pléco impériaux', + 'plécos impériaux', ], '36462': [ 'poisson-chat à queue bleue', @@ -14448,6 +15048,317 @@ const data: FisherData = { 'jhingas', ], '39240': 'phyllinos', + '39879': [ + 'poisson-couteau d\'onyx', + 'poissons-couteaux d\'onyx', + ], + '39880': [ + 'sentinelle du Torana', + 'sentinelles du Torana', + ], + '39881': 'basilosaurus rex', + '39882': 'Eehs Fan', + '39883': [ + 'demi-bec doré', + 'demi-becs dorés', + ], + '39912': [ + 'égide de la Conquérante', + 'égides de la Conquérante', + ], + '40521': [ + 'crevette rosée', + 'crevettes rosées', + ], + '40522': [ + 'moule du Chant des sirènes', + 'moules du Chant des sirènes', + ], + '40523': [ + 'pointe-de-flèche', + 'pointes-de-flèche', + ], + '40524': [ + 'sardine sombrécaille', + 'sardines sombrécaille', + ], + '40525': [ + 'mulet chantant', + 'mulets chantants', + ], + '40526': [ + 'tétrodon selkie', + 'tétrodons selkies', + ], + '40527': [ + 'ocarina-du-barde', + 'ocarinas-du-barde', + ], + '40528': [ + 'matanga marin', + 'matangas marins', + ], + '40529': [ + 'cœlacanthe spectral', + 'cœlacanthes spectraux', + ], + '40530': [ + 'requin crépusculaire', + 'requins crépusculaires', + ], + '40531': [ + 'écaille-de-sirène', + 'écailles-de-sirène', + ], + '40532': [ + 'pointe-seiche', + 'pointe-seiches', + ], + '40533': [ + 'crevette fuchsia', + 'crevettes fuchsia', + ], + '40534': [ + 'cœlacanthe abyssal', + 'cœlacanthes abyssaux', + ], + '40535': [ + 'soupir-de-sirène', + 'soupirs-de-sirène', + ], + '40536': [ + 'hélicoprion noir', + 'hélicoprions noirs', + ], + '40537': [ + 'poulpe imposteur', + 'poulpes imposteurs', + ], + '40538': [ + 'mante de jade', + 'mantes de jade', + ], + '40539': [ + 'rouet de Nymeia', + 'rouets de Nymeia', + ], + '40540': 'taniwha', + '40541': [ + 'hareng de Kugane', + 'harengs de Kugane', + ], + '40542': [ + 'turbo tourbillon', + 'turbos tourbillons', + ], + '40543': [ + 'crevette léopard', + 'crevettes léopards', + ], + '40544': [ + 'calmar lance', + 'calmars lances', + ], + '40545': [ + 'lanterne flottante', + 'lanternes flottantes', + ], + '40546': [ + 'hippocampe rubescent', + 'hippocampes rubescents', + ], + '40547': [ + 'gobie porte-drapeau', + 'gobies porte-drapeau', + ], + '40548': [ + 'requin souris', + 'requins souris', + ], + '40549': [ + 'labre spectral', + 'labres spectraux', + ], + '40550': 'mizuhiki', + '40551': [ + 'murène koban', + 'murènes koban', + ], + '40552': [ + 'crevette hôsai', + 'crevettes hôsai', + ], + '40553': [ + 'carangue étoilée', + 'carangues étoilées', + ], + '40554': [ + 'calmar épée', + 'calmars épées', + ], + '40555': [ + 'poisson-armure', + 'poissons-armures', + ], + '40556': [ + 'poisson volant d\'Idaten', + 'poissons volants d\'Idaten', + ], + '40557': [ + 'turbo tatsumaki', + 'turbos tatsumaki', + ], + '40558': 'shôshitsuki', + '40559': [ + 'poisson-guitare à tête de pelle', + 'poissons-guitares à tête de pelle', + ], + '40560': 'Ruriryû', + '40561': [ + 'touffe de varech de Rubis', + 'touffes de varech de Rubis', + ], + '40562': [ + 'calmar des récifs', + 'calmars des récifs', + ], + '40563': [ + 'flet à écorce', + 'flets à écorce', + ], + '40564': [ + 'murène hagoromo', + 'murènes hagoromo', + ], + '40565': [ + 'gobie valet', + 'gobies valets', + ], + '40566': 'sambaso', + '40567': [ + 'langouste monture', + 'langoustes montures', + ], + '40568': [ + 'gardien saphir', + 'gardiens saphirs', + ], + '40569': [ + 'anguille-serpent spectrale', + 'anguilles-serpents spectrales', + ], + '40570': [ + 'requin-tigre céleste', + 'requins-tigres célestes', + ], + '40571': [ + 'calmar fugace', + 'calmars fugaces', + ], + '40572': [ + 'langouste archère', + 'langoustes archères', + ], + '40573': [ + 'holothurie rayée', + 'holothuries rayées', + ], + '40574': [ + 'poulpe senbei', + 'poulpes senbei', + ], + '40575': [ + 'requin octopophage', + 'requins octopophages', + ], + '40576': [ + 'lompe de Bekko', + 'lompes de Bekko', + ], + '40577': [ + 'iris jaune', + 'iris jaunes', + ], + '40578': [ + 'gardien rubis', + 'gardiens rubis', + ], + '40579': [ + 'toutenon', + 'toutenons', + ], + '40580': [ + 'pince-des-enfers', + 'pinces-des-enfers', + ], + '40581': [ + 'carpe herabuna', + 'carpes herabuna', + ], + '40582': [ + 'crapet arlequin garlemaldais', + 'crapets arlequins garlemaldais', + ], + '40583': [ + 'trionyx yanxien', + 'trionyx yanxiens', + ], + '40584': [ + 'saumon princesse', + 'saumons princesses', + ], + '40585': [ + 'orphie calligraphe', + 'orphies calligraphes', + ], + '40586': [ + 'crevette de la Muni', + 'crevettes de la Muni', + ], + '40587': [ + 'carpe de brocart', + 'carpes de brocart', + ], + '40588': [ + 'esturgeon yanxien', + 'esturgeons yanxiens', + ], + '40589': [ + 'kotsu zetsu spectral', + 'kotsu zetsu spectraux', + ], + '40590': [ + 'requin d\'herbiers', + 'requins d\'herbiers', + ], + '40591': [ + 'crevette Gensui', + 'crevettes Gensui', + ], + '40592': 'Yato-no-Kami', + '40593': [ + 'anguille du Héron', + 'anguilles du Héron', + ], + '40594': [ + 'moule perlière', + 'moules perlières', + ], + '40595': [ + 'gobie yanxien', + 'gobies yanxiens', + ], + '40596': [ + 'truite iridescente', + 'truites iridescentes', + ], + '40597': 'primo-Namazu', + '40598': 'gakugyo', + '40599': 'ginrin goshiki', + '40600': [ + 'joyau de printemps', + 'joyaux de printemps', + ], }, 'ja': { '4776': 'マルムケルプ', @@ -15693,6 +16604,92 @@ const data: FisherData = { '38836': 'アンテイア・ダーリア', '38935': 'ジンガ', '39240': 'ピュッリノス', + '39879': 'オニキスナイフフィッシュ', + '39880': 'トラーナの目付役', + '39881': 'ドンドルドン', + '39882': 'エー・ファン', + '39883': 'ゴールデン・デルモゲニー', + '39912': 'イージス・オブ・ハルオーネ', + '40521': 'ピンクシュリンプ', + '40522': 'セイレーンムセル', + '40523': 'アロウヘッド', + '40524': 'ディープサーディン', + '40525': 'シンギングマレ', + '40526': 'セルキーパファー', + '40527': '詩人のオカリナ', + '40528': 'マタンガスイマー', + '40529': 'スペクトラルシーラカンス', + '40530': 'ダスキーシャーク', + '40531': '人魚の鱗', + '40532': 'ブロードヘッド', + '40533': 'ビビッドピンクシュリンプ', + '40534': 'ディープシーラカンス', + '40535': 'セイレーンの吐息', + '40536': 'ブラックヘリコプリオン', + '40537': 'オクトパスインポスター', + '40538': 'ジェイドマンティス', + '40539': 'ニメーヤの紡車', + '40540': 'タニファ', + '40541': 'クガネニシン', + '40542': 'ウズマキサザエ', + '40543': '斑海老', + '40544': 'ヤリイカ', + '40545': '火袋海月', + '40546': 'マダラタツ', + '40547': 'ハタタテハゼ', + '40548': 'ネズミザメ', + '40549': '幻海求仙', + '40550': '水引魚', + '40551': 'コバンウツボ', + '40552': '宝彩海老', + '40553': 'ドクヒラアジ', + '40554': 'ケンサキイカ', + '40555': 'ヨロイウオ', + '40556': 'イダテントビウオ', + '40557': 'タツマキサザエ', + '40558': 'ショウシツキ', + '40559': 'サカタザメ', + '40560': '瑠璃龍', + '40561': 'ベニコンブ', + '40562': 'アオリイカ', + '40563': 'マツカワガレイ', + '40564': 'ハゴロモウツボ', + '40565': 'シスイハゼ', + '40566': 'サンバソウ', + '40567': '馬海老', + '40568': '蒼の仁王', + '40569': '幻海大蛇', + '40570': 'アメノトラ', + '40571': 'バショウイカ', + '40572': '弓馬海老', + '40573': 'オハグロナマコ', + '40574': 'センベイダコ', + '40575': 'タコクイ', + '40576': 'ベッコウダンゴウオ', + '40577': '黄菖蒲', + '40578': '紅の仁王', + '40579': 'オオスルメイカ', + '40580': '獄之蟹', + '40581': 'ヘラブナ', + '40582': 'ガレアンギル', + '40583': 'ヤンサスッポン', + '40584': 'ヒメマス', + '40585': '墨鱗魚', + '40586': '無二海老', + '40587': '錦鯉', + '40588': 'ヤンサチョウザメ', + '40589': '幻海骨舌', + '40590': '茂鮫', + '40591': '玄水海老', + '40592': 'ヤトノカミ', + '40593': 'アオサギウナギ', + '40594': '烏貝', + '40595': 'ムニゴビー', + '40596': 'ニジマス', + '40597': 'モドリナマズオ', + '40598': '鰐魚', + '40599': '銀鱗五色', + '40600': '梅泉宝亀', }, 'ko': { '4776': '말름미역', @@ -19869,6 +20866,8 @@ const data: FisherData = { 36409, 36410, 36411, + 39879, + 39912, ], '4057': [ 36397, @@ -19918,6 +20917,7 @@ const data: FisherData = { 36438, 36439, 36440, + 39880, ], '4064': [ 36436, @@ -19949,6 +20949,7 @@ const data: FisherData = { 36453, 36454, 36686, + 39881, ], '4068': [ 35606, @@ -20000,6 +21001,7 @@ const data: FisherData = { 36481, 36485, 39240, + 39883, ], '4075': [ 35607, @@ -20028,6 +21030,7 @@ const data: FisherData = { 36495, 36496, 36497, + 39882, ], '4079': [ 36499, @@ -20091,6 +21094,102 @@ const data: FisherData = { 36503, 36505, ], + '4367': [ + 40521, + 40522, + 40523, + 40524, + 40525, + 40526, + 40527, + 40528, + 40529, + 40530, + ], + '4368': [ + 40531, + 40532, + 40533, + 40534, + 40535, + 40536, + 40537, + 40538, + 40539, + 40540, + ], + '4369': [ + 40541, + 40542, + 40543, + 40544, + 40545, + 40546, + 40547, + 40548, + 40549, + 40550, + ], + '4370': [ + 40551, + 40552, + 40553, + 40554, + 40555, + 40556, + 40557, + 40558, + 40559, + 40560, + ], + '4371': [ + 40561, + 40562, + 40563, + 40564, + 40565, + 40566, + 40567, + 40568, + 40569, + 40570, + ], + '4372': [ + 40571, + 40572, + 40573, + 40574, + 40575, + 40576, + 40577, + 40578, + 40579, + 40580, + ], + '4373': [ + 40581, + 40582, + 40583, + 40584, + 40585, + 40586, + 40587, + 40588, + 40589, + 40590, + ], + '4374': [ + 40591, + 40592, + 40593, + 40594, + 40595, + 40596, + 40597, + 40598, + 40599, + 40600, + ], }, 'places': { 'cn': { @@ -20382,6 +21481,11 @@ const data: FisherData = { '4081': '湖癸辛', '4082': '湖丙α', '4083': '湖丙β', + '4191': '至福乐土农业区', + '4192': '至福乐土海洋区α', + '4193': '至福乐土海洋区β', + '4194': '至福乐土游乐区α', + '4195': '至福乐土游乐区β', }, 'de': { '28': [ @@ -21553,6 +22657,38 @@ const data: FisherData = { 'Elysischer Vergnügungssektorβ', 'im Elysischen Vergnügungssektor β', ], + '4367': [ + 'Sirenen-See - Hochsee', + 'in der Sirenen-See - Hochsee', + ], + '4368': [ + 'Sirenen-See - Phantomströmung', + 'in der Sirenen-See - Phantomströmung', + ], + '4369': [ + 'Kugane-Küste', + 'an der Kugane-Küste', + ], + '4370': [ + 'Kugane-Küste - Phantomströmung', + 'an der Kugane-Küste - Phantomströmung', + ], + '4371': [ + 'Rubinsee - Hochsee', + 'in der Rubinsee - Hochsee', + ], + '4372': [ + 'Rubinsee - Phantomströmung', + 'in der Rubinsee - Phantomströmung', + ], + '4373': [ + 'Einzig (Unterlauf)', + 'im Einzig (Unterlauf)', + ], + '4374': [ + 'Einzig - Phantomströmung', + 'im Einzig - Phantomströmung', + ], }, 'en': { '28': 'Limsa Lominsa upper decks', @@ -21848,6 +22984,14 @@ const data: FisherData = { '4193': 'Elysian Seas β', '4194': 'Elysian Playgrounds α', '4195': 'Elysian Playgrounds β', + '4367': 'open Sirensong Sea', + '4368': 'Sirensong spectral current', + '4369': 'Kugane coast', + '4370': 'Kugane spectral current', + '4371': 'open Ruby Sea', + '4372': 'Ruby spectral current', + '4373': 'lower One River', + '4374': 'One River spectral current', }, 'fr': { '28': 'Limsa Lominsa - Le Tillac', @@ -22143,6 +23287,14 @@ const data: FisherData = { '4193': 'Mers élyséennes β', '4194': 'Terrains de jeu élyséens α', '4195': 'Terrains de jeu élyséens β', + '4367': 'Large de la Mer du Chant des sirènes', + '4368': 'Courant spectral (large de la Mer du Chant des sirènes)', + '4369': 'Large de la baie de Kugane', + '4370': 'Courant spectral (large de la baie de Kugane)', + '4371': 'Large de la Mer de Rubis', + '4372': 'Courant spectral (large de la Mer de Rubis)', + '4373': 'Aval de la Muni', + '4374': 'Courant spectral (aval de la Muni)', }, 'ja': { '28': 'リムサ・ロミンサ：上甲板層', @@ -22438,6 +23590,14 @@ const data: FisherData = { '4193': 'エリュシオン海洋区画β', '4194': 'エリュシオン遊園区画α', '4195': 'エリュシオン遊園区画β', + '4367': 'セイレーン海沖合', + '4368': 'セイレーン海沖合：幻海流', + '4369': 'クガネ沖合', + '4370': 'クガネ沖合：幻海流', + '4371': '紅玉海沖合', + '4372': '紅玉海沖合：幻海流', + '4373': '無二江下流', + '4374': '無二江下流：幻海流', }, 'ko': { '28': '림사 로민사 상층 갑판', @@ -23304,7 +24464,7 @@ const data: FisherData = { '27587': 'boulette de crabe voleur', '27588': 'vairon court à bec', '27589': 'boîte à insectes', - '27590': 'tranche de chair de calmar', + '27590': 'poignée de chair de calmar', '27591': 'appât universel d\'eau douce', '27592': 'appât universel d\'eau de mer', '28634': 'leurre métallique', @@ -23322,7 +24482,7 @@ const data: FisherData = { '36590': 'cuiller céleste', '36591': 'éphémère', '36592': 'boulette de crevette', - '36593': 'tranche de chair de maquereau', + '36593': 'poignée de chair de maquereau', '36594': 'ver gris', '36595': 'ver chimérique', '36596': 'leurre angoissant', @@ -23997,7 +25157,6 @@ const data: FisherData = { '36506': 1, '36508': 2, '36509': 1, - '36510': 2, '36511': 2, '36512': 2, '36513': 2, diff --git a/util/gen_zone_id_and_info.py b/util/gen_zone_id_and_info.py index 23350c8efad..22dd4304172 100644 --- a/util/gen_zone_id_and_info.py +++ b/util/gen_zone_id_and_info.py @@ -32,6 +32,7 @@ "TheWhorleaterUnreal": 972, "UltimasBaneUnreal": 1035, "ContainmentBayS1T7Unreal": 1090, + "ContainmentBayP1T6Unreal": 1121, "TheMaskedCarnivale": 796, # 6.2 revamp "Snowcloak61": 371, @@ -48,6 +49,12 @@ "TheAntitower62": 516, "TheGreatGubalLibrary62": 416, "Xelphatol62": 572, + # 6.4 revamp + "AlaMhigo63": 689, + "BardamsMettle63": 623, + "CastrumAbania63": 661, + "DomaCastle63": 660, + "TheSirensongSea63": 626, } synthetic_zone_info = { @@ -129,6 +136,21 @@ "sizeFactor": 400, "weatherRate": 66, }, + 1121: { + "contentType": 4, + "exVersion": 4, + "name": { + 'cn': '索菲娅幻巧战', + 'de': 'Traumprüfung - Sophia', + 'en': 'Containment Bay P1T6 (Unreal)', + 'fr': 'Unité de contention P1P6 (irréel)', + 'ja': '幻女神ソフィア討滅戦', + }, + "offsetX": 0, + "offsetY": 0, + "sizeFactor": 400, + "weatherRate": 69, + }, # 6.2 revamp 143: { "contentType": 4, @@ -420,6 +442,10 @@ def generate_name_data(territory_map, cfc_map, place_name_map): cfc_names = set() collision_names = set() + synthetic_id_to_name = {} + for name, id in synthetic_ids.items(): + synthetic_id_to_name[id] = name + # Build territory name to cfc id map. Collisions have value None. territory_to_cfc = {} for cfc_id, cfc in cfc_map.items(): @@ -497,14 +523,20 @@ def generate_name_data(territory_map, cfc_map, place_name_map): territory_to_cfc_map[territory_id] = cfc_id_for_name - map[name_key] = int(territory_id) + # If this matches with a synthetic id, add it under the modified name. + territory_id_num = int(territory_id) + if territory_id_num in synthetic_id_to_name: + map[synthetic_id_to_name[territory_id_num]] = territory_id_num + else: + map[name_key] = int(territory_id) for name, id in known_ids.items(): if not name in map: raise Exception("Missing known item", name) + # These should have been added already above if we found them, but add any extra if not. for name, id in synthetic_ids.items(): - if name in map: + if name in map and map[name] != id: raise Exception("Conflicting synthetic item", name) map[name] = id