WatWowMap · TurtIeSocks · Apr 21, 2024 · Apr 16, 2024 · Apr 16, 2024 · Apr 16, 2024
diff --git a/packages/locales/lib/generated/de.json b/packages/locales/lib/generated/de.json
@@ -469,6 +469,7 @@
   "badge_1": "Bronze",
   "badge_2": "Silber",
   "badge_3": "Gold",
+  "badge_4": "Einfach",
   "gym_badge_menu": "Fitness Abzeichen bearbeiten",
   "gym_badges": "Fitness Abzeichen",
   "gym_badge_diamonds": "Zeige Fitness Abzeichen",

diff --git a/packages/locales/lib/generated/es.json b/packages/locales/lib/generated/es.json
@@ -469,6 +469,7 @@
   "badge_1": "Bronce",
   "badge_2": "Plata",
   "badge_3": "Oro",
+  "badge_4": "Básico",
   "gym_badge_menu": "Editar Insignia de Gimnasio",
   "gym_badges": "Insignias de Gimnasio",
   "gym_badge_diamonds": "Mostrar Insignias de Gimnasio",

diff --git a/packages/locales/lib/generated/fr.json b/packages/locales/lib/generated/fr.json
@@ -469,6 +469,7 @@
   "badge_1": "Bronze",
   "badge_2": "Argent",
   "badge_3": "Or",
+  "badge_4": "Basique",
   "gym_badge_menu": "Modifier le Badge de Salle de Sport",
   "gym_badges": "Badges de Salle de Sport",
   "gym_badge_diamonds": "Afficher les Badges de Salle de Sport",

diff --git a/packages/locales/lib/generated/hi.json b/packages/locales/lib/generated/hi.json
@@ -469,6 +469,7 @@
   "badge_1": "कांस्य",
   "badge_2": "रजत",
   "badge_3": "सोना",
+  "badge_4": "मूल",
   "gym_badge_menu": "जिम बैज संपादित करें",
   "gym_badges": "जिम बैज",
   "gym_badge_diamonds": "जिम बैज दिखाएं",

diff --git a/packages/locales/lib/generated/id.json b/packages/locales/lib/generated/id.json
@@ -469,6 +469,7 @@
   "badge_1": "Bronze",
   "badge_2": "Perak",
   "badge_3": "Emas",
+  "badge_4": "Dasar",
   "gym_badge_menu": "Edit Lencana Gym",
   "gym_badges": "Lencana Gym",
   "gym_badge_diamonds": "Tampilkan Lencana Gym",

diff --git a/packages/locales/lib/generated/it.json b/packages/locales/lib/generated/it.json
@@ -469,6 +469,7 @@
   "badge_1": "Bronze",
   "badge_2": "Prata",
   "badge_3": "Ouro",
+  "badge_4": "Básico",
   "gym_badge_menu": "Editar Insígnia de Ginásio",
   "gym_badges": "Insígnias de Ginásio",
   "gym_badge_diamonds": "Mostrar Insígnias de Ginásio",

diff --git a/packages/locales/lib/generated/ja.json b/packages/locales/lib/generated/ja.json
@@ -469,6 +469,7 @@
   "badge_1": "ブロンズ",
   "badge_2": "シルバー",
   "badge_3": "ゴールド",
+  "badge_4": "基本",
   "gym_badge_menu": "ジムバッジを編集",
   "gym_badges": "ジムバッジ",
   "gym_badge_diamonds": "ジムバッジを表示",

diff --git a/packages/locales/lib/generated/ko.json b/packages/locales/lib/generated/ko.json
@@ -380,6 +380,7 @@
   "badge_1": "브론즈",
   "badge_2": "실버",
   "badge_3": "골드",
+  "badge_4": "기본",
   "gym_badge_menu": "체육관 배지 편집",
   "gym_badges": "체육관 배지",
   "gym_badge_diamonds": "체육관 배지 보기",

diff --git a/packages/locales/lib/generated/nl.json b/packages/locales/lib/generated/nl.json
@@ -469,6 +469,7 @@
   "badge_1": "Brons",
   "badge_2": "Zilver",
   "badge_3": "Goud",
+  "badge_4": "Basis",
   "gym_badge_menu": "Bewerk Gym Badge",
   "gym_badges": "Gym Badges",
   "gym_badge_diamonds": "Toon Gym Badges",

diff --git a/packages/locales/lib/generated/pl.json b/packages/locales/lib/generated/pl.json
@@ -469,6 +469,7 @@
   "badge_1": "Brązowy",
   "badge_2": "Srebrny",
   "badge_3": "Złoty",
+  "badge_4": "Podstawowy",
   "gym_badge_menu": "Edytuj Odznaki Siłowni",
   "gym_badges": "Odznaki Siłowni",
   "gym_badge_diamonds": "Pokaż Odznaki Siłowni",

diff --git a/packages/locales/lib/generated/pt-br.json b/packages/locales/lib/generated/pt-br.json
@@ -469,6 +469,7 @@
   "badge_1": "Bronze",
   "badge_2": "Prata",
   "badge_3": "Ouro",
+  "badge_4": "Básico",
   "gym_badge_menu": "Editar Insígnia de Ginásio",
   "gym_badges": "Insígnias de Ginásio",
   "gym_badge_diamonds": "Mostrar Insígnias de Ginásio",

diff --git a/packages/locales/lib/generated/ru.json b/packages/locales/lib/generated/ru.json
@@ -469,6 +469,7 @@
   "badge_1": "Бронза",
   "badge_2": "Серебро",
   "badge_3": "Золото",
+  "badge_4": "Базовый",
   "gym_badge_menu": "Редактировать Значок Спортзала",
   "gym_badges": "Значки Спортзалов",
   "gym_badge_diamonds": "Показать Значки Спортзала",

diff --git a/packages/locales/lib/generated/sv.json b/packages/locales/lib/generated/sv.json
@@ -469,6 +469,7 @@
   "badge_1": "Brons",
   "badge_2": "Silver",
   "badge_3": "Guld",
+  "badge_4": "Grundläggande",
   "gym_badge_menu": "Redigera Gymmärke",
   "gym_badges": "Gymmärken",
   "gym_badge_diamonds": "Visa Gymmärken",

diff --git a/packages/locales/lib/generated/th.json b/packages/locales/lib/generated/th.json
@@ -469,6 +469,7 @@
   "badge_1": "ทองแดง",
   "badge_2": "เงิน",
   "badge_3": "ทอง",
+  "badge_4": "พื้นฐาน",
   "gym_badge_menu": "แก้ไขเหรียญยิม",
   "gym_badges": "เหรียญยิม",
   "gym_badge_diamonds": "แสดงเหรียญยิม",

diff --git a/packages/locales/lib/generated/tr.json b/packages/locales/lib/generated/tr.json
@@ -469,6 +469,7 @@
   "badge_1": "Bronz",
   "badge_2": "Gümüş",
   "badge_3": "Altın",
+  "badge_4": "Temel",
   "gym_badge_menu": "Spor Salonu Rozeti Düzenle",
   "gym_badges": "Spor Salonu Rozetleri",
   "gym_badge_diamonds": "Spor Salonu Rozetlerini Göster",

diff --git a/packages/locales/lib/generated/zh-tw.json b/packages/locales/lib/generated/zh-tw.json
@@ -469,6 +469,7 @@
   "badge_1": "銅",
   "badge_2": "銀",
   "badge_3": "金",
+  "badge_4": "基礎",
   "gym_badge_menu": "編輯健身房徽章",
   "gym_badges": "健身房徽章",
   "gym_badge_diamonds": "顯示健身房徽章",

diff --git a/packages/locales/lib/human/de.json b/packages/locales/lib/human/de.json
@@ -482,6 +482,7 @@
   "badge_1": "Bronze",
   "badge_2": "Silber",
   "badge_3": "Gold",
+  "badge_4": "Einfach",
   "gym_badge_menu": "Arenaorden bearbeiten",
   "gym_badges": "Arenaorden",
   "gym_badge_diamonds": "Arenaorden anzeigen",

diff --git a/packages/locales/lib/human/en.json b/packages/locales/lib/human/en.json
@@ -520,6 +520,7 @@
   "badge_1": "Bronze",
   "badge_2": "Silver",
   "badge_3": "Gold",
+  "badge_4": "Basic",
   "gym_badge_menu": "Edit Gym Badge",
   "gym_badges": "Gym Badges",
   "gym_badge_diamonds": "Show Gym Badges",

diff --git a/packages/locales/lib/human/fr.json b/packages/locales/lib/human/fr.json
@@ -469,6 +469,7 @@
   "badge_1": "Bronze",
   "badge_2": "Argent",
   "badge_3": "Or",
+  "badge_4": "Basique",
   "gym_badge_menu": "Editer Badge d'Arène",
   "gym_badges": "Badges d'Arènes",
   "gym_badge_diamonds": "Afficher les Badges d'Arènes",

diff --git a/packages/locales/lib/human/pl.json b/packages/locales/lib/human/pl.json
@@ -42,7 +42,7 @@
   "badge_1": "Brąz",
   "badge_2": "Srebro",
   "badge_3": "Złoto",
-  "basic": "Podstawowy",
+  "badge_4": "Podstawowy",
   "basic_description": "Łatwe wybieranie Pokémonów i zastosowanie globalnego filtra",
   "battle_changes": "W bitwie",
   "battle_changes_poracle": "battle_changes",

diff --git a/src/assets/constants.js b/src/assets/constants.js
@@ -6,7 +6,7 @@ export const NUNDO_HUNDO = /** @type {const} */ (['zeroIv', 'hundoIv'])
 
 export const ENUM_GENDER = /** @type {const} */ ([0, 1, 2, 3])
 
-export const ENUM_BADGES = /** @type {const} */ ([0, 1, 2, 3])
+export const ENUM_BADGES = /** @type {const} */ ([0, 4, 1, 2, 3])
 
 export const S2_LEVELS = /** @type {const} */ ([
   10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
@@ -16,6 +16,7 @@ export const FORT_LEVELS = /** @type {const} */ (['all', '1', '2', '3'])
 
 export const BADGES = /** @type {const} */ ([
   'all',
+  'badge_4',
   'badge_1',
   'badge_2',
   'badge_3',

diff --git a/src/features/gym/gymMarker.js b/src/features/gym/gymMarker.js
@@ -85,17 +85,21 @@ export function gymMarker({
                     transform: translateX(-38%) translateY(-82%);
                   "
                 ></div>
-                <img
-                  src="${Icons.getMisc(`badge_${badge}`)}"\
-                  alt="${badge}"
-                  style="
-                    width: 48px;
-                    height: 48px;
-                    bottom: ${2 + gymMod.offsetY}px;
-                    left: ${gymMod.offsetX * 50}%;
-                    transform: translateX(-50%);
-                  "
-                />`
+                ${
+                  badge != '4'
+                    ? `<img
+                    src="${Icons.getMisc(`badge_${badge}`)}"\
+                    alt="${badge}"
+                    style="
+                      width: 48px;
+                      height: 48px;
+                      bottom: ${2 + gymMod.offsetY}px;
+                      left: ${gymMod.offsetX * 50}%;
+                      transform: translateX(-50%);
+                    "
+                  />`
+                    : ''
+                }`
               : /* html */
                 `<img
                   src="${gymIconUrl}"