BXT: Trade Corner Webpage Updates

gb-mobile · gb-mobile · commit cf534fbd43ae · 2026-06-10T22:08:30.000-07:00
- Changes card warnings to use ! instead of a warning sign emoji
- PKRS (Cured) now properly displays on cards according to the in-game Crystal parameters.
diff --git a/web/classes/PokemonUtil.php b/web/classes/PokemonUtil.php
@@ -146,14 +146,17 @@ public function unpackPokemon($region, $data) {
                 "name" => $this->getItemName($pkm["item"])
             ];
 
-            if ($pkm["pokerus"] == 0) {
-                $pkm["pokerus"] = null;
-            } else { 
+            $pokerus_byte = $pkm["pokerus"];
+            $pokerus_strain = ($pokerus_byte >> 4) & 0xF;
+            $pokerus_days = $pokerus_byte & 0xF;
+
+            if ($pokerus_days != 0 || $pokerus_strain != 0) {
                 $pkm["pokerus"] = [ 
-                    "strain" =>  $pkm["pokerus"] >> 4,
-                    "days" => $pkm["pokerus"] & 0xF,
-                    "cured" => $pkm["pokerus"] & 0xF == 0,
+                    "days" => $pokerus_days,
+                    "cured" => $pokerus_days == 0,
                 ];
+            } else {
+                $pkm["pokerus"] = null;
             }
 
             foreach(range(1,4) as $i) {
@@ -378,4 +381,4 @@ public function fakePokemon($species) {
             self::MNY, '', '．', '／', 'ォ', '♀', '０', '１', '２', '３', '４', '５', '６', '７', '８', '９', // F0-FF
         ];
     }
-?>
+?>
diff --git a/web/htdocs/css/main.css b/web/htdocs/css/main.css
@@ -945,6 +945,10 @@ header.navbar #localeDropdownMenu .dropdown-item {
 
 .crystal-trade .offer-pokerus-line .offer-pokerus-cured {
   color: #000;
+  display: block;
+  width: 100%;
+  line-height: 13px;
+  text-align: center;
 }
 
 .crystal-trade .offer-pokerus-line .offer-pokerus-infected {
diff --git a/web/locales/de.yml b/web/locales/de.yml
@@ -12,6 +12,9 @@ pokemon:
   item: ITEM
   trainer: OT
   wanted: GESUCHT
+  pokerus:
+    cured: "POK\u00C9RUS (GEHEILT)"
+    infected: "POK\u00C9RUS (INFIZIERT)"
   trade-warning-all-disabled: "⚠️ Dieser Nutzer hat internationale Tausche deaktiviert."
   trade-warning-only-own-game: "⚠️ Dieser Nutzer hat nur Tausche mit %game_id% aktiviert."
   trade-warning-no-japanese: "⚠️ Dieser Nutzer hat Tausche mit nicht-europäischen Sprachen deaktiviert."
diff --git a/web/locales/es.yml b/web/locales/es.yml
@@ -13,6 +13,9 @@ pokemon:
   item: OBJETOS
   trainer: EO
   wanted: SE BUSCA
+  pokerus:
+    cured: "POK\u00C9RUS (CURADO)"
+    infected: "POK\u00C9RUS (INFECTADO)"
   trade-warning-all-disabled: "⚠️ Este usuario ha desactivado los intercambios internacionales."
   trade-warning-only-own-game: "⚠️ Este usuario solo ha habilitado intercambios con %game_id%."
   trade-warning-no-japanese: "⚠️ Este usuario ha desactivado los intercambios con idiomas no europeos."
diff --git a/web/locales/it.yml b/web/locales/it.yml
@@ -12,6 +12,9 @@ pokemon:
   item: STRUM.
   trainer: AO
   wanted: CHIESTO
+  pokerus:
+    cured: "POK\u00C9RUS (GUARITO)"
+    infected: "POK\u00C9RUS (INFETTO)"
   trade-warning-all-disabled: "⚠️ Questo utente ha disattivato gli scambi internazionali."
   trade-warning-only-own-game: "⚠️ Questo utente ha abilitato gli scambi solo con %game_id%."
   trade-warning-no-japanese: "⚠️ Questo utente ha disattivato gli scambi con lingue non europee."
diff --git a/web/locales/ja.yml b/web/locales/ja.yml
@@ -9,6 +9,9 @@ locale:
 pokemon:
   shiny: 光る
   level: :L
+  pokerus:
+    cured: "\u30DD\u30B1\u30EB\u30B9 (\u6CBB\u7652)"
+    infected: "\u30DD\u30B1\u30EB\u30B9 (\u611F\u67D3)"
   trade-warning-all-disabled: "⚠️ このユーザーは国際交換を無効にしています"
   trade-warning-only-own-game: "⚠️ このユーザーは%game_id%との交換のみを有効にしています"
   trade-warning-no-japanese: "⚠️ このユーザーは非ヨーロッパ言語との交換を無効にしています"
diff --git a/web/locales/locales/de.yml b/web/locales/locales/de.yml
@@ -12,6 +12,9 @@ pokemon:
   item: ITEM
   trainer: OT
   wanted: GESUCHT
+  pokerus:
+    cured: "POK\u00C9RUS (GEHEILT)"
+    infected: "POK\u00C9RUS (INFIZIERT)"
   trade-warning-all-disabled: "⚠️ Dieser Nutzer hat internationale Tausche deaktiviert."
   trade-warning-only-own-game: "⚠️ Dieser Nutzer hat nur Tausche mit %game_id% aktiviert."
   trade-warning-no-japanese: "⚠️ Dieser Nutzer hat Tausche mit nicht-europäischen Sprachen deaktiviert."
diff --git a/web/locales/locales/es.yml b/web/locales/locales/es.yml
@@ -13,6 +13,9 @@ pokemon:
   item: OBJETOS
   trainer: EO
   wanted: SE BUSCA
+  pokerus:
+    cured: "POK\u00C9RUS (CURADO)"
+    infected: "POK\u00C9RUS (INFECTADO)"
   trade-warning-all-disabled: "⚠️ Este usuario ha desactivado los intercambios internacionales."
   trade-warning-only-own-game: "⚠️ Este usuario solo ha habilitado intercambios con %game_id%."
   trade-warning-no-japanese: "⚠️ Este usuario ha desactivado los intercambios con idiomas no europeos."
diff --git a/web/locales/locales/it.yml b/web/locales/locales/it.yml
@@ -12,6 +12,9 @@ pokemon:
   item: STRUM.
   trainer: AO
   wanted: CHIESTO
+  pokerus:
+    cured: "POK\u00C9RUS (GUARITO)"
+    infected: "POK\u00C9RUS (INFETTO)"
   trade-warning-all-disabled: "⚠️ Questo utente ha disattivato gli scambi internazionali."
   trade-warning-only-own-game: "⚠️ Questo utente ha abilitato gli scambi solo con %game_id%."
   trade-warning-no-japanese: "⚠️ Questo utente ha disattivato gli scambi con lingue non europee."
diff --git a/web/locales/locales/ja.yml b/web/locales/locales/ja.yml
@@ -9,6 +9,9 @@ locale:
 pokemon:
   shiny: 光る
   level: :L
+  pokerus:
+    cured: "\u30DD\u30B1\u30EB\u30B9 (\u6CBB\u7652)"
+    infected: "\u30DD\u30B1\u30EB\u30B9 (\u611F\u67D3)"
   trade-warning-all-disabled: "⚠️ このユーザーは国際交換を無効にしています"
   trade-warning-only-own-game: "⚠️ このユーザーは%game_id%との交換のみを有効にしています"
   trade-warning-no-japanese: "⚠️ このユーザーは非ヨーロッパ言語との交換を無効にしています"
diff --git a/web/templates/main.twig b/web/templates/main.twig
@@ -6,7 +6,7 @@
 		<title>{% block title %}Default Title{% endblock %} - REON</title>
 		<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
 		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
-		<link href="/css/main.css?v=core-main-css-v36" rel="stylesheet">
+		<link href="/css/main.css?v=core-main-css-v37" rel="stylesheet">
 		<link href="/css/mobile-trainer.css" rel="stylesheet">
 		{% block head %}
 		{% endblock %}
diff --git a/web/templates/pokemon/tradecorner.twig b/web/templates/pokemon/tradecorner.twig
@@ -96,7 +96,8 @@
     >
     <div class="trade-warning{% if not trade.trade_warning_key %} trade-warning-empty{% endif %}">
         {% if trade.trade_warning_key %}
-            {{ trade.trade_warning_key|trans({'%game_id%': trade.trade_warning_game_id}) }}
+            {% set trade_warning_text = trade.trade_warning_key|trans({'%game_id%': trade.trade_warning_game_id}) %}
+            {{ trade_warning_text|replace({'⚠️': '!', '⚠': '!', 'âš ï¸': '!', 'âš ': '!'}) }}
         {% else %}
             &nbsp;
         {% endif %}

Original file line number	Diff line number	Diff line change
`@@ -945,6 +945,10 @@ header.navbar #localeDropdownMenu .dropdown-item {`
`945`	`945`
`946`	`946`	`.crystal-trade .offer-pokerus-line .offer-pokerus-cured {`
`947`	`947`	`color: #000;`
	`948`	`+ display: block;`
	`949`	`+ width: 100%;`
	`950`	`+ line-height: 13px;`
	`951`	`+ text-align: center;`
`948`	`952`	`}`
`949`	`953`
`950`	`954`	`.crystal-trade .offer-pokerus-line .offer-pokerus-infected {`