From be89a5d551f7c94717c9c5eb394bd06195e9e0c6 Mon Sep 17 00:00:00 2001 From: Anna Clemens Date: Thu, 25 Aug 2022 17:05:41 -0400 Subject: [PATCH] feat(server): partially update for 6.2 --- csharp/SourceGenerator/SourceGenerator.csproj | 8 +- server/src/ffxiv/auto_translate.rs | 300 +++++++++++++++--- server/src/ffxiv/duties.rs | 179 +++++++++-- server/src/ffxiv/roulettes.rs | 8 +- server/src/ffxiv/territory_names.rs | 234 ++++++++++---- 5 files changed, 591 insertions(+), 138 deletions(-) diff --git a/csharp/SourceGenerator/SourceGenerator.csproj b/csharp/SourceGenerator/SourceGenerator.csproj index 03825f6..031b84c 100644 --- a/csharp/SourceGenerator/SourceGenerator.csproj +++ b/csharp/SourceGenerator/SourceGenerator.csproj @@ -2,14 +2,14 @@ Exe - net5.0 + net6.0 enable - - - + + + diff --git a/server/src/ffxiv/auto_translate.rs b/server/src/ffxiv/auto_translate.rs index d757ad1..4ea0ede 100644 --- a/server/src/ffxiv/auto_translate.rs +++ b/server/src/ffxiv/auto_translate.rs @@ -4341,6 +4341,30 @@ lazy_static::lazy_static! { de: "Speerfischen", fr: "pêche au harpon", }, + (22, 1658) => LocalisedText { + en: "sanctuary gathering", + ja: "開拓採集", + de: "Inselsammeln", + fr: "collecte", + }, + (22, 1659) => LocalisedText { + en: "sanctuary crafting", + ja: "開拓製作", + de: "Pionierswerk", + fr: "atelier", + }, + (22, 1660) => LocalisedText { + en: "seafarer's cowrie", + ja: "シェルダレースクリップ:青船貨", + de: "Blaue Cieldaläen-Kauri", + fr: "assignats insulaires azur", + }, + (22, 1661) => LocalisedText { + en: "islander's cowrie", + ja: "シェルダレースクリップ:緑島貨", + de: "Grüne Cieldaläen-Kauri", + fr: "assignats insulaires émeraude", + }, (23, 1900) => LocalisedText { en: "【Primals】", ja: "【蛮神&蛮族】", @@ -5188,21 +5212,21 @@ lazy_static::lazy_static! { fr: "JcJ", }, (24, 2086) => LocalisedText { - en: "beast tribe quest", - ja: "蛮族クエスト", - de: "Auftrag der Wilden Stämme", + en: "tribal quest", + ja: "友好部族クエスト", + de: "Auftrag der Stammesvölker", fr: "Quêtes tribales", }, (24, 2087) => LocalisedText { - en: "beast tribe sidequest", - ja: "蛮族デイリークエスト", - de: "Nebenauftrag der Wilden Stämme", + en: "tribal daily quest", + ja: "友好部族デイリークエスト", + de: "Nebenauftrag der Stammesvölker", fr: "Quêtes tribales quotidiennes", }, (24, 2088) => LocalisedText { - en: "beast tribe main quest", - ja: "蛮族ストーリークエスト", - de: "Hauptauftrag der Wilden Stämme", + en: "tribal main quest", + ja: "友好部族ストーリークエスト", + de: "Hauptauftrag der Stammesvölker", fr: "Quêtes tribales (scénario)", }, (24, 2089) => LocalisedText { @@ -7035,6 +7059,24 @@ lazy_static::lazy_static! { de: "Magische Karte", fr: "carte magique", }, + (49, 255) => LocalisedText { + en: "island mandragora", + ja: "アイル・マンドラゴラ", + de: "Paradies-Mandragora", + fr: "mandragore insulaire", + }, + (49, 256) => LocalisedText { + en: "island Onion Prince", + ja: "アイル・オニオンプリンス", + de: "Prinz Paradieszwiebel", + fr: "Prince oignon insulaire", + }, + (49, 257) => LocalisedText { + en: "island Eggplant Knight", + ja: "アイル・エッグナイト", + de: "Ritter Paradiesaubergine", + fr: "Chevalier aubergine insulaire", + }, (49, 261) => LocalisedText { en: "lynx of eternal darkness", ja: "エターナルダークネス・リンクス", @@ -7083,6 +7125,12 @@ lazy_static::lazy_static! { de: "Monitor", fr: "vérifiniveau", }, + (49, 269) => LocalisedText { + en: "Papa Paissa", + ja: "パパ・パイッサ", + de: "Papa Paissa", + fr: "Papa Païssa", + }, (49, 273) => LocalisedText { en: "wivre", ja: "ウィヴル", @@ -7095,6 +7143,18 @@ lazy_static::lazy_static! { de: "Quiexie-König", fr: "porxie royal", }, + (49, 277) => LocalisedText { + en: "Garlond GL-II", + ja: "ガーロンドGL-II", + de: "Garlond GL-II", + fr: "Garlond GL-II", + }, + (49, 280) => LocalisedText { + en: "Fylgja", + ja: "フィルギャ", + de: "Fylgja", + fr: "Fylgja", + }, (49, 281) => LocalisedText { en: "alkonost", ja: "アルコノスト", @@ -7131,6 +7191,30 @@ lazy_static::lazy_static! { de: "Blaufeder-Luchs", fr: "lynx au pelage bleu", }, + (49, 294) => LocalisedText { + en: "megashiba", + ja: "大柴犬", + de: "Megashiba", + fr: "mégashiba", + }, + (49, 299) => LocalisedText { + en: "wondrous lanner", + ja: "ワンダラスラナー", + de: "Wunderlanner", + fr: "lanier merveilleux", + }, + (49, 305) => LocalisedText { + en: "sunforged", + ja: "炎霊獣", + de: "Glutgeborene", + fr: "bête en flammes", + }, + (49, 306) => LocalisedText { + en: "lynx of imperious wind", + ja: "リンクス・オブ・ウィンド", + de: "Sturmwind-Luchs", + fr: "lynx des vents tempétueux", + }, (50, 1) => LocalisedText { en: "gladiator", ja: "剣術士", @@ -9621,6 +9705,12 @@ lazy_static::lazy_static! { de: "Vanaspati", fr: "Vanaspati", }, + (51, 4043) => LocalisedText { + en: "Unnamed Island", + ja: "名もなき島", + de: "Einsame Insel", + fr: "Île sans nom", + }, (51, 4090) => LocalisedText { en: "The Palaistra", ja: "パライストラ", @@ -9693,6 +9783,42 @@ lazy_static::lazy_static! { de: "Aglaia", fr: "Domaine divin - Aglaé", }, + (51, 4180) => LocalisedText { + en: "The Fell Court of Troia", + ja: "トロイアコート", + de: "Schwarzer Hof von Troia", + fr: "Château de Troïa", + }, + (51, 4196) => LocalisedText { + en: "The Pestilent Purgatory", + ja: "寄生生物隔離棟", + de: "Isolationstrakt für parasitäre Lebensformen", + fr: "Bloc des organismes parasites", + }, + (51, 4197) => LocalisedText { + en: "Storm's Crown", + ja: "呪髪の風塔", + de: "Sturmes Krone", + fr: "Toison des tempêtes", + }, + (51, 4198) => LocalisedText { + en: "The Hollow Purgatory", + ja: "創生樹隔離棟", + de: "Separationstrakt für pflanzliche Lebensformen", + fr: "Bloc des créations arborescentes", + }, + (51, 4249) => LocalisedText { + en: "The Caustic Purgatory", + ja: "猛毒生物隔離棟", + de: "Sicherheitstrakt für toxische Lebenformen", + fr: "Bloc des créatures extrêmement nocives", + }, + (51, 4250) => LocalisedText { + en: "Stygian Insenescence Cells", + ja: "生命神秘研究棟", + de: "Forschungstrakt für die Geheimnisse des Lebens", + fr: "Laboratoire d'études des secrets du vivant", + }, (54, 1) => LocalisedText { en: "Halone, the Fury", ja: "ハルオーネ", @@ -14745,12 +14871,6 @@ lazy_static::lazy_static! { de: "Sturm und Drang", fr: "Thèse fluidique", }, - (56, 25869) => LocalisedText { - en: "Crown Play", - ja: "クラウンプレイ", - de: "Spiel der Kronen", - fr: "Jeu des couronnes", - }, (56, 25870) => LocalisedText { en: "Astrodyne", ja: "アストロダイン", @@ -15519,6 +15639,12 @@ lazy_static::lazy_static! { de: "Götterwetter", fr: "Mythologique", }, + (60, 171) => LocalisedText { + en: "Vacuity", + ja: "虚無", + de: "Leere", + fr: "Néant", + }, (61, 1) => LocalisedText { en: "Stance", ja: "納刀する/抜刀する", @@ -18555,6 +18681,12 @@ lazy_static::lazy_static! { de: "/kopffassen", fr: "/setenirlatête", }, + (62, 636) => LocalisedText { + en: "/eategg", + ja: "/eategg", + de: "/eiessen", + fr: "/mangerunoeuf", + }, (62, 637) => LocalisedText { en: "/content", ja: "/content", @@ -18573,12 +18705,36 @@ lazy_static::lazy_static! { de: "/ziehen", fr: "/dégainer", }, + (62, 640) => LocalisedText { + en: "/tea", + ja: "/tea", + de: "/tee", + fr: "/thé", + }, (62, 641) => LocalisedText { en: "/determined", ja: "/determined", de: "/entschlossen", fr: "/détermination", }, + (62, 642) => LocalisedText { + en: "/showright", + ja: "/showright", + de: "/rechtszeigen", + fr: "/montrerdroite", + }, + (62, 643) => LocalisedText { + en: "/showleft", + ja: "/showleft", + de: "/linkszeigen", + fr: "/montrergauche", + }, + (62, 649) => LocalisedText { + en: "/spirit", + ja: "/spirit", + de: "/oleoleoleole", + fr: "/apprécierlespectacle", + }, (63, 29054) => LocalisedText { en: "Guard", ja: "防御", @@ -19815,6 +19971,12 @@ lazy_static::lazy_static! { de: "Communio", fr: "Communio", }, + (63, 29559) => LocalisedText { + en: "Hollow Nozuchi", + ja: "幻影野槌", + de: "Nozuchi-Schemen", + fr: "Nozuchi spectral", + }, (63, 29566) => LocalisedText { en: "Soul Slice", ja: "ソウルスライス", @@ -22544,13 +22706,13 @@ lazy_static::lazy_static! { en: "Lord Enma", ja: "エンマ", de: "Meister Enma[p]", - fr: "Baron Enma", + fr: "baron Enma", }, (65, 391) => LocalisedText { en: "Lord Ananta", ja: "蛇王カイラ", de: "Meister Ananta[p]", - fr: "Baron Ananta", + fr: "baron Ananta", }, (65, 392) => LocalisedText { en: "Zazel", @@ -22837,7 +22999,7 @@ lazy_static::lazy_static! { (65, 439) => LocalisedText { en: "wind-up Grebuloff", ja: "マメット・グレビュオフ", - de: "Typhoid-Puppe", + de: "Grebuloff-Puppe", fr: "Grébuloff miniature", }, (65, 440) => LocalisedText { @@ -22900,6 +23062,12 @@ lazy_static::lazy_static! { de: "Aufzieh-Novus[p] D", fr: "Novus D. mécanique", }, + (65, 450) => LocalisedText { + en: "hatching bunny", + ja: "ハッピーエッグバニー", + de: "Wunderhäschen", + fr: "laprœuf joyeux", + }, (65, 451) => LocalisedText { en: "wind-up Azeyma", ja: "マメット・アーゼマ", @@ -22912,6 +23080,42 @@ lazy_static::lazy_static! { de: "Blaufußtölpel", fr: "fou à pattes bleues", }, + (65, 456) => LocalisedText { + en: "Felicitous Fuzzball", + ja: "こねこみみさん", + de: "Miaurizius-Puppe", + fr: "Madmiaouselle", + }, + (65, 458) => LocalisedText { + en: "clockwork crimson chaser", + ja: "クロックワーク・レッドチェイサー", + de: "rot[a] Aufzieh-Chaser", + fr: "croiseur mécanique carmin", + }, + (65, 459) => LocalisedText { + en: "clockwork cerulean chaser", + ja: "クロックワーク・ブルーチェイサー", + de: "blau[a] Aufzieh-Chaser", + fr: "croiseur mécanique céruléen", + }, + (65, 460) => LocalisedText { + en: "wind-up Scarmiglione", + ja: "マメット・スカルミリョーネ", + de: "Scarmiglione-Puppe", + fr: "Scarmiglione miniature", + }, + (65, 462) => LocalisedText { + en: "pterosquirrel", + ja: "モモンガ", + de: "Flughörnchen", + fr: "momonga", + }, + (65, 466) => LocalisedText { + en: "wind-up Erichthonios", + ja: "マメット・エリクトニオス", + de: "Erichthonios-Puppe", + fr: "Érichthonios miniature", + }, (67, 50) => LocalisedText { en: "Royal Authority Combo", ja: "コンボ：ロイヤルアソリティ", @@ -25876,12 +26080,6 @@ lazy_static::lazy_static! { de: "Wiederaufbau Ishgards", fr: "Reconstruction d'Ishgard", }, - (17, 4018) => LocalisedText { - en: "Allagan tomestone of allegory", - ja: "アラガントームストーン:奇譚", - de: "Allagische Steine der Fantastik", - fr: "mémoquartz allagois fabuleux", - }, (17, 4019) => LocalisedText { en: "ocean fishing", ja: "オーシャンフィッシング", @@ -25942,12 +26140,6 @@ lazy_static::lazy_static! { de: "Erkundung", fr: "mode exploration", }, - (17, 4029) => LocalisedText { - en: "Allagan tomestone of revelation", - ja: "アラガントームストーン:黙示", - de: "Allagische Steine der Offenbarung", - fr: "mémoquartz allagois révélateurs", - }, (17, 4030) => LocalisedText { en: "Bozjan cluster", ja: "ボズヤクラスター", @@ -26002,6 +26194,30 @@ lazy_static::lazy_static! { de: "Kristalltrophäen", fr: "cristaux-trophées", }, + (17, 4039) => LocalisedText { + en: "portrait", + ja: "ポートレート", + de: "Portrait", + fr: "portrait", + }, + (17, 4040) => LocalisedText { + en: "adventurer plate", + ja: "アドベンチャラープレート", + de: "Abenteurerpass", + fr: "carte de personnage", + }, + (17, 4041) => LocalisedText { + en: "Island Sanctuary", + ja: "無人島開拓", + de: "Inselparadies", + fr: "Félicité insulaire", + }, + (17, 4042) => LocalisedText { + en: "Allagan tomestone of causality", + ja: "アラガントームストーン:因果", + de: "Allagische Steine der Kausalität", + fr: "mémoquartz allagois déterministes", + }, (24, 5000) => LocalisedText { en: "normal raid", ja: "ノーマルレイド", @@ -26560,12 +26776,6 @@ lazy_static::lazy_static! { de: "Eschatos - Endsängerin", fr: "Le Répons final (extrême)", }, - (24, 5096) => LocalisedText { - en: "Ultima's Bane (Unreal)", - ja: "幻アルテマウェポン破壊作戦", - de: "Traumprüfung: Heldenlied von Ultima", - fr: "Le fléau d'Ultima (irréel)", - }, (24, 5097) => LocalisedText { en: "Aglaia", ja: "輝ける神域 アグライア", @@ -26602,5 +26812,23 @@ 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, 5106) => LocalisedText { + en: "Abyssos", + ja: "煉獄編", + de: "Abyssos", + fr: "Purgatoire du Pandæmonium", + }, + (24, 5107) => LocalisedText { + en: "The Fell Court of Troia", + ja: "トロイアコート", + de: "Schwarzer Hof von Troia", + fr: "Château de Troïa", + }, }; } diff --git a/server/src/ffxiv/duties.rs b/server/src/ffxiv/duties.rs index b2cf9e9..17ddb95 100644 --- a/server/src/ffxiv/duties.rs +++ b/server/src/ffxiv/duties.rs @@ -24,7 +24,7 @@ pub enum ContentKind { Levequests = 10, GrandCompany = 11, Companions = 12, - BeastTribeQuests = 13, + TribalQuests = 13, OverallCompletion = 14, PlayerCommendation = 15, DisciplesoftheLand = 16, @@ -36,6 +36,7 @@ pub enum ContentKind { CustomDeliveries = 25, Eureka = 26, UltimateRaids = 28, + V&CDungeonFinder = 30, Other(u32), } @@ -54,7 +55,7 @@ impl ContentKind { 10 => Self::Levequests, 11 => Self::GrandCompany, 12 => Self::Companions, - 13 => Self::BeastTribeQuests, + 13 => Self::TribalQuests, 14 => Self::OverallCompletion, 15 => Self::PlayerCommendation, 16 => Self::DisciplesoftheLand, @@ -66,6 +67,7 @@ impl ContentKind { 25 => Self::CustomDeliveries, 26 => Self::Eureka, 28 => Self::UltimateRaids, + 30 => Self::V&CDungeonFinder, x => Self::Other(x), } } @@ -84,7 +86,7 @@ impl ContentKind { Self::Levequests => 10, Self::GrandCompany => 11, Self::Companions => 12, - Self::BeastTribeQuests => 13, + Self::TribalQuests => 13, Self::OverallCompletion => 14, Self::PlayerCommendation => 15, Self::DisciplesoftheLand => 16, @@ -96,6 +98,7 @@ impl ContentKind { Self::CustomDeliveries => 25, Self::Eureka => 26, Self::UltimateRaids => 28, + Self::V&CDungeonFinder => 30, Self::Other(x) => x, } } @@ -913,16 +916,6 @@ lazy_static::lazy_static! { high_end: false, content_kind: ContentKind::Trials, }, - 83 => DutyInfo { - name: LocalisedText { - en: "The Steps of Faith", - ja: "皇都イシュガルド防衛戦", - de: "Der Schicksalsweg", - fr: "Le Siège de la sainte Cité d'Ishgard", - }, - high_end: false, - content_kind: ContentKind::Trials, - }, 84 => DutyInfo { name: LocalisedText { en: "The Chrysalis", @@ -5830,7 +5823,7 @@ lazy_static::lazy_static! { de: "Asphodelos - Vierter Kreis (episch)", fr: "Les Limbes du Pandæmonium - Abîme (sadique)", }, - high_end: true, + high_end: false, content_kind: ContentKind::Raids, }, 802 => DutyInfo { @@ -5890,7 +5883,7 @@ lazy_static::lazy_static! { de: "Asphodelos - Dritter Kreis (episch)", fr: "Les Limbes du Pandæmonium - Fournaise (sadique)", }, - high_end: true, + high_end: false, content_kind: ContentKind::Raids, }, 808 => DutyInfo { @@ -5910,7 +5903,7 @@ lazy_static::lazy_static! { de: "Asphodelos - Erster Kreis (episch)", fr: "Les Limbes du Pandæmonium - Parvis (sadique)", }, - high_end: true, + high_end: false, content_kind: ContentKind::Raids, }, 810 => DutyInfo { @@ -5930,7 +5923,7 @@ lazy_static::lazy_static! { de: "Asphodelos - Zweiter Kreis (episch)", fr: "Les Limbes du Pandæmonium - Cloaque (sadique)", }, - high_end: true, + high_end: false, content_kind: ContentKind::Raids, }, 812 => DutyInfo { @@ -6023,16 +6016,6 @@ lazy_static::lazy_static! { high_end: false, content_kind: ContentKind::QuestBattles, }, - 821 => DutyInfo { - name: LocalisedText { - en: "Ultima's Bane (Unreal)", - ja: "幻アルテマウェポン破壊作戦", - de: "Traumprüfung - Ultima", - fr: "Le fléau d'Ultima (irréel)", - }, - high_end: true, - content_kind: ContentKind::Trials, - }, 830 => DutyInfo { name: LocalisedText { en: "The Porta Decumana", @@ -6160,7 +6143,7 @@ lazy_static::lazy_static! { de: "Eschatos - Endsängerin", fr: "Le Répons final (extrême)", }, - high_end: true, + high_end: false, content_kind: ContentKind::Trials, }, 847 => DutyInfo { @@ -6373,5 +6356,145 @@ lazy_static::lazy_static! { high_end: false, content_kind: ContentKind::QuestBattles, }, + 869 => DutyInfo { + name: LocalisedText { + en: "The Fell Court of Troia", + ja: "異界孤城 トロイアコート", + de: "Der Schwarze Hof von Troia", + fr: "Le Château de Troïa", + }, + high_end: false, + content_kind: ContentKind::Dungeons, + }, + 870 => DutyInfo { + name: LocalisedText { + en: "Storm's Crown", + ja: "バルバリシア討滅戦", + de: "Prophetie - Barbarizia", + fr: "La Toison des tempêtes", + }, + high_end: false, + content_kind: ContentKind::Trials, + }, + 871 => DutyInfo { + name: LocalisedText { + en: "Storm's Crown (Extreme)", + ja: "極バルバリシア討滅戦", + de: "Eschatos - Barbarizia", + fr: "La Toison des tempêtes (extrême)", + }, + high_end: true, + content_kind: ContentKind::Trials, + }, + 872 => DutyInfo { + name: LocalisedText { + en: "Abyssos: The Fifth Circle", + ja: "万魔殿パンデモニウム：煉獄編1", + de: "Abyssos - Fünfter Kreis", + fr: "Le Purgatoire du Pandæmonium - Cages", + }, + high_end: false, + content_kind: ContentKind::Raids, + }, + 873 => DutyInfo { + name: LocalisedText { + en: "Abyssos: The Fifth Circle (Savage)", + ja: "万魔殿パンデモニウム零式：煉獄編1", + de: "Abyssos - Fünfter Kreis (episch)", + fr: "Le Purgatoire du Pandæmonium - Cages (sadique)", + }, + high_end: true, + content_kind: ContentKind::Raids, + }, + 874 => DutyInfo { + name: LocalisedText { + en: "Where Everything Begins", + ja: "失われた力", + de: "Wo alles seinen Anfang nimmt", + fr: "Au commencement était Zero", + }, + 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", + ja: "万魔殿パンデモニウム：煉獄編3", + de: "Abyssos - Siebter Kreis", + fr: "Le Purgatoire du Pandæmonium - Racines", + }, + high_end: false, + content_kind: ContentKind::Raids, + }, + 877 => DutyInfo { + name: LocalisedText { + en: "Abyssos: The Seventh Circle (Savage)", + ja: "万魔殿パンデモニウム零式：煉獄編3", + de: "Abyssos - Siebter Kreis (episch)", + fr: "Le Purgatoire du Pandæmonium - Racines (sadique)", + }, + high_end: true, + content_kind: ContentKind::Raids, + }, + 880 => DutyInfo { + name: LocalisedText { + en: "Abyssos: The Sixth Circle", + ja: "万魔殿パンデモニウム：煉獄編2", + de: "Abyssos - Sechster Kreis", + fr: "Le Purgatoire du Pandæmonium - Croisements", + }, + high_end: false, + content_kind: ContentKind::Raids, + }, + 881 => DutyInfo { + name: LocalisedText { + en: "Abyssos: The Sixth Circle (Savage)", + ja: "万魔殿パンデモニウム零式：煉獄編2", + de: "Abyssos - Sechster Kreis (episch)", + fr: "Le Purgatoire du Pandæmonium - Croisements (sadique)", + }, + high_end: true, + content_kind: ContentKind::Raids, + }, + 883 => DutyInfo { + name: LocalisedText { + en: "Abyssos: The Eighth Circle", + ja: "万魔殿パンデモニウム：煉獄編4", + de: "Abyssos - Achter Kreis", + fr: "Le Purgatoire du Pandæmonium - Hérédité", + }, + high_end: false, + content_kind: ContentKind::Raids, + }, + 884 => DutyInfo { + name: LocalisedText { + en: "Abyssos: The Eighth Circle (Savage)", + ja: "万魔殿パンデモニウム零式：煉獄編4", + de: "Abyssos - Achter Kreis (episch)", + fr: "Le Purgatoire du Pandæmonium - Hérédité (sadique)", + }, + high_end: true, + content_kind: ContentKind::Raids, + }, + 885 => DutyInfo { + name: LocalisedText { + en: "The Steps of Faith", + ja: "皇都イシュガルド防衛戦", + de: "Der Schicksalsweg", + fr: "Le Siège de la sainte Cité d'Ishgard", + }, + high_end: false, + content_kind: ContentKind::QuestBattles, + }, }; } diff --git a/server/src/ffxiv/roulettes.rs b/server/src/ffxiv/roulettes.rs index 97da2a7..42e4dd9 100644 --- a/server/src/ffxiv/roulettes.rs +++ b/server/src/ffxiv/roulettes.rs @@ -74,10 +74,10 @@ lazy_static::lazy_static! { }, 8 => RouletteInfo { name: LocalisedText { - en: "Duty Roulette: Level 80 Dungeons", - ja: "コンテンツルーレット：レベル80ダンジョン", - de: "Zufallsinhalt: Stufe 80", - fr: "Mission aléatoire : donjons nv 80", + en: "Duty Roulette: Level 90 Dungeons", + ja: "コンテンツルーレット：レベル90ダンジョン", + de: "Zufallsinhalt: Stufe 90", + fr: "Mission aléatoire : donjons nv 90", }, pvp: false, }, diff --git a/server/src/ffxiv/territory_names.rs b/server/src/ffxiv/territory_names.rs index d0e7d62..d2044e4 100644 --- a/server/src/ffxiv/territory_names.rs +++ b/server/src/ffxiv/territory_names.rs @@ -93,12 +93,6 @@ lazy_static::lazy_static! { de: "Halatali", fr: "Halatali", }, - 143 => LocalisedText { - en: "Steps of Faith", - ja: "雲廊", - de: "Schicksalsweg", - fr: "Avancée de la Foi", - }, 144 => LocalisedText { en: "The Gold Saucer", ja: "ゴールドソーサー", @@ -135,12 +129,6 @@ lazy_static::lazy_static! { de: "Kampfplatz", fr: "Festin des loups", }, - 150 => LocalisedText { - en: "The Keeper of the Lake", - ja: "黙約の塔", - de: "Der Hüter des Sees", - fr: "Gardien du lac", - }, 151 => LocalisedText { en: "The World of Darkness", ja: "闇の世界", @@ -351,12 +339,6 @@ lazy_static::lazy_static! { de: "Wasserrosentisch", fr: "Chaire du Lotus", }, - 207 => LocalisedText { - en: "Thornmarch", - ja: "茨の園", - de: "Dornmarsch", - fr: "Lisière de ronces", - }, 210 => LocalisedText { en: "Heart of the Sworn", ja: "銀冑団総長室", @@ -1257,12 +1239,6 @@ lazy_static::lazy_static! { de: "Kommandobrücke RVH-03", fr: "Premier pont RCI-03", }, - 371 => LocalisedText { - en: "Snowcloak", - ja: "スノークローク大氷壁", - de: "Schneekleid", - fr: "Manteneige", - }, 372 => LocalisedText { en: "Syrcus Tower", ja: "シルクスの塔", @@ -1557,12 +1533,6 @@ lazy_static::lazy_static! { de: "Nimmerreich", fr: "Nalloncques", }, - 421 => LocalisedText { - en: "The Vault", - ja: "イシュガルド教皇庁", - de: "Erzbasilika", - fr: "La Voûte", - }, 423 => LocalisedText { en: "Company Workshop - Mist", ja: "ミスト・ヴィレッジ：地下工房", @@ -1635,12 +1605,6 @@ lazy_static::lazy_static! { de: "Abendrot-Wacht", fr: "Vigile du Crépuscule", }, - 435 => LocalisedText { - en: "The Aery", - ja: "ドラゴンズエアリー", - de: "Nest des Drachen", - fr: "L'Aire", - }, 436 => LocalisedText { en: "The Limitless Blue", ja: "群青空域", @@ -1671,12 +1635,6 @@ lazy_static::lazy_static! { de: "Gerichtssaal", fr: "Salle des sentences", }, - 441 => LocalisedText { - en: "Sohm Al", - ja: "ソーム・アル", - de: "Sohm Al", - fr: "Sohm Al", - }, 442 => LocalisedText { en: "The Fist of the Father", ja: "フィスト・オブ・ゴルディオス", @@ -4467,12 +4425,6 @@ lazy_static::lazy_static! { de: "Das Diadem", fr: "Le Diadème", }, - 930 => LocalisedText { - en: "Akh Afah Amphitheatre", - ja: "アク・アファー円形劇場", - de: "Akh Afah", - fr: "Amphithéâtre d'Akh Afah", - }, 931 => LocalisedText { en: "The Seat of Sacrifice", ja: "始皇帝の玉座", @@ -4605,12 +4557,6 @@ lazy_static::lazy_static! { de: "Turm von Zot", fr: "Tour de Zott", }, - 953 => LocalisedText { - en: "The Navel", - ja: "オ・ゴモロ火口神殿", - de: "Der Nabel", - fr: "Le Nombril", - }, 954 => LocalisedText { en: "The Navel", ja: "オ・ゴモロ火口神殿", @@ -4719,12 +4665,6 @@ lazy_static::lazy_static! { de: "Hauptquartier der Lemuren", fr: "Repaire des Lémures", }, - 972 => LocalisedText { - en: "The Whorleater", - ja: "対リヴァイアサン双胴船", - de: "Der Wogenbrecher", - fr: "Briseur de marées", - }, 973 => LocalisedText { en: "The Dead Ends", ja: "レムナント", @@ -5085,12 +5025,6 @@ lazy_static::lazy_static! { de: "Wolke Sieben", fr: "Le Petit Nuage", }, - 1035 => LocalisedText { - en: "Porta Decumana", - ja: "ポルタ・デクマーナ", - de: "Porta Decumana", - fr: "Porta Decumana", - }, 1036 => LocalisedText { en: "Sastasha", ja: "サスタシャ浸食洞", @@ -5205,6 +5139,12 @@ lazy_static::lazy_static! { de: "Aglaia", fr: "Domaine divin - Aglaé", }, + 1055 => LocalisedText { + en: "Unnamed Island", + ja: "名もなき島", + de: "Einsame Insel", + fr: "Île sans nom", + }, 1056 => LocalisedText { en: "Alzadaal's Legacy", ja: "アルザダール海底遺跡群", @@ -5241,5 +5181,167 @@ lazy_static::lazy_static! { de: "Omphalos", fr: "Omphalos", }, + 1062 => LocalisedText { + en: "Snowcloak", + ja: "スノークローク大氷壁", + de: "Schneekleid", + fr: "Manteneige", + }, + 1063 => LocalisedText { + en: "The Keeper of the Lake", + ja: "黙約の塔", + de: "Der Hüter des Sees", + fr: "Gardien du lac", + }, + 1064 => LocalisedText { + en: "Sohm Al", + ja: "ソーム・アル", + de: "Sohm Al", + fr: "Sohm Al", + }, + 1065 => LocalisedText { + en: "The Aery", + ja: "ドラゴンズエアリー", + de: "Nest des Drachen", + fr: "L'Aire", + }, + 1066 => LocalisedText { + en: "The Vault", + ja: "イシュガルド教皇庁", + de: "Erzbasilika", + fr: "La Voûte", + }, + 1067 => LocalisedText { + en: "Thornmarch", + ja: "茨の園", + de: "Dornmarsch", + fr: "Lisière de ronces", + }, + 1068 => LocalisedText { + en: "Steps of Faith", + ja: "雲廊", + de: "Schicksalsweg", + fr: "Avancée de la Foi", + }, + 1070 => LocalisedText { + en: "The Fell Court of Troia", + ja: "トロイアコート", + de: "Schwarzer Hof von Troia", + fr: "Château de Troïa", + }, + 1071 => LocalisedText { + en: "Storm's Crown", + ja: "呪髪の風塔", + de: "Sturmes Krone", + fr: "Toison des tempêtes", + }, + 1072 => LocalisedText { + en: "Storm's Crown", + ja: "呪髪の風塔", + de: "Sturmes Krone", + fr: "Toison des tempêtes", + }, + 1077 => LocalisedText { + en: "Zero's Domain", + ja: "ゼロの領域", + de: "Zeros Unterschlupf", + fr: "Territoire de Zero", + }, + 1078 => LocalisedText { + en: "Meghaduta Guest Chambers", + ja: "メーガドゥータ宮の客間", + de: "Gästezimmer des Meghaduta-Tempels", + fr: "Appartements du palais du Meghaduta", + }, + 1079 => LocalisedText { + en: "The Aitiascope", + ja: "アイティオン星晶鏡", + de: "Aitiaskop", + fr: "Prisme de l'Aitia", + }, + 1081 => LocalisedText { + en: "The Caustic Purgatory", + ja: "猛毒生物隔離棟", + de: "Sicherheitstrakt für toxische Lebenformen", + fr: "Bloc des créatures extrêmement nocives", + }, + 1082 => LocalisedText { + en: "The Caustic Purgatory", + ja: "猛毒生物隔離棟", + de: "Sicherheitstrakt für toxische Lebenformen", + fr: "Bloc des créatures extrêmement nocives", + }, + 1083 => LocalisedText { + en: "The Pestilent Purgatory", + ja: "寄生生物隔離棟", + de: "Isolationstrakt für parasitäre Lebensformen", + fr: "Bloc des organismes parasites", + }, + 1084 => LocalisedText { + en: "The Pestilent Purgatory", + ja: "寄生生物隔離棟", + de: "Isolationstrakt für parasitäre Lebensformen", + fr: "Bloc des organismes parasites", + }, + 1085 => LocalisedText { + en: "The Hollow Purgatory", + ja: "創生樹隔離棟", + de: "Separationstrakt für pflanzliche Lebensformen", + fr: "Bloc des créations arborescentes", + }, + 1086 => LocalisedText { + en: "The Hollow Purgatory", + ja: "創生樹隔離棟", + de: "Separationstrakt für pflanzliche Lebensformen", + fr: "Bloc des créations arborescentes", + }, + 1087 => LocalisedText { + en: "Stygian Insenescence Cells", + ja: "生命神秘研究棟", + de: "Forschungstrakt für die Geheimnisse des Lebens", + fr: "Laboratoire d'études des secrets du vivant", + }, + 1088 => LocalisedText { + en: "Stygian Insenescence Cells", + ja: "生命神秘研究棟", + de: "Forschungstrakt für die Geheimnisse des Lebens", + fr: "Laboratoire d'études des secrets du vivant", + }, + 1089 => LocalisedText { + en: "The Fell Court of Troia", + ja: "トロイアコート", + 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", + }, + 1092 => LocalisedText { + en: "Storm's Crown", + ja: "呪髪の風塔", + de: "Sturmes Krone", + fr: "Toison des tempêtes", + }, + 1093 => LocalisedText { + en: "Stygian Insenescence Cells", + ja: "生命神秘研究棟", + de: "Forschungstrakt für die Geheimnisse des Lebens", + fr: "Laboratoire d'études des secrets du vivant", + }, + 1094 => LocalisedText { + en: "Sneaky Hollow", + ja: "魔人の隠れ家", + de: "Versteck der Kürbishexe", + fr: "Demeure de la femme à tête de citrouille", + }, }; }