Merge pull request #384 from Zezombye/add-hazard

feat: season 13

.eslintrc.json

@@ -17,7 +17,8 @@
         "@typescript-eslint/semi": "warn",
         "curly": ["warn", "multi-line"],
         "eqeqeq": ["warn", "always", { "null": "ignore" }],
-        "no-throw-literal": "warn"
+        "no-throw-literal": "warn",
+        "indent": ["warn", 4]
     },
     "ignorePatterns": ["out", "dist", "**/*.d.ts"]
 }

generate-the-other-languages-doc.js

@@ -148,6 +148,21 @@ function addTranslations(content) {
     }
 
     let guidGlob = guidToLocaleMap.get(content.guid);
+    if (!guidGlob) {
+        console.warn(`GUID ${content.guid} for ${JSON.stringify(content)} appears to have become invalid! Attempting to rectify by finding the GUID again...`);
+        if (fuzzyMatch) {
+            content.guid = enUSFuzzyToGuidMap.get(content["en-US"].replace(/[\.,;'\s()-]/g, "").toLowerCase());
+        } else {
+            content.guid = enUSToGuidMap.get(content["en-US"]);
+        }
+        guidGlob = guidToLocaleMap.get(content.guid);
+
+        if (!guidGlob) {
+            console.error(`No valid GUID found for content ${JSON.stringify(content)}`);
+            return content;
+        }
+        console.log(`New GUID found: ${content.guid}, proceeding...`);
+    }
     for (let localeEntry of Object.entries(guidGlob)) {
         localeEntry[1] = localeEntry[1].replace(/%%/g, "%");
         if (removeParentheses) localeEntry[1] = localeEntry[1].replace(/[,\(\)\/]/g, "");

src/data/actions.ts

@@ -26191,7 +26191,7 @@ export const actionKw: Record<string, Action> =
                     "pt-BR": "Desde o começo",
                     "ru-RU": "Все",
                     "th-TH": "ประจำโปรไฟล์",
-                    "tr-TR": "Daimi",
+                    "tr-TR": "Daimî",
                     "zh-CN": "生涯",
                     "zh-TW": "生涯"
                 },
@@ -26715,7 +26715,7 @@ export const actionKw: Record<string, Action> =
                     "pt-BR": "Desde o começo",
                     "ru-RU": "Все",
                     "th-TH": "ประจำโปรไฟล์",
-                    "tr-TR": "Daimi",
+                    "tr-TR": "Daimî",
                     "zh-CN": "生涯",
                     "zh-TW": "生涯"
                 },

src/data/heroes.ts

@@ -456,7 +456,7 @@ export const heroKw: Record<Overwatch2Heroes, HeroData> =
             "pl-PL": "Granat Błyskowy",
             "pt-BR": "Clarão",
             "ru-RU": "Светошумовая граната",
-            "th-TH": "แฟลชแบงก์",
+            "th-TH": "แฟลชแบง",
             "tr-TR": "Flaş Bombası",
             "zh-CN": "闪光弹",
             "zh-TW": "閃光彈"
@@ -1750,7 +1750,7 @@ export const heroKw: Record<Overwatch2Heroes, HeroData> =
             "ja-JP": "バイオティック・オーブ",
             "ko-KR": "생체 구슬",
             "pl-PL": "Kula Biotyczna",
-            "pt-BR": "Orbe Biótica",
+            "pt-BR": "Orbe Biótico",
             "ru-RU": "Биотическая сфера",
             "th-TH": "ไบโอติกออร์บ",
             "tr-TR": "Biyotik Küre",
@@ -2607,7 +2607,7 @@ export const heroKw: Record<Overwatch2Heroes, HeroData> =
             "guid": "000000000406",
             "en-US": "Sentry Turret",
             "de-DE": "Selbstschussanlage",
-            "es-ES": "Torreta centinela\n",
+            "es-ES": "Torreta centinela",
             "es-MX": "Torreta centinela",
             "fr-FR": "Tourelle sentinelle",
             "it-IT": "Drone Sentinella",
@@ -3441,7 +3441,7 @@ export const heroKw: Record<Overwatch2Heroes, HeroData> =
             "it-IT": "Anello Sonico",
             "ja-JP": "ハイパー・リング",
             "ko-KR": "하이퍼 링",
-            "pl-PL": "Hiperpierścien",
+            "pl-PL": "Hiperpierścień",
             "pt-BR": "Aro Turbo",
             "ru-RU": "Гиперкольцо",
             "th-TH": "ไฮเปอร์ริง",
@@ -3500,6 +3500,98 @@ export const heroKw: Record<Overwatch2Heroes, HeroData> =
         "tr-TR": "<en>Juno<en>",
         "zh-CN": "朱诺",
         "zh-TW": "朱諾"
+    },
+    "hazard": {
+        "primaryFire": {
+            "en-US": "Bonespur",
+            "guid": "00000001B3B6",
+            "de-DE": "Knochensporn",
+            "es-ES": "Lanzaespinas",
+            "es-MX": "Ráfaga de púas",
+            "fr-FR": "Éperon osseux",
+            "it-IT": "Raffica Acuminata",
+            "ja-JP": "ボーン・スティング",
+            "ko-KR": "본스퍼",
+            "pl-PL": "Drzazga",
+            "pt-BR": "Ossada",
+            "ru-RU": "Шипострел",
+            "th-TH": "โบนสเปอร์",
+            "tr-TR": "Dikenleyici",
+            "zh-CN": "骨刺",
+            "zh-TW": "骨刺"
+        },
+        "secondaryFire": {
+            "en-US": "Spike Guard",
+            "guid": "00000001E11E",
+            "de-DE": "Stachelschutz",
+            "es-ES": "Protección de púas",
+            "es-MX": "Protección de púas",
+            "fr-FR": "Garde hérissée",
+            "it-IT": "Guardia Affilata",
+            "ja-JP": "スパイク・ガード",
+            "ko-KR": "날카로운 저항",
+            "pl-PL": "Kolcoobrona",
+            "pt-BR": "Defesa Ouriçada",
+            "ru-RU": "Шипастая оборона",
+            "th-TH": "สไปค์การ์ด",
+            "tr-TR": "Emniyet Dikeni",
+            "zh-CN": "尖刺护体",
+            "zh-TW": "尖刺防禦"
+        },
+        "ability1": {
+            "en-US": "Violent Leap",
+            "guid": "00000001B3D4",
+            "de-DE": "Sturzsprung",
+            "es-ES": "Salto violento",
+            "es-MX": "Salto violento",
+            "fr-FR": "Saut violent",
+            "it-IT": "Balzo Furioso",
+            "ja-JP": "バイオレント・リープ",
+            "ko-KR": "덤벼들기",
+            "pl-PL": "Gwałtowny Skok",
+            "pt-BR": "Salto Brutal",
+            "ru-RU": "Жестокий наскок",
+            "th-TH": "ไวโอเลนท์ลีพ",
+            "tr-TR": "Haşin Atlayış",
+            "zh-CN": "狂跃",
+            "zh-TW": "猛躍"
+        },
+        "ability2": {
+            "en-US": "Jagged Wall",
+            "guid": "00000001FAD0",
+            "de-DE": "Zackenwall",
+            "es-ES": "Muro afilado",
+            "es-MX": "Muro de púas",
+            "fr-FR": "Mur dentelé",
+            "it-IT": "Muro Spinato",
+            "ja-JP": "ジャギー・ウォール",
+            "ko-KR": "가시벽",
+            "pl-PL": "Kolczasta Ściana",
+            "pt-BR": "Barreira Espinhosa",
+            "ru-RU": "Зубчатая стена",
+            "th-TH": "แจ็กด์วอลล์",
+            "tr-TR": "Dişli Duvar",
+            "zh-CN": "尖刺墙",
+            "zh-TW": "鋸齒牆"
+        },
+        "ultimate": {
+            "en-US": "Downpour",
+            "guid": "00000001E044",
+            "de-DE": "Vanadiumhagel",
+            "es-ES": "Aguacero",
+            "es-MX": "Diluvio",
+            "fr-FR": "Déluge",
+            "it-IT": "Diluvio",
+            "ja-JP": "ヘヴィ・レイン",
+            "ko-KR": "가시 소나기",
+            "pl-PL": "Ostre Siepnięcie",
+            "pt-BR": "Dilúvio",
+            "ru-RU": "Ливень",
+            "th-TH": "ดาวน์พัวร์",
+            "tr-TR": "Sağanak",
+            "zh-CN": "千针雨",
+            "zh-TW": "狂暴針雨"
+        }
     }
 }
 //end-json

src/data/localizedStrings.ts

@@ -4772,7 +4772,7 @@ var normalStrKw =
         "pl-PL": "Zhakowano",
         "pt-BR": "Hackeado",
         "ru-RU": "Взломал",
-        "th-TH": "แฮ็คแล้ว",
+        "th-TH": "ถูกแฮ็ค",
         "tr-TR": "Hack'lendi",
         "zh-CN": "已入侵",
         "zh-TW": "被駭入",
@@ -6356,7 +6356,7 @@ var normalStrKw =
         "pl-PL": "Ograniczone",
         "pt-BR": "Limitado",
         "ru-RU": "Ограничен",
-        "th-TH": "จํากัด",
+        "th-TH": "จำกัด",
         "tr-TR": "Sınırlı",
         "zh-CN": "受限",
         "zh-TW": "有限制",
@@ -8570,7 +8570,7 @@ var normalStrKw =
         "pl-PL": "Ranga",
         "pt-BR": "Ranque",
         "ru-RU": "Ранг",
-        "th-TH": "แรงค์",
+        "th-TH": "อันดับ",
         "tr-TR": "Derece",
         "zh-CN": "排名",
         "zh-TW": "等級",
@@ -8588,7 +8588,7 @@ var normalStrKw =
         "pl-PL": "Ranga A",
         "pt-BR": "Ranque A",
         "ru-RU": "Ранг A",
-        "th-TH": "แรงค์ A",
+        "th-TH": "อันดับ A",
         "tr-TR": "A Derecesi",
         "zh-CN": "等级 A",
         "zh-TW": "等級A",
@@ -8606,7 +8606,7 @@ var normalStrKw =
         "pl-PL": "Ranga B",
         "pt-BR": "Ranque B",
         "ru-RU": "Ранг B",
-        "th-TH": "แรงค์ B",
+        "th-TH": "อันดับ B",
         "tr-TR": "B Derecesi",
         "zh-CN": "等级 B",
         "zh-TW": "等級B",
@@ -8624,7 +8624,7 @@ var normalStrKw =
         "pl-PL": "Ranga C",
         "pt-BR": "Ranque C",
         "ru-RU": "Ранг C",
-        "th-TH": "แรงค์ C",
+        "th-TH": "อันดับ C",
         "tr-TR": "C Derecesi",
         "zh-CN": "等级 C",
         "zh-TW": "等級C",
@@ -8642,7 +8642,7 @@ var normalStrKw =
         "pl-PL": "Ranga D",
         "pt-BR": "Ranque D",
         "ru-RU": "Ранг D",
-        "th-TH": "แรงค์ D",
+        "th-TH": "อันดับ D",
         "tr-TR": "D Derecesi",
         "zh-CN": "等级 D",
         "zh-TW": "等級D",
@@ -8660,7 +8660,7 @@ var normalStrKw =
         "pl-PL": "Ranga E",
         "pt-BR": "Ranque E",
         "ru-RU": "Ранг E",
-        "th-TH": "แรงค์ E",
+        "th-TH": "อันดับ E",
         "tr-TR": "E Derecesi",
         "zh-CN": "等级 E",
         "zh-TW": "等級E",
@@ -8678,7 +8678,7 @@ var normalStrKw =
         "pl-PL": "Ranga F",
         "pt-BR": "Ranque F",
         "ru-RU": "Ранг F",
-        "th-TH": "แรงค์ F",
+        "th-TH": "อันดับ F",
         "tr-TR": "F Derecesi",
         "zh-CN": "等级 F",
         "zh-TW": "等級F",
@@ -8696,7 +8696,7 @@ var normalStrKw =
         "pl-PL": "Ranga S",
         "pt-BR": "Ranque S",
         "ru-RU": "Ранг S",
-        "th-TH": "แรงค์ S",
+        "th-TH": "อันดับ S",
         "tr-TR": "S Derecesi",
         "zh-CN": "等级 S",
         "zh-TW": "等級S",
@@ -8879,8 +8879,8 @@ var normalStrKw =
         "tr-TR": "Kırmızı",
         "zh-CN": "红色",
         "zh-TW": "紅",
-        "es-ES": "Red",
-        "ko-KR": "Red"
+        "es-ES": "Rojo",
+        "ko-KR": "빨간색"
     },
     "Remain": {
         "guid": "00000000C5EA",
@@ -10640,7 +10640,7 @@ var normalStrKw =
         "pl-PL": "Sukces",
         "pt-BR": "Sucesso",
         "ru-RU": "Успех",
-        "th-TH": "ความสําเร็จ",
+        "th-TH": "ความสำเร็จ",
         "tr-TR": "Başarı",
         "zh-CN": "成功",
         "zh-TW": "成功",
@@ -11360,7 +11360,7 @@ var normalStrKw =
         "pl-PL": "Nieograniczone",
         "pt-BR": "Ilimitado",
         "ru-RU": "Неограниченно",
-        "th-TH": "ไม่จํากัด",
+        "th-TH": "ไม่จำกัด",
         "tr-TR": "Sınırsız",
         "zh-CN": "不受限",
         "zh-TW": "無限制",
@@ -11415,7 +11415,7 @@ var normalStrKw =
         "pt-BR": "Desbloqueando",
         "ru-RU": "Активация",
         "th-TH": "กำลังปลดล็อค",
-        "tr-TR": "Açan",
+        "tr-TR": "Açılıyor",
         "zh-CN": "正在解锁",
         "zh-TW": "正在解鎖",
         "ko-KR": "잠금 해제"

src/data/other.ts

@@ -42,7 +42,7 @@ export const customGameSettingsKw: Record<string, LocalizableString> =
         "pl-PL": "Wyłączono",
         "pt-BR": "Desativada",
         "ru-RU": "Откл.",
-        "th-TH": "ปิดใช้งานแล้ว",
+        "th-TH": "ปิดใช้งาน",
         "tr-TR": "Devre Dışı",
         "zh-CN": "禁用",
         "zh-TW": "停用"
@@ -226,7 +226,7 @@ export const ruleKw: Record<string, LocalizableString> =
         "ja-JP": "無効",
         "pl-PL": "wył.",
         "pt-BR": "desabilitado",
-        "th-TH": "ปิดใช้งานแล้ว",
+        "th-TH": "ปิดใช้งาน",
         "tr-TR": "devre dışı",
         "zh-CN": "禁用",
         "zh-TW": "停用",

src/data/ui.ts

@@ -850,7 +850,7 @@ const workshopUiKw =
         "pl-PL": "Łączna liczba elementów",
         "pt-BR": "Total de elementos",
         "ru-RU": "Всего элементов",
-        "th-TH": "จํานวนเอเลเมนต์ทั้งหมด",
+        "th-TH": "จำนวนเอเลเมนต์ทั้งหมด",
         "tr-TR": "Toplam Unsur Sayısı",
         "zh-CN": "总计元素数量",
         "zh-TW": "元件數量"
@@ -868,7 +868,7 @@ const workshopUiKw =
         "pl-PL": "Do elementów zaliczają się reguły, warunki, działania i wartości (maksymalnie %1$s)",
         "pt-BR": "Elementos incluem regras, condições, ações e valores (até %1$s)",
         "ru-RU": "Элементы включают в себя правила, условия, действия и значения (вплоть до %1$s).",
-        "th-TH": "เอเลเมนต์ประกอบด้วยกฎ เงื่อนไข การดําเนินการ และค่า (สูงสุด %1$s)",
+        "th-TH": "เอเลเมนต์ประกอบด้วยกฎ เงื่อนไข การดำเนินการ และค่า (สูงสุด %1$s)",
         "tr-TR": "Unsurlara kurallar, koşullar, eylemler ve değerler dâhildir (maksimum %1$s)",
         "zh-CN": "元素包括规则、条件、行动和值（最多可有%1$s个）",
         "zh-TW": "元件包括規則、條件、動作和數值（最高為%1$s）"

src/types.d.ts

@@ -90,6 +90,7 @@ export enum Overwatch2Heroes {
     echo = "echo",
     genji = "genji",
     hanzo = "hanzo",
+    hazard = "hazard",
     illari = "illari",
     junkerQueen = "junkerQueen",
     junkrat = "junkrat",