From 8763d09c8e705587da82df8528c4d36aa055b196 Mon Sep 17 00:00:00 2001 From: Anna Date: Sun, 15 Jan 2023 13:25:56 -0500 Subject: [PATCH] feat: update for 6.3 --- .../RemotePartyFinder.csproj | 4 +- csharp/RemotePartyFinder/packages.lock.json | 8 +- csharp/SourceGenerator/Program.cs | 11 +- csharp/SourceGenerator/SourceGenerator.csproj | 8 +- server/src/ffxiv.rs | 12 +- server/src/ffxiv/auto_translate.rs | 654 ++++++++++++++---- server/src/ffxiv/duties.rs | 322 ++++++++- server/src/ffxiv/roulettes.rs | 2 +- server/src/ffxiv/territory_names.rs | 188 +++-- server/src/ffxiv/treasure_maps.rs | 16 +- 10 files changed, 1017 insertions(+), 208 deletions(-) diff --git a/csharp/RemotePartyFinder/RemotePartyFinder.csproj b/csharp/RemotePartyFinder/RemotePartyFinder.csproj index b8fdbd4..564a265 100644 --- a/csharp/RemotePartyFinder/RemotePartyFinder.csproj +++ b/csharp/RemotePartyFinder/RemotePartyFinder.csproj @@ -2,7 +2,7 @@ 1.0.8 - net6.0-windows + net7.0-windows false true true @@ -40,7 +40,7 @@ - + diff --git a/csharp/RemotePartyFinder/packages.lock.json b/csharp/RemotePartyFinder/packages.lock.json index 9628a11..2426061 100644 --- a/csharp/RemotePartyFinder/packages.lock.json +++ b/csharp/RemotePartyFinder/packages.lock.json @@ -1,12 +1,12 @@ { "version": 1, "dependencies": { - "net6.0-windows7.0": { + "net7.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[2.1.8, )", - "resolved": "2.1.8", - "contentHash": "YqagNXs9InxmqkXzq7kLveImxnodkBEicAhydMXVp7dFjC7xb76U6zGgAax4/BWIWfZeWzr5DJyQSev31kj81A==" + "requested": "[2.1.10, )", + "resolved": "2.1.10", + "contentHash": "S6NrvvOnLgT4GDdgwuKVJjbFo+8ZEj+JsEYk9ojjOR/MMfv1dIFpT8aRJQfI24rtDcw1uF+GnSSMN4WW1yt7fw==" } } } diff --git a/csharp/SourceGenerator/Program.cs b/csharp/SourceGenerator/Program.cs index 87da63d..b4ac76f 100644 --- a/csharp/SourceGenerator/Program.cs +++ b/csharp/SourceGenerator/Program.cs @@ -16,6 +16,7 @@ namespace SourceGenerator { var data = new Dictionary(4); foreach (var lang in Languages.Keys) { data[lang] = new GameData(args[0], new LuminaOptions { + PanicOnSheetChecksumMismatch = false, DefaultExcelLanguage = lang, }); } @@ -107,7 +108,7 @@ namespace SourceGenerator { sb.Append("#[repr(u32)]\n"); sb.Append("pub enum ContentKind {\n"); foreach (var kind in this.Data[Language.English].GetExcelSheet()!) { - var name = kind.Name.TextValue().Replace(" ", ""); + var name = kind.Name.TextValue().Replace(" ", "").Replace("&", ""); if (name.Length > 0) { sb.Append($" {name} = {kind.RowId},\n"); } @@ -121,7 +122,7 @@ namespace SourceGenerator { sb.Append(" fn from_u32(kind: u32) -> Self {\n"); sb.Append(" match kind {\n"); foreach (var kind in this.Data[Language.English].GetExcelSheet()!) { - var name = kind.Name.TextValue().Replace(" ", ""); + var name = kind.Name.TextValue().Replace(" ", "").Replace("&", ""); if (name.Length > 0) { sb.Append($" {kind.RowId} => Self::{name},\n"); } @@ -134,7 +135,7 @@ namespace SourceGenerator { sb.Append(" pub fn as_u32(self) -> u32 {\n"); sb.Append(" match self {\n"); foreach (var kind in this.Data[Language.English].GetExcelSheet()!) { - var name = kind.Name.TextValue().Replace(" ", ""); + var name = kind.Name.TextValue().Replace(" ", "").Replace("&", ""); if (name.Length > 0) { sb.Append($" Self::{name} => {kind.RowId},\n"); } @@ -238,7 +239,7 @@ namespace SourceGenerator { continue; } - var pvp = cr.Unknown28 == 6 + var pvp = cr.IsPvP ? "true" : "false"; @@ -393,7 +394,7 @@ namespace SourceGenerator { lines += 1; break; } - } + } } } diff --git a/csharp/SourceGenerator/SourceGenerator.csproj b/csharp/SourceGenerator/SourceGenerator.csproj index 031b84c..51d507a 100644 --- a/csharp/SourceGenerator/SourceGenerator.csproj +++ b/csharp/SourceGenerator/SourceGenerator.csproj @@ -2,14 +2,14 @@ Exe - net6.0 + net7.0 enable - - - + + + diff --git a/server/src/ffxiv.rs b/server/src/ffxiv.rs index 851e2c8..a5d6514 100644 --- a/server/src/ffxiv.rs +++ b/server/src/ffxiv.rs @@ -80,7 +80,7 @@ impl Language { "ja" => return Self::Japanese, "de" => return Self::German, "fr" => return Self::French, - _ => {}, + _ => {} } } @@ -337,6 +337,16 @@ mod old { high_end: true, content_kind: ContentKind::Trials, }, + 875 => DutyInfo { + name: LocalisedText { + en: "Containment Bay S1T7 (Unreal)", + ja: "幻魔神セフィロト討滅戦", + de: "Traumprüfung - Sephirot", + fr: "Unité de contention S1P7 (irréel)", + }, + high_end: true, + content_kind: ContentKind::Trials, + }, }; pub static ref OLD_ROULETTES: HashMap = maplit::hashmap! { diff --git a/server/src/ffxiv/auto_translate.rs b/server/src/ffxiv/auto_translate.rs index 4ea0ede..d9dc952 100644 --- a/server/src/ffxiv/auto_translate.rs +++ b/server/src/ffxiv/auto_translate.rs @@ -871,7 +871,7 @@ lazy_static::lazy_static! { en: "My hands are full.", ja: "手が離せません。", de: "Ich kann hier gerade nicht weg.", - fr: "Je suis occupé avec autre chose.", + fr: "Je suis occupé(e).", }, (5, 523) => LocalisedText { en: "We're chewing the fat.", @@ -3493,13 +3493,13 @@ lazy_static::lazy_static! { en: "The Claws", ja: "チーム・クロウ", de: "Klauen", - fr: "les Griffes", + fr: "Griffes", }, (18, 1455) => LocalisedText { en: "The Fangs", ja: "チーム・ファング", de: "Fänge", - fr: "les Crocs", + fr: "Crocs", }, (18, 1456) => LocalisedText { en: "medal", @@ -4291,13 +4291,13 @@ lazy_static::lazy_static! { en: "white crafters' scrip", ja: "クラフタースクリップ:白貨", de: "Weißer Handwerkerschein", - fr: "assignat blanc d'artisan", + fr: "assignats blancs d'artisan", }, (22, 1650) => LocalisedText { en: "white gatherers' scrip", ja: "ギャザラースクリップ:白貨", de: "Weißer Sammlerschein", - fr: "assignat blanc de récolteur", + fr: "assignats blancs de récolteur", }, (22, 1651) => LocalisedText { en: "quick gathering", @@ -4365,6 +4365,12 @@ lazy_static::lazy_static! { de: "Grüne Cieldaläen-Kauri", fr: "assignats insulaires émeraude", }, + (22, 1662) => LocalisedText { + en: "gatherer role action", + ja: "ギャザラーロールアクション", + de: "Sammler-Rollenkommando", + fr: "action de récolte", + }, (23, 1900) => LocalisedText { en: "【Primals】", ja: "【蛮神&蛮族】", @@ -4707,6 +4713,18 @@ lazy_static::lazy_static! { de: "Hydaelyn", fr: "Hydaelyn", }, + (23, 1957) => LocalisedText { + en: "Omicron", + ja: "オミクロン", + de: "Omikron", + fr: "Omicron", + }, + (23, 1958) => LocalisedText { + en: "Barbariccia", + ja: "バルバリシア", + de: "Barbarizia", + fr: "Barbariccia", + }, (24, 2000) => LocalisedText { en: "【Duty】", ja: "【コンテンツ】", @@ -4861,19 +4879,19 @@ lazy_static::lazy_static! { en: "The Thousand Maws of Toto-Rak", ja: "トトラクの千獄", de: "Tausend Löcher von Toto-Rak", - fr: "Les Mille Gueules de Toto-Rak", + fr: "Mille Gueules de Toto-Rak", }, (24, 2028) => LocalisedText { en: "The Tam-Tara Deepcroft", ja: "タムタラの墓所", de: "Totenacker Tam-Tara", - fr: "L'Hypogée de Tam-Tara", + fr: "Hypogée de Tam-Tara", }, (24, 2029) => LocalisedText { en: "Copperbell Mines", ja: "カッパーベル銅山", de: "Kupferglocken-Mine", - fr: "Les Mines de Clochecuivre", + fr: "Mines de Clochecuivre", }, (24, 2030) => LocalisedText { en: "Sastasha", @@ -4885,13 +4903,13 @@ lazy_static::lazy_static! { en: "The Aurum Vale", ja: "オーラムヴェイル", de: "Goldklamm", - fr: "Le Val d'Aurum", + fr: "Val d'Aurum", }, (24, 2032) => LocalisedText { en: "Haukke Manor", ja: "ハウケタ御用邸", de: "Haukke-Herrenhaus", - fr: "Le Manoir des Haukke", + fr: "Manoir des Haukke", }, (24, 2033) => LocalisedText { en: "Halatali", @@ -4903,43 +4921,43 @@ lazy_static::lazy_static! { en: "Brayflox's Longstop", ja: "ブレイフロクスの野営地", de: "Brüllvolx' Langrast", - fr: "Le Bivouac de Brayflox", + fr: "Bivouac de Brayflox", }, (24, 2035) => LocalisedText { en: "The Sunken Temple of Qarn", ja: "カルン埋没寺院", de: "Versunkener Tempel von Qarn", - fr: "Le Temple enseveli de Qarn", + fr: "Temple enseveli de Qarn", }, (24, 2036) => LocalisedText { en: "The Wanderer's Palace", ja: "ワンダラーパレス", de: "Palast des Wanderers", - fr: "Le Palais du Vagabond", + fr: "Palais du Vagabond", }, (24, 2037) => LocalisedText { en: "The Stone Vigil", ja: "ストーンヴィジル", de: "Steinerne Wacht", - fr: "Le Vigile de Pierre", + fr: "Vigile de Pierre", }, (24, 2038) => LocalisedText { en: "Cutter's Cry", ja: "カッターズクライ", de: "Sägerschrei", - fr: "Le Gouffre hurlant", + fr: "Gouffre hurlant", }, (24, 2039) => LocalisedText { en: "Dzemael Darkhold", ja: "ゼーメル要塞", de: "Feste Dzemael", - fr: "La Forteresse de Dzemael", + fr: "Forteresse de Dzemael", }, (24, 2040) => LocalisedText { en: "Amdapor Keep", ja: "古城アムダプール", de: "Die Ruinen von Amdapor", - fr: "Le Château d'Amdapor", + fr: "Chateau d'Amdapor", }, (24, 2041) => LocalisedText { en: "Castrum Meridianum", @@ -4951,7 +4969,7 @@ lazy_static::lazy_static! { en: "The Praetorium", ja: "魔導城プラエトリウム", de: "Castrum Meridianum - Praetorium", - fr: "Le Praetorium", + fr: "Praetorium", }, (24, 2043) => LocalisedText { en: "Basic Training: Enemy Parties", @@ -4999,7 +5017,7 @@ lazy_static::lazy_static! { en: "Flicking Sticks and Taking Names", ja: "爆弾魔ゴブリン軍団を撃滅せよ!", de: "Bombige Goblins", - fr: "Les Gobelins bombardiers", + fr: "Gobelins bombardiers", }, (24, 2051) => LocalisedText { en: "More than a Feeler", @@ -5041,13 +5059,13 @@ lazy_static::lazy_static! { en: "The Bowl of Embers (Normal)", ja: "イフリート討伐戦", de: "Grab der Lohe (normal)", - fr: "Le Cratère des tisons (normal)", + fr: "Cratère des tisons (normal)", }, (24, 2058) => LocalisedText { en: "The Navel (Normal)", ja: "タイタン討伐戦", de: "Der Nabel (normal)", - fr: "Le Nombril (normal)", + fr: "Nombril (normal)", }, (24, 2059) => LocalisedText { en: "The Howling Eye (Normal)", @@ -5059,13 +5077,13 @@ lazy_static::lazy_static! { en: "The Bowl of Embers (Hard)", ja: "真イフリート討滅戦", de: "Götterdämmerung - Ifrit", - fr: "Le Cratère des tisons (brutal)", + fr: "Cratère des tisons (brutal)", }, (24, 2061) => LocalisedText { en: "The Navel (Hard)", ja: "真タイタン討滅戦", de: "Götterdämmerung - Titan", - fr: "Le Nombril (brutal)", + fr: "Nombril (brutal)", }, (24, 2062) => LocalisedText { en: "The Howling Eye (Hard)", @@ -5083,25 +5101,25 @@ lazy_static::lazy_static! { en: "The Binding Coil of Bahamut", ja: "大迷宮バハムート", de: "Bahamuts Verschlungene Schatten", - fr: "Le Labyrinthe de Bahamut", + fr: "Labyrinthe de Bahamut", }, (24, 2065) => LocalisedText { en: "The Wolves' Den", ja: "ウルヴズジェイル", de: "Wolfshöhle (PvP)", - fr: "L'Antre des loups", + fr: "Antre des loups", }, (24, 2066) => LocalisedText { en: "The Bowl of Embers (Extreme)", ja: "極イフリート討滅戦", de: "Zenit der Götter - Ifrit", - fr: "Le Cratère des tisons (extrême)", + fr: "Cratère des tisons (extrême)", }, (24, 2067) => LocalisedText { en: "The Navel (Extreme)", ja: "極タイタン討滅戦", de: "Zenit der Götter - Titan", - fr: "Le Nombril (extrême)", + fr: "Nombril (extrême)", }, (24, 2068) => LocalisedText { en: "The Howling Eye (Extreme)", @@ -5113,31 +5131,31 @@ lazy_static::lazy_static! { en: "Thornmarch (Hard)", ja: "善王モグル・モグXII世討滅戦", de: "Königliche Konfrontation (schwer)", - fr: "La Lisière de ronces (brutal)", + fr: "Lisière de ronces (brutal)", }, (24, 2070) => LocalisedText { en: "The Minstrel's Ballad: Ultima's Bane", ja: "アルテマウェポン破壊作戦", de: "Heldenlied von Ultima", - fr: "Le fléau d'Ultima", + fr: "Fléau d'Ultima", }, (24, 2071) => LocalisedText { en: "Crystal Tower", ja: "クリスタルタワー", de: "Kristallturm", - fr: "La Tour de Cristal", + fr: "Tour de Cristal", }, (24, 2072) => LocalisedText { en: "The Binding Coil of Bahamut", ja: "邂逅編", de: "Bahamut 1 - Begegnung", - fr: "Le Labyrinthe de Bahamut I-V", + fr: "Labyrinthe de Bahamut I-V", }, (24, 2073) => LocalisedText { en: "Labyrinth of the Ancients", ja: "古代の民の迷宮", de: "Labyrinth der Alten", - fr: "Le Dédale antique", + fr: "Dédale antique", }, (24, 2074) => LocalisedText { en: "Decipher", @@ -5161,43 +5179,43 @@ lazy_static::lazy_static! { en: "The Second Coil of Bahamut", ja: "侵攻編", de: "Bahamut 2 - Vorstoß", - fr: "Les Méandres de Bahamut", + fr: "Méandres de Bahamut", }, (24, 2078) => LocalisedText { en: "Pharos Sirius", ja: "シリウス大灯台", de: "Pharos Sirius", - fr: "Le Phare de Sirius", + fr: "Phare de Sirius", }, (24, 2079) => LocalisedText { en: "Thornmarch (Extreme)", ja: "極王モグル・モグXII世討滅戦", de: "Königliche Konfrontation (extrem)", - fr: "La Lisière de ronces (extrême)", + fr: "Lisière de ronces (extrême)", }, (24, 2080) => LocalisedText { en: "The Whorleater (Hard)", ja: "真リヴァイアサン討滅戦", de: "Götterdämmerung - Leviathan", - fr: "Le Briseur de marées (brutal)", + fr: "Briseur de marées (brutal)", }, (24, 2081) => LocalisedText { en: "The Whorleater (Extreme)", ja: "極リヴァイアサン討滅戦", de: "Zenit der Götter - Leviathan", - fr: "Le Briseur de marées (extrême)", + fr: "Briseur de marées (extrême)", }, (24, 2082) => LocalisedText { en: "A Relic Reborn: The Chimera", ja: "ドルムキマイラ討伐戦", de: "Kampf gegen die Chimära", - fr: "La chimère dhorme du Coerthas", + fr: "Chimère dhorme du Coerthas", }, (24, 2083) => LocalisedText { en: "A Relic Reborn: The Hydra", ja: "ハイドラ討伐戦", de: "Kampf gegen die Hydra", - fr: "L'hydre d'Halatali", + fr: "hydre d'Halatali", }, (24, 2084) => LocalisedText { en: "Battle on the Big Bridge", @@ -5257,7 +5275,7 @@ lazy_static::lazy_static! { en: "The Lost City of Amdapor", ja: "古アムダプール市街", de: "Historisches Amdapor", - fr: "Les Vestiges de la cité d'Amdapor", + fr: "Vestiges de la cité d'Amdapor", }, (24, 2094) => LocalisedText { en: "Trials of the Braves", @@ -5287,37 +5305,37 @@ lazy_static::lazy_static! { en: "The Striking Tree (Hard)", ja: "真ラムウ討滅戦", de: "Götterdämmerung - Ramuh", - fr: "L'Arbre du jugement (brutal)", + fr: "Arbre du jugement (brutal)", }, (24, 2099) => LocalisedText { en: "The Striking Tree (Extreme)", ja: "極ラムウ討滅戦", de: "Zenit der Götter - Ramuh", - fr: "L'Arbre du jugement (extrême)", + fr: "Arbre du jugement (extrême)", }, (24, 2100) => LocalisedText { en: "Syrcus Tower", ja: "シルクスの塔", de: "Syrcus-Turm", - fr: "La Tour de Syrcus", + fr: "Tour de Syrcus", }, (24, 2101) => LocalisedText { en: "The Second Coil of Bahamut (Savage)", ja: "大迷宮バハムート零式", de: "Bahamut 2 - Epischer Vorstoß", - fr: "Les Méandres de Bahamut (sadique)", + fr: "Méandres de Bahamut (sadique)", }, (24, 2102) => LocalisedText { en: "The Carteneau Flats", ja: "カルテノー平原", de: "Carteneauer Front", - fr: "La Plaine de Carteneau", + fr: "Plaine de Carteneau", }, (24, 2103) => LocalisedText { en: "Hullbreaker Isle", ja: "ハルブレーカー・アイル", de: "Schiffbrecher-Insel", - fr: "L'Île de Crèvecarène", + fr: "Île de Crèvecarène", }, (24, 2104) => LocalisedText { en: "Frontline", @@ -5335,19 +5353,19 @@ lazy_static::lazy_static! { en: "The Final Coil of Bahamut", ja: "真成編", de: "Verschlungene Schatten - Finale", - fr: "L'Abîme de Bahamut", + fr: "Abîme de Bahamut", }, (24, 2109) => LocalisedText { en: "The Akh Afah Amphitheatre (Hard)", ja: "真シヴァ討滅戦", de: "Götterdämmerung - Shiva", - fr: "L'Amphithéâtre d'Akh Afah (brutal)", + fr: "Amphithéâtre d'Akh Afah (brutal)", }, (24, 2110) => LocalisedText { en: "The Akh Afah Amphitheatre (Extreme)", ja: "極シヴァ討滅戦", de: "Zenit der Götter - Shiva", - fr: "L'Amphithéâtre d'Akh Afah (extrême)", + fr: "Amphithéâtre d'Akh Afah (extrême)", }, (24, 2111) => LocalisedText { en: "Snowcloak", @@ -5359,7 +5377,7 @@ lazy_static::lazy_static! { en: "The Dragon's Neck", ja: "アマジナ杯闘技会決勝戦", de: "Drachenhals-Kolosseum", - fr: "Le Col du dragon", + fr: "Col du dragon", }, (24, 2113) => LocalisedText { en: "delivery quest", @@ -5371,13 +5389,13 @@ lazy_static::lazy_static! { en: "Urth's Fount (Hard)", ja: "闘神オーディン討滅戦", de: "Jenseits Urths Quelle", - fr: "La Fontaine d'Urth", + fr: "Fontaine d'Urth", }, (24, 2115) => LocalisedText { en: "The World of Darkness", ja: "闇の世界", de: "Die Welt der Dunkelheit", - fr: "Le Monde des Ténèbres", + fr: "Monde des Ténèbres", }, (24, 2117) => LocalisedText { en: "The Borderland Ruins (Secure)", @@ -5425,13 +5443,13 @@ lazy_static::lazy_static! { en: "The Vault", ja: "イシュガルド教皇庁", de: "Erzbasilika", - fr: "La Voûte", + fr: "Voûte", }, (24, 2126) => LocalisedText { en: "The Fractal Continuum", ja: "フラクタル・コンティニアム", de: "Fraktal-Kontinuum", - fr: "Le Continuum fractal", + fr: "Continuum fractal", }, (24, 2127) => LocalisedText { en: "Dusk Vigil", @@ -5455,7 +5473,7 @@ lazy_static::lazy_static! { en: "The Aery", ja: "ドラゴンズエアリー", de: "Nest des Drachen", - fr: "L'Aire", + fr: "Aire", }, (24, 2131) => LocalisedText { en: "Thok ast Thok (Hard)", @@ -5473,13 +5491,13 @@ lazy_static::lazy_static! { en: "Limitless Blue (Hard)", ja: "真ビスマルク討滅戦", de: "Götterdämmerung - Bismarck", - fr: "L'Immensité bleue (brutal)", + fr: "Immensité bleue (brutal)", }, (24, 2134) => LocalisedText { en: "Limitless Blue (Extreme)", ja: "極ビスマルク討滅戦", de: "Zenit der Götter - Bismarck", - fr: "L'Immensité bleue (extrême)", + fr: "Immensité bleue (extrême)", }, (24, 2135) => LocalisedText { en: "Seal Rock (Seize)", @@ -5509,19 +5527,19 @@ lazy_static::lazy_static! { en: "The Chrysalis (Normal)", ja: "アシエン・ナプリアレス討伐戦", de: "Chrysalis (normal)", - fr: "La Chrysalide (normal)", + fr: "Chrysalide (normal)", }, (24, 2141) => LocalisedText { en: "The Steps of Faith (Normal)", ja: "皇都イシュガルド防衛戦", de: "Der Schicksalsweg (normal)", - fr: "Le Siège de la sainte Cité d'Ishgard (normal)", + fr: "Siège de la sainte Cité d'Ishgard (normal)", }, (24, 2142) => LocalisedText { en: "The Singularity Reactor (Normal)", ja: "ナイツ・オブ・ラウンド討滅戦", de: "Singularitäts-Reaktor (normal)", - fr: "Le Réacteur de singularité (normal)", + fr: "Réacteur de singularité (normal)", }, (24, 2143) => LocalisedText { en: "Temple leve", @@ -5557,7 +5575,7 @@ lazy_static::lazy_static! { en: "The Antitower", ja: "逆さの塔", de: "Antiturm", - fr: "L'Antitour", + fr: "Antitour", }, (24, 2149) => LocalisedText { en: "Midas", @@ -5599,7 +5617,7 @@ lazy_static::lazy_static! { en: "The Weeping City of Mhach", ja: "禁忌都市マハ", de: "Stadt der Tränen", - fr: "la Cité défendue de Mhach", + fr: "Cité défendue de Mhach", }, (24, 2157) => LocalisedText { en: "Deep Dungeon", @@ -5617,13 +5635,13 @@ lazy_static::lazy_static! { en: "The Final Steps of Faith", ja: "ニーズヘッグ征竜戦", de: "Der letzte Schicksalsweg", - fr: "La Dernière avancée de la Foi", + fr: "Dernière avancée de la Foi", }, (24, 2160) => LocalisedText { en: "The Minstrel's Ballad: Nidhogg's Rage", ja: "極ニーズヘッグ征竜戦", de: "Das Lied von Nidhoggs letztem Ruf", - fr: "L'ire de Nidhogg", + fr: "ire de Nidhogg", }, (24, 2161) => LocalisedText { en: "The Fields of Glory (Shatter)", @@ -5695,7 +5713,7 @@ lazy_static::lazy_static! { en: "Bardam's Mettle", ja: "バルダム覇道", de: "Bardams Probe", - fr: "La Force de Bardam", + fr: "Force de Bardam", }, (24, 2174) => LocalisedText { en: "Doma Castle", @@ -5773,7 +5791,7 @@ lazy_static::lazy_static! { en: "The Minstrel's Ballad: Shinryu's Domain", ja: "極神龍討滅戦", de: "Heldenlied von Shinryu", - fr: "Le domaine de Shinryu", + fr: "Domaine de Shinryu", }, (24, 2187) => LocalisedText { en: "alliance raid", @@ -6591,6 +6609,12 @@ lazy_static::lazy_static! { de: "Juedi", fr: "Juedi", }, + (49, 167) => LocalisedText { + en: "logistics node", + ja: "輸送システム", + de: "Logistikmodul", + fr: "module de transport sphérique", + }, (49, 168) => LocalisedText { en: "safeguard system", ja: "護送システム", @@ -6688,7 +6712,7 @@ lazy_static::lazy_static! { fr: "hirondelle d'Eurêka", }, (49, 185) => LocalisedText { - en: "magitek avenger A-1", + en: "magitek avenger A1", ja: "魔導アヴェンジャー寒冷地仕様", de: "Kälteresistenter Magitek-Rächer", fr: "vengeur magitek anti-froid", @@ -7149,6 +7173,12 @@ lazy_static::lazy_static! { de: "Garlond GL-II", fr: "Garlond GL-II", }, + (49, 279) => LocalisedText { + en: "mechanical lotus", + ja: "絡繰蓮華", + de: "Lotusflitzer", + fr: "lotus mécanique", + }, (49, 280) => LocalisedText { en: "Fylgja", ja: "フィルギャ", @@ -7167,6 +7197,12 @@ lazy_static::lazy_static! { de: "Pod 602", fr: "pod 602", }, + (49, 286) => LocalisedText { + en: "island alligator", + ja: "アイランド・アリゲーター", + de: "Insel-Alligator", + fr: "alligator insulaire", + }, (49, 287) => LocalisedText { en: "hippo cart", ja: "ヒッポカート", @@ -7197,12 +7233,30 @@ lazy_static::lazy_static! { de: "Megashiba", fr: "mégashiba", }, + (49, 298) => LocalisedText { + en: "Miw Miisv", + ja: "ミゥ・ミーシュ", + de: "Miw Miisv", + fr: "miw miisv", + }, (49, 299) => LocalisedText { en: "wondrous lanner", ja: "ワンダラスラナー", de: "Wunderlanner", fr: "lanier merveilleux", }, + (49, 303) => LocalisedText { + en: "Sil'dihn throne", + ja: "シラディン・スローン", + de: "Thron von Sil'dih", + fr: "trône sildien", + }, + (49, 304) => LocalisedText { + en: "silkie", + ja: "シルキー", + de: "Silkie", + fr: "Silkie", + }, (49, 305) => LocalisedText { en: "sunforged", ja: "炎霊獣", @@ -7215,6 +7269,48 @@ lazy_static::lazy_static! { de: "Sturmwind-Luchs", fr: "lynx des vents tempétueux", }, + (49, 311) => LocalisedText { + en: "Anden III", + ja: "アンデンIII世", + de: "Anden III.", + fr: "Anden III", + }, + (49, 312) => LocalisedText { + en: "Blackjack", + ja: "ブラックジャック号", + de: "Black Jack", + fr: "Blackjack", + }, + (49, 313) => LocalisedText { + en: "Phaethon", + ja: "ファエトン", + de: "Phaethon", + fr: "Phaéton", + }, + (49, 314) => LocalisedText { + en: "Pinky", + ja: "ピンキー", + de: "Pinky", + fr: "Pinky", + }, + (49, 315) => LocalisedText { + en: "lynx of righteous fire", + ja: "リンクス・オブ・ファイア", + de: "Fegefeuer-Luchs", + fr: "lynx du brasier flamboyant", + }, + (49, 316) => LocalisedText { + en: "magitek avenger G1", + ja: "魔導アヴェンジャー黄金像仕様", + de: "Vergoldeter Magitek-Rächer", + fr: "vengeur magitek doré", + }, + (49, 317) => LocalisedText { + en: "Chrysomallos", + ja: "クリュソマロス", + de: "Chrysomallos", + fr: "Chrysomallos", + }, (50, 1) => LocalisedText { en: "gladiator", ja: "剣術士", @@ -9705,6 +9801,12 @@ lazy_static::lazy_static! { de: "Vanaspati", fr: "Vanaspati", }, + (51, 4042) => LocalisedText { + en: "Elysion", + ja: "エリュシオン", + de: "Elysium", + fr: "Élysée", + }, (51, 4043) => LocalisedText { en: "Unnamed Island", ja: "名もなき島", @@ -9729,6 +9831,12 @@ lazy_static::lazy_static! { de: "Wolke Sieben", fr: "Le Petit Nuage", }, + (51, 4093) => LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, (51, 4098) => LocalisedText { en: "Medias Res", ja: "詩想空間", @@ -9807,6 +9915,18 @@ lazy_static::lazy_static! { de: "Separationstrakt für pflanzliche Lebensformen", fr: "Bloc des créations arborescentes", }, + (51, 4199) => LocalisedText { + en: "The Sil'dihn Subterrane", + ja: "シラディハ水道", + de: "Unterstadt von Sil'dih", + fr: "Canalisations sildiennes", + }, + (51, 4227) => LocalisedText { + en: "Another Sil'dihn Subterrane", + ja: "異聞シラディハ水道", + de: "Kuriose Unterstadt von Sil'dih", + fr: "Canalisations sildiennes annexes", + }, (51, 4249) => LocalisedText { en: "The Caustic Purgatory", ja: "猛毒生物隔離棟", @@ -9819,6 +9939,30 @@ lazy_static::lazy_static! { de: "Forschungstrakt für die Geheimnisse des Lebens", fr: "Laboratoire d'études des secrets du vivant", }, + (51, 4258) => LocalisedText { + en: "Euphrosyne", + ja: "喜びの神域 エウプロシュネ", + de: "Euphrosyne", + fr: "Domaine divin - Euphrosyne", + }, + (51, 4270) => LocalisedText { + en: "Lapis Manalis", + ja: "ラピス・マナリス", + de: "Lapis Manalis", + fr: "Lapis Manalis", + }, + (51, 4287) => LocalisedText { + en: "The Shifting Gymnasion Agonon", + ja: "エルピス・ギュムナシオン祭殿", + de: "Gymnasion Agonon", + fr: "Elpis Gymnasion", + }, + (51, 4289) => LocalisedText { + en: "Mount Ordeals", + ja: "試練の山", + de: "Berg der Tortur", + fr: "Mont du Supplice", + }, (54, 1) => LocalisedText { en: "Halone, the Fury", ja: "ハルオーネ", @@ -10077,6 +10221,12 @@ lazy_static::lazy_static! { de: "Halones Groll", fr: "Rage de Halone", }, + (56, 22) => LocalisedText { + en: "Bulwark", + ja: "ブルワーク", + de: "Bollwerk", + fr: "Forteresse", + }, (56, 23) => LocalisedText { en: "Circle of Scorn", ja: "サークル・オブ・ドゥーム", @@ -11145,6 +11295,12 @@ lazy_static::lazy_static! { de: "Wildfeuer", fr: "Flambée", }, + (56, 2887) => LocalisedText { + en: "Dismantle", + ja: "ウェポンブレイク", + de: "Zerlegen", + fr: "Brise-arme", + }, (56, 2890) => LocalisedText { en: "Ricochet", ja: "リコシェット", @@ -14991,6 +15147,66 @@ lazy_static::lazy_static! { de: "Tripelhaken", fr: "Ferrage triple", }, + (56, 29729) => LocalisedText { + en: "Variant Cure", + ja: "ヴァリアント・ケアル", + de: "Unstetes Vita", + fr: "Soin embranché", + }, + (56, 29730) => LocalisedText { + en: "Variant Ultimatum", + ja: "ヴァリアント・アルティメイタム", + de: "Unstetes Ultimatum", + fr: "Ultimatum embranché", + }, + (56, 29731) => LocalisedText { + en: "Variant Raise", + ja: "ヴァリアント・レイズ", + de: "Unstetes Wiederbeleben", + fr: "Vie embranchée", + }, + (56, 29732) => LocalisedText { + en: "Variant Spirit Dart", + ja: "ヴァリアント・スピリットダート", + de: "Unsteter Geistpfeil", + fr: "Flèche spirituelle embranchée", + }, + (56, 29733) => LocalisedText { + en: "Variant Rampart", + ja: "ヴァリアント・ランパート", + de: "Unsteter Schutzwall", + fr: "Rempart embranché", + }, + (56, 29734) => LocalisedText { + en: "Variant Raise II", + ja: "ヴァリアント・レイズII", + de: "Unstetes Wiederbeleben II", + fr: "Vie embranchée II", + }, + (56, 32065) => LocalisedText { + en: "Release Iron Will", + ja: "アイアンウィル解除", + de: "Bruch des Schild-Eids", + fr: "Dissipe Volonté de fer", + }, + (56, 32066) => LocalisedText { + en: "Release Defiance", + ja: "ディフェンダー解除", + de: "Bruch des Verteidigers", + fr: "Dissipe Défi", + }, + (56, 32067) => LocalisedText { + en: "Release Grit", + ja: "グリットスタンス解除", + de: "Bruch der Zähigkeit", + fr: "Dissipe Férocité", + }, + (56, 32068) => LocalisedText { + en: "Release Royal Guard", + ja: "ロイヤルガード解除", + de: "Bruch des Leibgardisten", + fr: "Dissipe Garde royale", + }, (57, 100001) => LocalisedText { en: "Basic Synthesis", ja: "作業", @@ -16083,6 +16299,12 @@ lazy_static::lazy_static! { de: "Abenteurerpass", fr: "Carte de personnage", }, + (61, 94) => LocalisedText { + en: "V&C Dungeon Finder", + ja: "特殊ダンジョン探索", + de: "Gewölbesuche", + fr: "Donjons spéciaux", + }, (62, 1) => LocalisedText { en: "/record", ja: "/replay", @@ -16305,6 +16527,24 @@ lazy_static::lazy_static! { de: "/abenteurerpass", fr: "/cartepersonnage", }, + (62, 39) => LocalisedText { + en: "/rclickpc", + ja: "/rclickpc", + de: "/rklickpc", + fr: "/clicdroitpj", + }, + (62, 40) => LocalisedText { + en: "/rclickbattlenpc", + ja: "/rclickbattlenpc", + de: "/rklickkampfnpc", + fr: "/clicdroitpnj", + }, + (62, 41) => LocalisedText { + en: "/rclickminion", + ja: "/rclickminion", + de: "/rklickbegleiter", + fr: "/clicdroitmascotte", + }, (62, 91) => LocalisedText { en: "/pvpteam", ja: "/pvpteam", @@ -17175,12 +17415,6 @@ lazy_static::lazy_static! { de: "/reit", fr: "/monture", }, - (62, 272) => LocalisedText { - en: "/additionalaction", - ja: "/additionalaction", - de: "/ergkmd", - fr: "/actionrôle", - }, (62, 273) => LocalisedText { en: "/generalaction", ja: "/generalaction", @@ -17199,12 +17433,6 @@ lazy_static::lazy_static! { de: "/statusaus", fr: "/annuleffet", }, - (62, 276) => LocalisedText { - en: "/addpvpaction", - ja: "/addpvpaction", - de: "/pluspvpkmd", - fr: "/ajoutactionjcj", - }, (62, 277) => LocalisedText { en: "/pvpaction", ja: "/pvpaction", @@ -18729,12 +18957,36 @@ lazy_static::lazy_static! { de: "/linkszeigen", fr: "/montrergauche", }, + (62, 646) => LocalisedText { + en: "/deride", + ja: "/deride", + de: "/verhöhnen", + fr: "/montrersoncôtérebelle", + }, + (62, 647) => LocalisedText { + en: "/wow", + ja: "/wow", + de: "/entzückt", + fr: "/avoirdesétoilesdanslesyeux", + }, + (62, 648) => LocalisedText { + en: "/eatpumpkincookie", + ja: "/eatpumpkincookie", + de: "/kürbiskeksessen", + fr: "/mangerunbiscuitcitrouille", + }, (62, 649) => LocalisedText { en: "/spirit", ja: "/spirit", de: "/oleoleoleole", fr: "/apprécierlespectacle", }, + (62, 652) => LocalisedText { + en: "/linkpearl", + ja: "/linkpearl", + de: "/kontaktperle", + fr: "/appelvialinkperle", + }, (63, 29054) => LocalisedText { en: "Guard", ja: "防御", @@ -19221,18 +19473,6 @@ lazy_static::lazy_static! { de: "Waage", fr: "La Balance", }, - (63, 29251) => LocalisedText { - en: "the Ewer", - ja: "サリャクの水瓶", - de: "Krug", - fr: "L'Aiguière", - }, - (63, 29252) => LocalisedText { - en: "the Spire", - ja: "ビエルゴの塔", - de: "Turm", - fr: "La Tour", - }, (63, 29253) => LocalisedText { en: "Macrocosmos", ja: "マクロコスモス", @@ -20296,6 +20536,18 @@ lazy_static::lazy_static! { de: "Quietus", fr: "Quietus", }, + (63, 29783) => LocalisedText { + en: "the Bole", + ja: "世界樹の幹", + de: "Eiche", + fr: "Le Tronc", + }, + (63, 29784) => LocalisedText { + en: "the Arrow", + ja: "オシュオンの矢", + de: "Pfeil", + fr: "La Flèche", + }, (64, 1) => LocalisedText { en: "Emerald Carbuncle", ja: "カーバンクル・エメラルド", @@ -23074,18 +23326,36 @@ lazy_static::lazy_static! { de: "Azeyma-Puppe", fr: "Azeyma miniature", }, + (65, 452) => LocalisedText { + en: "wind-up Ragnarok", + ja: "マメット・ラグナロク", + de: "Ragnarök-Miniatur", + fr: "Ragnarok miniature", + }, (65, 453) => LocalisedText { en: "blue-footed booby", ja: "青足のカツォ", de: "Blaufußtölpel", fr: "fou à pattes bleues", }, + (65, 455) => LocalisedText { + en: "clockwork Solus", + ja: "クロックワーク・ソル", + de: "Aufzieh-Solus", + fr: "Solus mécanique", + }, (65, 456) => LocalisedText { en: "Felicitous Fuzzball", ja: "こねこみみさん", de: "Miaurizius-Puppe", fr: "Madmiaouselle", }, + (65, 457) => LocalisedText { + en: "lumini", + ja: "ミニルオン", + de: "Lumini", + fr: "lumignon", + }, (65, 458) => LocalisedText { en: "clockwork crimson chaser", ja: "クロックワーク・レッドチェイサー", @@ -23110,12 +23380,78 @@ lazy_static::lazy_static! { de: "Flughörnchen", fr: "momonga", }, + (65, 463) => LocalisedText { + en: "sponge silkie", + ja: "スポンジシルキー", + de: "Silkie-Schwämmchen", + fr: "Silkie-éponge", + }, + (65, 464) => LocalisedText { + en: "sewer skink", + ja: "水道トカゲ", + de: "Unterstadt-Echse", + fr: "laveur des canalisations", + }, + (65, 465) => LocalisedText { + en: "wind-up philos", + ja: "マメット・フィロス", + de: "Philos-Puppe", + fr: "ami miniature", + }, (65, 466) => LocalisedText { en: "wind-up Erichthonios", ja: "マメット・エリクトニオス", de: "Erichthonios-Puppe", fr: "Érichthonios miniature", }, + (65, 467) => LocalisedText { + en: "corgi", + ja: "コーギー", + de: "Corgi", + fr: "corgi", + }, + (65, 468) => LocalisedText { + en: "sky blue back", + ja: "スカイブルーバック", + de: "Himmelblaurücken", + fr: "dronte échine-bleu ciel", + }, + (65, 469) => LocalisedText { + en: "suzusaurus", + ja: "スズサウルス", + de: "Suzusaurus", + fr: "suzusaurus", + }, + (65, 470) => LocalisedText { + en: "Mama automaton", + ja: "オートマトン・ママ", + de: "Mama-Puppe", + fr: "automate Maman", + }, + (65, 471) => LocalisedText { + en: "wind-up Cagnazzo", + ja: "マメット・カイナッツォ", + de: "Aufzieh-Cagnazzo", + fr: "Cagnazzo miniature", + }, + (65, 474) => LocalisedText { + en: "wind-up Halone", + ja: "マメット・ハルオーネ", + de: "Aufzieh-Halone", + fr: "Halone miniature", + }, + (65, 475) => LocalisedText { + en: "bantam train", + ja: "豆列車", + de: "Modelleisenbahn", + fr: "train petit mais costaud", + }, + (65, 477) => LocalisedText { + en: "wind-up Aidoneus", + ja: "マメット・アイドネウス", + de: "Aufzieh-Aidoneus", + fr: "Aidoneus miniature", + }, (67, 50) => LocalisedText { en: "Royal Authority Combo", ja: "コンボ:ロイヤルアソリティ", @@ -25118,7 +25454,7 @@ lazy_static::lazy_static! { en: "Soul Voice", ja: "ソウルボイス", de: "Seelenstimme", - fr: "Jauge de voix de l'âme", + fr: "Voix de l'âme", }, (25, 3000) => LocalisedText { en: "【Gold Saucer】", @@ -25166,7 +25502,7 @@ lazy_static::lazy_static! { en: "pedigree level", ja: "血統レベル", de: "Zuchtqualität", - fr: "niveau du pedigree", + fr: "niveau du pédigrée", }, (25, 3008) => LocalisedText { en: "course roulette", @@ -25352,7 +25688,7 @@ lazy_static::lazy_static! { en: "desired rule", ja: "希望ルール:", de: "Gewünschte Regel", - fr: "Règle souhaitée : ", + fr: "Règle souhaitée :", }, (25, 3039) => LocalisedText { en: "GATE", @@ -26218,6 +26554,12 @@ lazy_static::lazy_static! { de: "Allagische Steine der Kausalität", fr: "mémoquartz allagois déterministes", }, + (17, 4043) => LocalisedText { + en: "Manderville weapon", + ja: "マンダヴィルウェポン", + de: "Manderville-Waffe", + fr: "arme des Manderville", + }, (24, 5000) => LocalisedText { en: "normal raid", ja: "ノーマルレイド", @@ -26300,7 +26642,7 @@ lazy_static::lazy_static! { en: "The Minstrel's Ballad: Thordan's Reign", ja: "蒼天幻想ナイツ・オブ・ラウンド討滅戦", de: "Heldenlied von Thordans Fall", - fr: "le règne de Thordan", + fr: "règne de Thordan", }, (24, 5014) => LocalisedText { en: "The Burn", @@ -26342,7 +26684,7 @@ lazy_static::lazy_static! { en: "The Diadem", ja: "ディアデム諸島", de: "Diadem", - fr: "Le Diadème", + fr: "Diadème", }, (24, 5021) => LocalisedText { en: "The Ghimlyt Dark", @@ -26444,13 +26786,13 @@ lazy_static::lazy_static! { en: "The Crown of the Immaculate", ja: "イノセンス討滅戦", de: "Offenbarung - Innozenz", - fr: "La Couronne de l'Immaculé", + fr: "Couronne de l'Immaculé", }, (24, 5038) => LocalisedText { en: "The Crown of the Immaculate (Extreme)", ja: "極イノセンス討滅戦", de: "Letzte Läuterung - Innozenz", - fr: "La Couronne de l'Immaculé (extrême)", + fr: "Couronne de l'Immaculé (extrême)", }, (24, 5039) => LocalisedText { en: "The Dying Gasp", @@ -26474,13 +26816,13 @@ lazy_static::lazy_static! { en: "Eden's Gate", ja: "覚醒編", de: "Edens Erwachen", - fr: "L'Éveil d'Éden", + fr: "Éveil d'Éden", }, (24, 5043) => LocalisedText { en: "Kugane Ohashi", ja: "真ヨウジンボウ討滅戦", de: "Duell auf der Kugane-Brücke", - fr: "Le Pont Ohashi", + fr: "Pont Ohashi", }, (24, 5044) => LocalisedText { en: "The Baldesion Arsenal", @@ -26504,13 +26846,13 @@ lazy_static::lazy_static! { en: "The Epic of Alexander (Ultimate)", ja: "絶アレキサンダー討滅戦", de: "Alexander (fatal)", - fr: "L'Odyssée d'Alexander (fatal)", + fr: "Odyssée d'Alexander (fatal)", }, (24, 5048) => LocalisedText { en: "The Copied Factory", ja: "複製サレタ工場廃墟", de: "Die kopierte Fabrik", - fr: "Réplique de l'usine désaffectée", + fr: "réplique de l'usine désaffectée", }, (24, 5049) => LocalisedText { en: "Onsal Hakair (Danshig Naadam)", @@ -26528,19 +26870,19 @@ lazy_static::lazy_static! { en: "Eden's Verse", ja: "共鳴編", de: "Edens Resonanz", - fr: "Les Accords d'Éden", + fr: "Accords d'Éden", }, (24, 5052) => LocalisedText { en: "Cinder Drift", ja: "ルビーウェポン破壊作戦", de: "Rubinfeuer - Entfesselung", - fr: "Les Nuées de Brandons", + fr: "Nuées de Brandons", }, (24, 5053) => LocalisedText { en: "Cinder Drift (Extreme)", ja: "極ルビーウェポン破壊作戦", de: "Rubinfeuer - Trauma", - fr: "Les Nuées de Brandons (extrême)", + fr: "Nuées de Brandons (extrême)", }, (24, 5054) => LocalisedText { en: "Memoria Misera (Extreme)", @@ -26558,25 +26900,25 @@ lazy_static::lazy_static! { en: "The Heroes' Gauntlet", ja: "ノルヴラント", de: "Schlacht um Norvrandt", - fr: "La Traversée de Norvrandt", + fr: "Traversée de Norvrandt", }, (24, 5057) => LocalisedText { en: "The Seat of Sacrifice ", ja: "ウォーリア・オブ・ライト討滅戦", de: "Krieger des Lichts", - fr: "Le Trône du Sacrifice", + fr: "Trône du Sacrifice", }, (24, 5058) => LocalisedText { en: "The Seat of Sacrifice (Extreme)", ja: "極ウォーリア・オブ・ライト討滅戦", de: "Krieger des Lichts (extrem)", - fr: "Le Trône du Sacrifice (extrême)", + fr: "Trône du Sacrifice (extrême)", }, (24, 5059) => LocalisedText { en: "The Puppets' Bunker", ja: "人形タチノ軍事基地", de: "Die Puppenfestung", - fr: "Base militaire des Pantins", + fr: "base militaire des Pantins", }, (24, 5061) => LocalisedText { en: "skirmish", @@ -26600,13 +26942,13 @@ lazy_static::lazy_static! { en: "Matoya's Relict", ja: "マトーヤのアトリエ", de: "Matoyas Atelier", - fr: "L'Atelier abandonné de Matoya", + fr: "Atelier abandonné de Matoya", }, (24, 5065) => LocalisedText { en: "Eden's Promise", ja: "再生編", de: "Edens Verheißung", - fr: "La Promesse d'Éden", + fr: "Promesse d'Éden", }, (24, 5066) => LocalisedText { en: "Castrum Marinum", @@ -26636,7 +26978,7 @@ lazy_static::lazy_static! { en: "Paglth'an", ja: "パガルザン", de: "Goldene Ebene von Paglth'an", - fr: "La grande prairie de Paglth'an", + fr: "Grande prairie de Paglth'an", }, (24, 5072) => LocalisedText { en: "The Cloud Deck", @@ -26654,7 +26996,7 @@ lazy_static::lazy_static! { en: "The Tower at Paradigm's Breach", ja: "希望ノ砲台:「塔」", de: "Der Turm, Paradigmenbrecher", - fr: "La tour de la Contingence", + fr: "Tour de la Contingence", }, (24, 5076) => LocalisedText { en: "Zadnor", @@ -26690,7 +27032,7 @@ lazy_static::lazy_static! { en: "Ktisis Hyperboreia", ja: "ヒュペルボレア造物院", de: "Ktisis Hyperboreia", - fr: "L'Hyperborée", + fr: "Hyperborée", }, (24, 5082) => LocalisedText { en: "The Aitiascope", @@ -26702,7 +27044,7 @@ lazy_static::lazy_static! { en: "The Dead Ends", ja: "レムナント", de: "Das Sternengrab", - fr: "L'Issue aux Impasses", + fr: "Issue aux Impasses", }, (24, 5084) => LocalisedText { en: "Smileton", @@ -26720,31 +27062,31 @@ lazy_static::lazy_static! { en: "The Dark Inside", ja: "ゾディアーク討滅戦", de: "Prophetie - Zodiark", - fr: "Le Cratère des Martyrs", + fr: "Cratère des Martyrs", }, (24, 5087) => LocalisedText { en: "The Minstrel's Ballad: Zodiark's Fall", ja: "極ゾディアーク討滅戦", de: "Eschatos - Zodiark", - fr: "Le Cratère des Martyrs (extrême)", + fr: "Cratère des Martyrs (extrême)", }, (24, 5088) => LocalisedText { en: "The Mothercrystal", ja: "ハイデリン討滅戦", de: "Prophetie - Hydaelyn", - fr: "Le Cristal-mère", + fr: "Cristal-mère", }, (24, 5089) => LocalisedText { en: "The Minstrel's Ballad: Hydaelyn's Call", ja: "極ハイデリン討滅戦", de: "Eschatos - Hydaelyn", - fr: "Le Cristal-mère (extrême)", + fr: "Cristal-mère (extrême)", }, (24, 5090) => LocalisedText { en: "The Final Day", ja: "終焉の戦い", de: "Prophetie - Endsängerin", - fr: "Le Répons final", + fr: "Répons final", }, (24, 5091) => LocalisedText { en: "Pandæmonium", @@ -26774,7 +27116,7 @@ lazy_static::lazy_static! { en: "The Minstrel's Ballad: Endsinger's Aria", ja: "終極の戦い", de: "Eschatos - Endsängerin", - fr: "Le Répons final (extrême)", + fr: "Répons final (extrême)", }, (24, 5097) => LocalisedText { en: "Aglaia", @@ -26812,11 +27154,17 @@ lazy_static::lazy_static! { de: "Wolke Sieben", fr: "Petit Nuage", }, - (24, 5105) => LocalisedText { - en: "Containment Bay S1T7 (Unreal)", - ja: "幻魔神セフィロト討滅戦", - de: "Traumprüfung - Sephirot", - fr: "Unité de contention S1P7 (irréel)", + (24, 5103) => LocalisedText { + en: "Storm's Crown", + ja: "バルバリシア討滅戦", + de: "Prophetie - Barbarizia", + fr: "Toison des tempêtes", + }, + (24, 5104) => LocalisedText { + en: "Storm's Crown (Extreme)", + ja: "極バルバリシア討滅戦", + de: "Eschatos - Barbarizia", + fr: "Toison des tempêtes (extrême)", }, (24, 5106) => LocalisedText { en: "Abyssos", @@ -26830,5 +27178,59 @@ lazy_static::lazy_static! { de: "Schwarzer Hof von Troia", fr: "Château de Troïa", }, + (24, 5108) => LocalisedText { + en: "Variant Dungeon", + ja: "ヴァリアントダンジョン", + de: "Unstetes Gewölbe", + fr: "Donjon à embranchements", + }, + (24, 5109) => LocalisedText { + en: "Criterion Dungeon", + ja: "アナザーダンジョン", + de: "Kurioses Gewölbe", + fr: "Donjon alternatif", + }, + (24, 5110) => LocalisedText { + en: "The Sil'dihn Subterrane", + ja: "シラディハ水道", + de: "Die Unterstadt von Sil'dih", + fr: "Canalisations sildiennes", + }, + (24, 5111) => LocalisedText { + en: "Another Sil'dihn Subterrane", + ja: "異聞シラディハ水道", + de: "Die kuriose Unterstadt von Sil'dih", + fr: "Canalisations sildiennes annexes", + }, + (24, 5112) => LocalisedText { + en: "Another Sil'dihn Subterrane (Savage)", + ja: "異聞シラディハ水道 零式", + de: "Die kuriose Unterstadt von Sil'dih (episch)", + fr: "Canalisations sildiennes annexes (sadique)", + }, + (24, 5113) => LocalisedText { + en: "Lapis Manalis", + ja: "ラピス・マナリス", + de: "Lapis Manalis", + fr: "Lapis Manalis", + }, + (24, 5116) => LocalisedText { + en: "Euphrosyne", + ja: "喜びの神域 エウプロシュネ", + de: "Euphrosyne", + fr: "Domaine divin - Euphrosyne", + }, + (24, 5119) => LocalisedText { + en: "Containment Bay P1T6 (Unreal)", + ja: "幻女神ソフィア討滅戦", + de: "Traumprüfung - Sophia", + fr: "Unité de contention P1P6 (irréel)", + }, + (24, 5120) => LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Mechanische Menagerie", + fr: "Traquenard oriental", + }, }; } diff --git a/server/src/ffxiv/duties.rs b/server/src/ffxiv/duties.rs index 59e403a..ebdedd8 100644 --- a/server/src/ffxiv/duties.rs +++ b/server/src/ffxiv/duties.rs @@ -6356,6 +6356,16 @@ lazy_static::lazy_static! { high_end: false, content_kind: ContentKind::QuestBattles, }, + 868 => DutyInfo { + name: LocalisedText { + en: "The Sil'dihn Subterrane", + ja: "ヴァリアントダンジョン シラディハ水道", + de: "Die Unterstadt von Sil'dih", + fr: "Les canalisations sildiennes - Donjon à embranchements", + }, + high_end: false, + content_kind: ContentKind::V&CDungeonFinder, + }, 869 => DutyInfo { name: LocalisedText { en: "The Fell Court of Troia", @@ -6383,7 +6393,7 @@ lazy_static::lazy_static! { de: "Eschatos - Barbarizia", fr: "La Toison des tempêtes (extrême)", }, - high_end: true, + high_end: false, content_kind: ContentKind::Trials, }, 872 => DutyInfo { @@ -6416,16 +6426,6 @@ lazy_static::lazy_static! { high_end: false, content_kind: ContentKind::QuestBattles, }, - 875 => DutyInfo { - name: LocalisedText { - en: "Containment Bay S1T7 (Unreal)", - ja: "幻魔神セフィロト討滅戦", - de: "Traumprüfung - Sephirot", - fr: "Unité de contention S1P7 (irréel)", - }, - high_end: true, - content_kind: ContentKind::Trials, - }, 876 => DutyInfo { name: LocalisedText { en: "Abyssos: The Seventh Circle", @@ -6446,6 +6446,26 @@ lazy_static::lazy_static! { high_end: true, content_kind: ContentKind::Raids, }, + 878 => DutyInfo { + name: LocalisedText { + en: "Another Sil'dihn Subterrane", + ja: "アナザーダンジョン 異聞シラディハ水道", + de: "Die kuriose Unterstadt von Sil'dih", + fr: "Les canalisations sildiennes annexes - Donjon alternatif", + }, + high_end: false, + content_kind: ContentKind::V&CDungeonFinder, + }, + 879 => DutyInfo { + name: LocalisedText { + en: "Another Sil'dihn Subterrane (Savage)", + ja: "アナザーダンジョン 異聞シラディハ水道 零式", + de: "Die kuriose Unterstadt von Sil'dih (episch)", + fr: "Les canalisations sildiennes annexes - Donjon alternatif (sadique)", + }, + high_end: false, + content_kind: ContentKind::V&CDungeonFinder, + }, 880 => DutyInfo { name: LocalisedText { en: "Abyssos: The Sixth Circle", @@ -6496,5 +6516,285 @@ lazy_static::lazy_static! { high_end: false, content_kind: ContentKind::QuestBattles, }, + 886 => DutyInfo { + name: LocalisedText { + en: "Mount Ordeals", + ja: "ルビカンテ討滅戦", + de: "Prophetie - Rubicante", + fr: "Le Mont du Supplice", + }, + high_end: false, + content_kind: ContentKind::Trials, + }, + 896 => DutyInfo { + name: LocalisedText { + en: "Lapis Manalis", + ja: "雪山冥洞 ラピス・マナリス", + de: "Lapis Manalis", + fr: "Lapis Manalis", + }, + high_end: false, + content_kind: ContentKind::Dungeons, + }, + 909 => DutyInfo { + name: LocalisedText { + en: "The Shifting Gymnasion Agonon", + ja: "宝物庫 エルピス・ギュムナシオン祭殿", + de: "Gymnasion Agonon", + fr: "Elpis Gymnasion", + }, + high_end: false, + content_kind: ContentKind::TreasureHunt, + }, + 910 => DutyInfo { + name: LocalisedText { + en: "An Unforeseen Bargain", + ja: "パンひとつと引き換えに", + de: "Der Wert einer Buuds", + fr: "Pour une bouchée de pain", + }, + high_end: false, + content_kind: ContentKind::QuestBattles, + }, + 911 => DutyInfo { + name: LocalisedText { + en: "Euphrosyne", + ja: "喜びの神域 エウプロシュネ", + de: "Euphrosyne", + fr: "Domaine divin - Euphrosyne", + }, + high_end: false, + content_kind: ContentKind::Raids, + }, + 912 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 913 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 914 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 915 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 916 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 917 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 918 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 919 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 920 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 921 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 922 => DutyInfo { + name: LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 923 => DutyInfo { + name: LocalisedText { + en: "Crystalline Conflict (Custom Match - The Clockwork Castletown)", + ja: "クリスタルコンフリクト(東方絡繰御殿:カスタムマッチ)", + de: "Crystalline Conflict: Die Mechanische Menagerie (Schaukampf)", + fr: "Crystalline Conflict (partie personnalisée - Le Traquenard oriental)", + }, + high_end: false, + content_kind: ContentKind::PvP, + }, + 924 => DutyInfo { + name: LocalisedText { + en: "Mount Ordeals (Extreme)", + ja: "極ルビカンテ討滅戦", + de: "Eschatos - Rubicante", + fr: "Le Mont du Supplice (extrême)", + }, + high_end: true, + content_kind: ContentKind::Trials, + }, + 926 => DutyInfo { + name: LocalisedText { + en: "Containment Bay P1T6 (Unreal)", + ja: "幻女神ソフィア討滅戦", + de: "Traumprüfung - Sophia", + fr: "Unité de contention P1P6 (irréel)", + }, + high_end: true, + content_kind: ContentKind::Trials, + }, + 927 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, + 928 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, + 929 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, + 930 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, + 931 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, + 932 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, + 933 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, + 934 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, + 935 => DutyInfo { + name: LocalisedText { + en: "Leap of Faith", + ja: "挑戦! ジャンピングアスレチック", + de: "Kaktor-Kletterwand", + fr: "Haute voltige", + }, + high_end: false, + content_kind: ContentKind::GoldSaucer, + }, }; } diff --git a/server/src/ffxiv/roulettes.rs b/server/src/ffxiv/roulettes.rs index 42e4dd9..39d8831 100644 --- a/server/src/ffxiv/roulettes.rs +++ b/server/src/ffxiv/roulettes.rs @@ -70,7 +70,7 @@ lazy_static::lazy_static! { de: "Tagesherausforderung: PvP-Front", fr: "Challenge quotidien : Front", }, - pvp: false, + pvp: true, }, 8 => RouletteInfo { name: LocalisedText { diff --git a/server/src/ffxiv/territory_names.rs b/server/src/ffxiv/territory_names.rs index d2044e4..4bed56b 100644 --- a/server/src/ffxiv/territory_names.rs +++ b/server/src/ffxiv/territory_names.rs @@ -1503,12 +1503,6 @@ lazy_static::lazy_static! { de: "Unteres La Noscea", fr: "Basse-Noscea", }, - 416 => LocalisedText { - en: "The Great Gubal Library", - ja: "グブラ幻想図書館", - de: "Große Gubal-Bibliothek", - fr: "Grande bibliothèque de Gubal", - }, 417 => LocalisedText { en: "Chocobo Square", ja: "チョコボスクウェア", @@ -1617,12 +1611,6 @@ lazy_static::lazy_static! { de: "Singularitäts-Reaktor", fr: "Réacteur de singularité", }, - 438 => LocalisedText { - en: "Aetherochemical Research Facility", - ja: "魔科学研究所", - de: "Ätherochemisches Forschungslabor", - fr: "Laboratoire de magismologie", - }, 439 => LocalisedText { en: "The Lightfeather Proving Grounds", ja: "ライトフェザー闘技場", @@ -2079,12 +2067,6 @@ lazy_static::lazy_static! { de: "Das Diadem", fr: "Le Diadème", }, - 516 => LocalisedText { - en: "The Antitower", - ja: "逆さの塔", - de: "Antiturm", - fr: "L'Antitour", - }, 517 => LocalisedText { en: "Containment Bay S1T7", ja: "コンテイメントベイS1T7", @@ -2283,12 +2265,6 @@ lazy_static::lazy_static! { de: "Feld der Ehre", fr: "Champs de la Gloire", }, - 555 => LocalisedText { - en: "Sohr Khai", - ja: "ソール・カイ", - de: "Sohr Khai", - fr: "Sohr Khai", - }, 556 => LocalisedText { en: "The Weeping City of Mhach", ja: "禁忌都市マハ", @@ -2385,12 +2361,6 @@ lazy_static::lazy_static! { de: "Geisterschloss", fr: "Manoir hanté", }, - 572 => LocalisedText { - en: "Xelphatol", - ja: "ゼルファトル", - de: "Xelphatol", - fr: "Xelphatol", - }, 573 => LocalisedText { en: "Topmast Apartment Lobby", ja: "トップマスト:ロビー", @@ -2643,12 +2613,6 @@ lazy_static::lazy_static! { de: "Yanxia", fr: "Yanxia", }, - 615 => LocalisedText { - en: "Baelsar's Wall", - ja: "バエサルの長城", - de: "Baelsar-Wall", - fr: "Muraille de Baelsar", - }, 616 => LocalisedText { en: "Shisui of the Violet Tides", ja: "紫水宮", @@ -2721,12 +2685,6 @@ lazy_static::lazy_static! { de: "Badehaus Bokairo", fr: "Auberge du Bokairo", }, - 630 => LocalisedText { - en: "The Diadem", - ja: "ディアデム諸島", - de: "Das Diadem", - fr: "Le Diadème", - }, 633 => LocalisedText { en: "Carteneau Flats: Borderland Ruins", ja: "カルテノー平原:外縁遺跡群", @@ -5223,6 +5181,12 @@ lazy_static::lazy_static! { de: "Schicksalsweg", fr: "Avancée de la Foi", }, + 1069 => LocalisedText { + en: "The Sil'dihn Subterrane", + ja: "シラディハ水道", + de: "Unterstadt von Sil'dih", + fr: "Canalisations sildiennes", + }, 1070 => LocalisedText { en: "The Fell Court of Troia", ja: "トロイアコート", @@ -5241,6 +5205,24 @@ lazy_static::lazy_static! { de: "Sturmes Krone", fr: "Toison des tempêtes", }, + 1073 => LocalisedText { + en: "Elysion", + ja: "エリュシオン", + de: "Elysium", + fr: "Élysée", + }, + 1075 => LocalisedText { + en: "Another Sil'dihn Subterrane", + ja: "異聞シラディハ水道", + de: "Kuriose Unterstadt von Sil'dih", + fr: "Canalisations sildiennes annexes", + }, + 1076 => LocalisedText { + en: "Another Sil'dihn Subterrane", + ja: "異聞シラディハ水道", + de: "Kuriose Unterstadt von Sil'dih", + fr: "Canalisations sildiennes annexes", + }, 1077 => LocalisedText { en: "Zero's Domain", ja: "ゼロの領域", @@ -5313,17 +5295,11 @@ lazy_static::lazy_static! { de: "Schwarzer Hof von Troia", fr: "Château de Troïa", }, - 1090 => LocalisedText { - en: "Containment Bay S1T7", - ja: "コンテイメントベイS1T7", - de: "Arretur S1T7", - fr: "Unité de contention S1P7", - }, 1091 => LocalisedText { - en: "Seat of the Foremost", - ja: "筆頭神官の間", - de: "Sitz der Hohepriesterin", - fr: "Salle des primiciers", + en: "The Fell Court of Troia", + ja: "トロイアコート", + de: "Schwarzer Hof von Troia", + fr: "Château de Troïa", }, 1092 => LocalisedText { en: "Storm's Crown", @@ -5343,5 +5319,113 @@ lazy_static::lazy_static! { de: "Versteck der Kürbishexe", fr: "Demeure de la femme à tête de citrouille", }, + 1095 => LocalisedText { + en: "Mount Ordeals", + ja: "試練の山", + de: "Berg der Tortur", + fr: "Mont du Supplice", + }, + 1096 => LocalisedText { + en: "Mount Ordeals", + ja: "試練の山", + de: "Berg der Tortur", + fr: "Mont du Supplice", + }, + 1097 => LocalisedText { + en: "Lapis Manalis", + ja: "ラピス・マナリス", + de: "Lapis Manalis", + fr: "Lapis Manalis", + }, + 1098 => LocalisedText { + en: "Sylphstep", + ja: "シルフ領風特設アスレチック", + de: "Sylphenland", + fr: "Sylve sylphe sibylline", + }, + 1109 => LocalisedText { + en: "The Great Gubal Library", + ja: "グブラ幻想図書館", + de: "Große Gubal-Bibliothek", + fr: "Grande bibliothèque de Gubal", + }, + 1110 => LocalisedText { + en: "Aetherochemical Research Facility", + ja: "魔科学研究所", + de: "Ätherochemisches Forschungslabor", + fr: "Laboratoire de magismologie", + }, + 1111 => LocalisedText { + en: "The Antitower", + ja: "逆さの塔", + de: "Antiturm", + fr: "L'Antitour", + }, + 1112 => LocalisedText { + en: "Sohr Khai", + ja: "ソール・カイ", + de: "Sohr Khai", + fr: "Sohr Khai", + }, + 1113 => LocalisedText { + en: "Xelphatol", + ja: "ゼルファトル", + de: "Xelphatol", + fr: "Xelphatol", + }, + 1114 => LocalisedText { + en: "Baelsar's Wall", + ja: "バエサルの長城", + de: "Baelsar-Wall", + fr: "Muraille de Baelsar", + }, + 1116 => LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + 1117 => LocalisedText { + en: "The Clockwork Castletown", + ja: "東方絡繰御殿", + de: "Die Mechanische Menagerie", + fr: "Le Traquenard oriental", + }, + 1118 => LocalisedText { + en: "Euphrosyne", + ja: "喜びの神域 エウプロシュネ", + de: "Euphrosyne", + fr: "Domaine divin - Euphrosyne", + }, + 1119 => LocalisedText { + en: "Lapis Manalis", + ja: "ラピス・マナリス", + de: "Lapis Manalis", + fr: "Lapis Manalis", + }, + 1120 => LocalisedText { + en: "Garlemald", + ja: "ガレマルド", + de: "Garlemald", + fr: "Garlemald", + }, + 1121 => LocalisedText { + en: "Containment Bay P1T6", + ja: "コンテイメントベイP1T6", + de: "Arretur P1T6", + fr: "Unité de contention P1P6", + }, + 1123 => LocalisedText { + en: "The Shifting Gymnasion Agonon", + ja: "エルピス・ギュムナシオン祭殿", + de: "Gymnasion Agonon", + fr: "Elpis Gymnasion", + }, + 1125 => LocalisedText { + en: "Khadga", + ja: "カドガの大岩", + de: "Khadga-Felsen", + fr: "Khadga", + }, }; } diff --git a/server/src/ffxiv/treasure_maps.rs b/server/src/ffxiv/treasure_maps.rs index 71545b4..1247008 100644 --- a/server/src/ffxiv/treasure_maps.rs +++ b/server/src/ffxiv/treasure_maps.rs @@ -100,7 +100,7 @@ lazy_static::lazy_static! { fr: "Carte au trésor en peau de glaucus", }, 16 => LocalisedText { - en: "Presumably Special Treasure Map", + en: "Ostensibly Special Treasure Map", ja: "古ぼけた地図S2", de: "Mythenleder-Schatzkarte", fr: "Carte au trésor inhabituelle II", @@ -115,7 +115,19 @@ lazy_static::lazy_static! { en: "Kumbhiraskin Treasure Map", ja: "古ぼけた地図G14", de: "Ophiotaurosleder-Schatzkarte", - fr: "Carte au trésor en peau de khumbira", + fr: "Carte au trésor en peau de kumbhira", + }, + 19 => LocalisedText { + en: "Ophiotauroskin Treasure Map", + ja: "古ぼけた地図G15", + de: "Kumbhiraleder-Schatzkarte", + fr: "Carte au trésor en peau d'ophiotauros", + }, + 20 => LocalisedText { + en: "Potentially Special Treasure Map", + ja: "古ぼけた地図S3", + de: "Legendenleder-Schatzkarte", + fr: "Carte au trésor inhabituelle III", }, }; }