Fix potion weight logic

* Corrections to French menu.ts

* Corrections to French menu.ts

src/data/weather.ts

@@ -7,6 +7,7 @@ import * as Utils from "../utils";
 import BattleScene from "../battle-scene";
 import { SuppressWeatherEffectAbAttr } from "./ability";
 import { TerrainType } from "./terrain";
+import i18next from "i18next";
 
 export enum WeatherType {
   NONE,
@@ -121,23 +122,23 @@ export class Weather {
 export function getWeatherStartMessage(weatherType: WeatherType): string {
   switch (weatherType) {
     case WeatherType.SUNNY:
-      return 'The sunlight got bright!';
+      return i18next.t('weather:sunnyStartMessage');
     case WeatherType.RAIN:
-      return 'A downpour started!';
+      return i18next.t('weather:rainStartMessage');
     case WeatherType.SANDSTORM:
-      return 'A sandstorm brewed!';
+      return i18next.t('weather:sandstormStartMessage');
     case WeatherType.HAIL:
-      return 'It started to hail!';
+      return i18next.t('weather:hailStartMessage');
     case WeatherType.SNOW:
-      return 'It started to snow!';
+      return i18next.t('weather:snowStartMessage');
     case WeatherType.FOG:
-      return 'A thick fog emerged!'
+      return i18next.t('weather:fogStartMessage');
     case WeatherType.HEAVY_RAIN:
-      return 'A heavy downpour started!'
+      return i18next.t('weather:heavyRainStartMessage');
     case WeatherType.HARSH_SUN:
-      return 'The sunlight got hot!'
+      return i18next.t('weather:harshSunStartMessage');
     case WeatherType.STRONG_WINDS:
-      return 'A heavy wind began!';
+      return i18next.t('weather:strongWindsStartMessage');
   }
 
   return null;
@@ -146,23 +147,23 @@ export function getWeatherStartMessage(weatherType: WeatherType): string {
 export function getWeatherLapseMessage(weatherType: WeatherType): string {
   switch (weatherType) {
     case WeatherType.SUNNY:
-      return 'The sunlight is strong.';
+      return i18next.t('weather:sunnyLapseMessage');
     case WeatherType.RAIN:
-      return 'The downpour continues.';
+      return i18next.t('weather:rainLapseMessage');
     case WeatherType.SANDSTORM:
-      return 'The sandstorm rages.';
+      return i18next.t('weather:sandstormLapseMessage');
     case WeatherType.HAIL:
-      return 'Hail continues to fall.';
+      return i18next.t('weather:hailLapseMessage');
     case WeatherType.SNOW:
-      return 'The snow is falling down.';
+      return i18next.t('weather:snowLapseMessage');
     case WeatherType.FOG:
-      return 'The fog continues.';
+      return i18next.t('weather:fogLapseMessage');
     case WeatherType.HEAVY_RAIN:
-      return 'The heavy downpour continues.'
+      return i18next.t('weather:heavyRainLapseMessage');
     case WeatherType.HARSH_SUN:
-      return 'The sun is scorching hot.'
+      return i18next.t('weather:harshSunLapseMessage');
     case WeatherType.STRONG_WINDS:
-      return 'The wind blows intensely.';
+      return i18next.t('weather:strongWindsLapseMessage');
   }
 
   return null;
@@ -182,23 +183,23 @@ export function getWeatherDamageMessage(weatherType: WeatherType, pokemon: Pokem
 export function getWeatherClearMessage(weatherType: WeatherType): string {
   switch (weatherType) {
     case WeatherType.SUNNY:
-      return 'The sunlight faded.';
+      return i18next.t('weather:sunnyClearMessage');
     case WeatherType.RAIN:
-      return 'The rain stopped.';
+      return i18next.t('weather:rainClearMessage');
     case WeatherType.SANDSTORM:
-      return 'The sandstorm subsided.';
+      return i18next.t('weather:sandstormClearMessage');
     case WeatherType.HAIL:
-      return 'The hail stopped.';
+      return i18next.t('weather:hailClearMessage');
     case WeatherType.SNOW:
-      return 'The snow stopped.';
+      return i18next.t('weather:snowClearMessage');
     case WeatherType.FOG:
-      return 'The fog disappeared.'
+      return i18next.t('weather:fogClearMessage');
     case WeatherType.HEAVY_RAIN:
-      return 'The heavy rain stopped.'
+      return i18next.t('weather:heavyRainClearMessage');
     case WeatherType.HARSH_SUN:
-      return 'The harsh sunlight faded.'
+      return i18next.t('weather:harshSunClearMessage');
     case WeatherType.STRONG_WINDS:
-      return 'The heavy wind stopped.';
+      return i18next.t('weather:strongWindsClearMessage');
   }
 
   return null;

src/evolution-phase.ts

@@ -9,6 +9,7 @@ import { LearnMovePhase } from "./phases";
 import { cos, sin } from "./field/anims";
 import { PlayerPokemon } from "./field/pokemon";
 import { getTypeRgb } from "./data/type";
+import i18next from "i18next";
 
 export class EvolutionPhase extends Phase {
   protected pokemon: PlayerPokemon;
@@ -115,7 +116,7 @@ export class EvolutionPhase extends Phase {
     const evolutionHandler = this.scene.ui.getHandler() as EvolutionSceneHandler;
     const preName = this.pokemon.name;
     
-    this.scene.ui.showText(`What?\n${preName} is evolving!`, null, () => {
+    this.scene.ui.showText(i18next.t('menu:evolving', { pokemonName: preName }), null, () => {
       this.pokemon.cry();
 
       this.pokemon.getPossibleEvolution(this.evolution).then(evolvedPokemon => {
@@ -187,8 +188,8 @@ export class EvolutionPhase extends Phase {
 
                           this.scene.unshiftPhase(new EndEvolutionPhase(this.scene));
 
-                          this.scene.ui.showText(`${preName} stopped evolving.`, null, () => {
-                            this.scene.ui.showText(`Would you like to pause evolutions for ${preName}?\nEvolutions can be re-enabled from the party screen.`, null, () => {
+                          this.scene.ui.showText(i18next.t('menu:stoppedEvolving', { pokemonName: preName }), null, () => {
+                            this.scene.ui.showText(i18next.t('menu:pauseEvolutionsQuestion', { pokemonName: preName }), null, () => {
                               const end = () => {
                                 this.scene.ui.showText(null, 0);
                                 this.scene.playBgm();
@@ -198,7 +199,7 @@ export class EvolutionPhase extends Phase {
                               this.scene.ui.setOverlayMode(Mode.CONFIRM, () => {
                                 this.scene.ui.revertMode();
                                 this.pokemon.pauseEvolutions = true;
-                                this.scene.ui.showText(`Evolutions have been paused for ${preName}.`, null, end, 3000);
+                                this.scene.ui.showText(i18next.t('menu:evolutionsPaused', { pokemonName: preName }), null, end, 3000);
                               }, () => {
                                 this.scene.ui.revertMode();
                                 this.scene.time.delayedCall(3000, end);
@@ -249,7 +250,7 @@ export class EvolutionPhase extends Phase {
                                             this.scene.playSoundWithoutBgm('evolution_fanfare');
                                             
                                             evolvedPokemon.destroy();
-                                            this.scene.ui.showText(`Congratulations!\nYour ${preName} evolved into ${this.pokemon.name}!`, null, () => this.end(), null, true, Utils.fixedInt(4000));
+                                            this.scene.ui.showText(i18next.t('menu:evolutionDone', { pokemonName: preName, evolvedPokemonName: this.pokemon.name }), null, () => this.end(), null, true, Utils.fixedInt(4000));
                                             this.scene.time.delayedCall(Utils.fixedInt(4250), () => this.scene.playBgm());
                                           });
                                         });

src/locales/de/menu.ts

@@ -35,6 +35,11 @@ export const menu: SimpleTranslationEntries = {
     "boyOrGirl": "Bist du ein Junge oder ein Mädchen?",
     "boy": "Junge",
     "girl": "Mädchen",
+    "evolving": "What?\n{{pokemonName}} is evolving!",
+    "stoppedEvolving": "{{pokemonName}} stopped evolving.",
+    "pauseEvolutionsQuestion": "Would you like to pause evolutions for {{pokemonName}}?\nEvolutions can be re-enabled from the party screen.",
+    "evolutionsPaused": "Evolutions have been paused for {{pokemonName}}.",
+    "evolutionDone": "Congratulations!\nYour {{pokemonName}} evolved into {{evolvedPokemonName}}!",
     "dailyRankings": "Tägliche Rangliste",
     "weeklyRankings": "Wöchentliche Rangliste",
     "noRankings": "Keine Rangliste",

src/locales/de/weather.ts

@@ -0,0 +1,44 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+/**
+ * The weather namespace holds text displayed when weather is active during a battle
+ */
+export const weather: SimpleTranslationEntries = {
+    "sunnyStartMessage": "The sunlight got bright!",
+    "sunnyLapseMessage": "The sunlight is strong.",
+    "sunnyClearMessage": "The sunlight faded.",
+
+    "rainStartMessage": "A downpour started!",
+    "rainLapseMessage": "The downpour continues.",
+    "rainClearMessage": "The rain stopped.",
+
+    "sandstormStartMessage": "A sandstorm brewed!",
+    "sandstormLapseMessage": "The sandstorm rages.",
+    "sandstormClearMessage": "The sandstorm subsided.",
+    "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is buffeted\nby the sandstorm!",
+
+    "hailStartMessage": "It started to hail!",
+    "hailLapseMessage": "Hail continues to fall.",
+    "hailClearMessage": "The hail stopped.",
+    "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is pelted\nby the hail!",
+
+    "snowStartMessage": "It started to snow!",
+    "snowLapseMessage": "The snow is falling down.",
+    "snowClearMessage": "The snow stopped.",
+
+    "fogStartMessage": "A thick fog emerged!",
+    "fogLapseMessage": "The fog continues.",
+    "fogClearMessage": "The fog disappeared.",
+
+    "heavyRainStartMessage": "A heavy downpour started!",
+    "heavyRainLapseMessage": "The heavy downpour continues.",
+    "heavyRainClearMessage": "The heavy rain stopped.",
+    
+    "harshSunStartMessage": "The sunlight got hot!",
+    "harshSunLapseMessage": "The sun is scorching hot.",
+    "harshSunClearMessage": "The harsh sunlight faded.",
+
+    "strongWindsStartMessage": "A heavy wind began!",
+    "strongWindsLapseMessage": "The wind blows intensely.",
+    "strongWindsClearMessage": "The heavy wind stopped."
+}

src/locales/en/config.ts

@@ -13,6 +13,7 @@ import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
 import { starterSelectUiHandler } from "./starter-select-ui-handler";
 import { tutorial } from "./tutorial";
+import { weather } from "./weather";
 
 
 export const enConfig = {    
@@ -30,5 +31,6 @@ export const enConfig = {
     starterSelectUiHandler: starterSelectUiHandler,
     tutorial: tutorial,
     nature: nature,
-    growth: growth
+    growth: growth,
+    weather: weather
 }

src/locales/en/menu.ts

@@ -35,6 +35,11 @@ export const menu: SimpleTranslationEntries = {
     "boyOrGirl": "Are you a boy or a girl?",
     "boy": "Boy",
     "girl": "Girl",
+    "evolving": "What?\n{{pokemonName}} is evolving!",
+    "stoppedEvolving": "{{pokemonName}} stopped evolving.",
+    "pauseEvolutionsQuestion": "Would you like to pause evolutions for {{pokemonName}}?\nEvolutions can be re-enabled from the party screen.",
+    "evolutionsPaused": "Evolutions have been paused for {{pokemonName}}.",
+    "evolutionDone": "Congratulations!\nYour {{pokemonName}} evolved into {{evolvedPokemonName}}!",
     "dailyRankings": "Daily Rankings",
     "weeklyRankings": "Weekly Rankings",
     "noRankings": "No Rankings",

src/locales/en/weather.ts

@@ -0,0 +1,44 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+/**
+ * The weather namespace holds text displayed when weather is active during a battle
+ */
+export const weather: SimpleTranslationEntries = {
+    "sunnyStartMessage": "The sunlight got bright!",
+    "sunnyLapseMessage": "The sunlight is strong.",
+    "sunnyClearMessage": "The sunlight faded.",
+
+    "rainStartMessage": "A downpour started!",
+    "rainLapseMessage": "The downpour continues.",
+    "rainClearMessage": "The rain stopped.",
+
+    "sandstormStartMessage": "A sandstorm brewed!",
+    "sandstormLapseMessage": "The sandstorm rages.",
+    "sandstormClearMessage": "The sandstorm subsided.",
+    "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is buffeted\nby the sandstorm!",
+
+    "hailStartMessage": "It started to hail!",
+    "hailLapseMessage": "Hail continues to fall.",
+    "hailClearMessage": "The hail stopped.",
+    "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is pelted\nby the hail!",
+
+    "snowStartMessage": "It started to snow!",
+    "snowLapseMessage": "The snow is falling down.",
+    "snowClearMessage": "The snow stopped.",
+
+    "fogStartMessage": "A thick fog emerged!",
+    "fogLapseMessage": "The fog continues.",
+    "fogClearMessage": "The fog disappeared.",
+
+    "heavyRainStartMessage": "A heavy downpour started!",
+    "heavyRainLapseMessage": "The heavy downpour continues.",
+    "heavyRainClearMessage": "The heavy rain stopped.",
+    
+    "harshSunStartMessage": "The sunlight got hot!",
+    "harshSunLapseMessage": "The sun is scorching hot.",
+    "harshSunClearMessage": "The harsh sunlight faded.",
+
+    "strongWindsStartMessage": "A heavy wind began!",
+    "strongWindsLapseMessage": "The wind blows intensely.",
+    "strongWindsClearMessage": "The heavy wind stopped."
+}

src/locales/es/config.ts

@@ -13,6 +13,7 @@ import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
 import { starterSelectUiHandler } from "./starter-select-ui-handler";
 import { tutorial } from "./tutorial";
+import { weather } from "./weather";
 
 
 export const esConfig = {
@@ -30,5 +31,6 @@ export const esConfig = {
     starterSelectUiHandler: starterSelectUiHandler,
     tutorial: tutorial,
     nature: nature,
-    growth: growth
+    growth: growth,
+    weather: weather
 }

src/locales/es/menu.ts

@@ -35,6 +35,11 @@ export const menu: SimpleTranslationEntries = {
     "boyOrGirl": "¿Eres un chico o una chica?",
     "boy": "Chico",
     "girl": "Chica",
+    "evolving": "What?\n{{pokemonName}} is evolving!",
+    "stoppedEvolving": "{{pokemonName}} stopped evolving.",
+    "pauseEvolutionsQuestion": "Would you like to pause evolutions for {{pokemonName}}?\nEvolutions can be re-enabled from the party screen.",
+    "evolutionsPaused": "Evolutions have been paused for {{pokemonName}}.",
+    "evolutionDone": "Congratulations!\nYour {{pokemonName}} evolved into {{evolvedPokemonName}}!",
     "dailyRankings": "Rankings Diarios",
     "weeklyRankings": "Rankings Semanales",
     "noRankings": "Sin Rankings",

src/locales/es/weather.ts

@@ -0,0 +1,44 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+/**
+ * The weather namespace holds text displayed when weather is active during a battle
+ */
+export const weather: SimpleTranslationEntries = {
+    "sunnyStartMessage": "The sunlight got bright!",
+    "sunnyLapseMessage": "The sunlight is strong.",
+    "sunnyClearMessage": "The sunlight faded.",
+
+    "rainStartMessage": "A downpour started!",
+    "rainLapseMessage": "The downpour continues.",
+    "rainClearMessage": "The rain stopped.",
+
+    "sandstormStartMessage": "A sandstorm brewed!",
+    "sandstormLapseMessage": "The sandstorm rages.",
+    "sandstormClearMessage": "The sandstorm subsided.",
+    "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is buffeted\nby the sandstorm!",
+
+    "hailStartMessage": "It started to hail!",
+    "hailLapseMessage": "Hail continues to fall.",
+    "hailClearMessage": "The hail stopped.",
+    "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is pelted\nby the hail!",
+
+    "snowStartMessage": "It started to snow!",
+    "snowLapseMessage": "The snow is falling down.",
+    "snowClearMessage": "The snow stopped.",
+
+    "fogStartMessage": "A thick fog emerged!",
+    "fogLapseMessage": "The fog continues.",
+    "fogClearMessage": "The fog disappeared.",
+
+    "heavyRainStartMessage": "A heavy downpour started!",
+    "heavyRainLapseMessage": "The heavy downpour continues.",
+    "heavyRainClearMessage": "The heavy rain stopped.",
+    
+    "harshSunStartMessage": "The sunlight got hot!",
+    "harshSunLapseMessage": "The sun is scorching hot.",
+    "harshSunClearMessage": "The harsh sunlight faded.",
+
+    "strongWindsStartMessage": "A heavy wind began!",
+    "strongWindsLapseMessage": "The wind blows intensely.",
+    "strongWindsClearMessage": "The heavy wind stopped."
+}

src/locales/fr/config.ts

@@ -13,6 +13,7 @@ import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
 import { starterSelectUiHandler } from "./starter-select-ui-handler";
 import { tutorial } from "./tutorial";
+import { weather } from "./weather";
 
 
 export const frConfig = {
@@ -30,5 +31,6 @@ export const frConfig = {
     starterSelectUiHandler: starterSelectUiHandler,
     tutorial: tutorial,
     nature: nature,
-    growth: growth
+    growth: growth,
+    weather: weather
 }

src/locales/fr/menu.ts

@@ -30,6 +30,11 @@ export const menu: SimpleTranslationEntries = {
   "boyOrGirl": "Es-tu un garçon ou une fille ?",
   "boy": "Garçon",
   "girl": "Fille",
+  "evolving": "Quoi ?\n{{pokemonName}} évolue !",
+  "stoppedEvolving": "Hein ?\n{{pokemonName}} n’évolue plus !",
+  "pauseEvolutionsQuestion": "Mettre en pause les évolutions pour {{pokemonName}} ?\nElles peuvent être réactivées depuis l’écran d’équipe.",
+  "evolutionsPaused": "Les évolutions ont été mises en pause pour {{pokemonName}}.",
+  "evolutionDone": "Félicitations !\n{{pokemonName}} a évolué en {{evolvedPokemonName}} !",
   "dailyRankings": "Classement du Jour",
   "weeklyRankings": "Classement de la Semaine",
   "noRankings": "Pas de Classement",

src/locales/fr/weather.ts

@@ -0,0 +1,44 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+/**
+ * The weather namespace holds text displayed when weather is active during a battle
+ */
+export const weather: SimpleTranslationEntries = {
+    "sunnyStartMessage": "Les rayons du soleil brillent !",
+    "sunnyLapseMessage": "Les rayons du soleil brillent fort !",
+    "sunnyClearMessage": "Les rayons du soleil s’affaiblissent !",
+
+    "rainStartMessage": "Il commence à pleuvoir !",
+    "rainLapseMessage": "La pluie continue de tomber !",
+    "rainClearMessage": "La pluie s’est arrêtée !",
+
+    "sandstormStartMessage": "Une tempête de sable se prépare !",
+    "sandstormLapseMessage": "La tempête de sable fait rage !",
+    "sandstormClearMessage": "La tempête de sable se calme !",
+    "sandstormDamageMessage": "La tempête de sable inflige des dégâts\nà {{pokemonPrefix}}{{pokemonName}} !",
+
+    "hailStartMessage": "Il commence à grêler !",
+    "hailLapseMessage": "La grêle continue de tomber !",
+    "hailClearMessage": "La grêle s’est arrêtée !",
+    "hailDamageMessage": "La grêle inflige des dégâts\nà {{pokemonPrefix}}{{pokemonName}} !",
+
+    "snowStartMessage": "Il commence à neiger !",
+    "snowLapseMessage": "Il y a une tempête de neige !",
+    "snowClearMessage": "La neige s’est arrêtée !",
+
+    "fogStartMessage": "Le brouillard devient épais…",
+    "fogLapseMessage": "Le brouillard continue !",
+    "fogClearMessage": "Le brouillard s’est dissipé !",
+
+    "heavyRainStartMessage": "Une pluie battante s’abat soudainement !",
+    "heavyRainLapseMessage": "La pluie battante continue.",
+    "heavyRainClearMessage": "La pluie battante s’est arrêtée…",
+    
+    "harshSunStartMessage": "Les rayons du soleil s’intensifient !",
+    "harshSunLapseMessage": "Les rayons du soleil sont brulants !",
+    "harshSunClearMessage": "Les rayons du soleil s’affaiblissent !",
+
+    "strongWindsStartMessage": "Un vent mystérieux se lève !",
+    "strongWindsLapseMessage": "Le vent mystérieux violemment !",
+    "strongWindsClearMessage": "Le vent mystérieux s’est dissipé…"
+}

src/locales/it/config.ts

@@ -13,6 +13,7 @@ import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
 import { starterSelectUiHandler } from "./starter-select-ui-handler";
 import { tutorial } from "./tutorial";
+import { weather } from "./weather";
 
 
 export const itConfig = {
@@ -30,5 +31,6 @@ export const itConfig = {
     starterSelectUiHandler: starterSelectUiHandler,
     tutorial: tutorial,
     nature: nature,
-    growth: growth
+    growth: growth,
+    weather: weather
 }

src/locales/it/menu.ts

@@ -40,6 +40,11 @@ export const menu: SimpleTranslationEntries = {
     "noRankings": "Nessuna Classifica",
     "loading": "Caricamento…",
     "playersOnline": "Giocatori Online",
+    "evolving": "What?\n{{pokemonName}} is evolving!",
+    "stoppedEvolving": "{{pokemonName}} stopped evolving.",
+    "pauseEvolutionsQuestion": "Would you like to pause evolutions for {{pokemonName}}?\nEvolutions can be re-enabled from the party screen.",
+    "evolutionsPaused": "Evolutions have been paused for {{pokemonName}}.",
+    "evolutionDone": "Congratulations!\nYour {{pokemonName}} evolved into {{evolvedPokemonName}}!",
     "empty":"Vuoto",
     "yes":"Si",
     "no":"No",

src/locales/it/weather.ts

@@ -0,0 +1,44 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+/**
+ * The weather namespace holds text displayed when weather is active during a battle
+ */
+export const weather: SimpleTranslationEntries = {
+    "sunnyStartMessage": "The sunlight got bright!",
+    "sunnyLapseMessage": "The sunlight is strong.",
+    "sunnyClearMessage": "The sunlight faded.",
+
+    "rainStartMessage": "A downpour started!",
+    "rainLapseMessage": "The downpour continues.",
+    "rainClearMessage": "The rain stopped.",
+
+    "sandstormStartMessage": "A sandstorm brewed!",
+    "sandstormLapseMessage": "The sandstorm rages.",
+    "sandstormClearMessage": "The sandstorm subsided.",
+    "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is buffeted\nby the sandstorm!",
+
+    "hailStartMessage": "It started to hail!",
+    "hailLapseMessage": "Hail continues to fall.",
+    "hailClearMessage": "The hail stopped.",
+    "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is pelted\nby the hail!",
+
+    "snowStartMessage": "It started to snow!",
+    "snowLapseMessage": "The snow is falling down.",
+    "snowClearMessage": "The snow stopped.",
+
+    "fogStartMessage": "A thick fog emerged!",
+    "fogLapseMessage": "The fog continues.",
+    "fogClearMessage": "The fog disappeared.",
+
+    "heavyRainStartMessage": "A heavy downpour started!",
+    "heavyRainLapseMessage": "The heavy downpour continues.",
+    "heavyRainClearMessage": "The heavy rain stopped.",
+    
+    "harshSunStartMessage": "The sunlight got hot!",
+    "harshSunLapseMessage": "The sun is scorching hot.",
+    "harshSunClearMessage": "The harsh sunlight faded.",
+
+    "strongWindsStartMessage": "A heavy wind began!",
+    "strongWindsLapseMessage": "The wind blows intensely.",
+    "strongWindsClearMessage": "The heavy wind stopped."
+}

src/locales/pt_BR/config.ts

@@ -12,6 +12,7 @@ import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
 import { starterSelectUiHandler } from "./starter-select-ui-handler";
 import { tutorial } from "./tutorial";
+import { weather } from "./weather";
 
 
 export const ptBrConfig = {
@@ -28,5 +29,6 @@ export const ptBrConfig = {
     starterSelectUiHandler: starterSelectUiHandler,
     tutorial: tutorial,
     nature: nature,
-    growth: growth
+    growth: growth,
+    weather: weather
 }

src/locales/pt_BR/menu-ui-handler.ts

@@ -1,23 +1,23 @@
 import { SimpleTranslationEntries } from "#app/plugins/i18n";
 
 export const menuUiHandler: SimpleTranslationEntries = {
-    "GAME_SETTINGS": 'Configurações',
+    "GAME_SETTINGS": "Configurações",
     "ACHIEVEMENTS": "Conquistas",
     "STATS": "Estatísticas",
     "VOUCHERS": "Vouchers",
     "EGG_LIST": "Incubadora",
-    "EGG_GACHA": "Gacha de Ovos",
-    "MANAGE_DATA": "Gerenciar Dados",
+    "EGG_GACHA": "Gacha de ovos",
+    "MANAGE_DATA": "Gerenciar dados",
     "COMMUNITY": "Comunidade",
-    "SAVE_AND_QUIT": "Save and Quit",
+    "SAVE_AND_QUIT": "Salvar e sair",
     "LOG_OUT": "Logout",
     "slot": "Slot {{slotNumber}}",
-    "importSession": "Importar Sessão",
+    "importSession": "Importar sessão",
     "importSlotSelect": "Selecione um slot para importar.",
-    "exportSession": "Exportar Sessão",
+    "exportSession": "Exportar sessão",
     "exportSlotSelect": "Selecione um slot para exportar.",
-    "importData": "Importar Dados",
-    "exportData": "Exportar Dados",
+    "importData": "Importar dados",
+    "exportData": "Exportar dados",
     "cancel": "Cancelar",
     "losingProgressionWarning": "Você vai perder todo o progresso desde o início da batalha. Confirmar?"
 } as const;

src/locales/pt_BR/menu.ts

@@ -8,7 +8,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const menu: SimpleTranslationEntries = {
     "cancel": "Cancelar",
     "continue": "Continuar",
-    "dailyRun": "Desafio diário (Beta)",
+    "dailyRun": "Desafio Diário (Beta)",
     "loadGame": "Carregar Jogo",
     "newGame": "Novo Jogo",
     "selectGameMode": "Escolha um modo de jogo.",
@@ -35,6 +35,11 @@ export const menu: SimpleTranslationEntries = {
     "boyOrGirl": "Você é um menino ou uma menina?",
     "boy": "Menino",
     "girl": "Menina",
+    "evolving": "Que?\n{{pokemonName}} tá evoluindo!",
+    "stoppedEvolving": "{{pokemonName}} parou de evoluir.",
+    "pauseEvolutionsQuestion": "Gostaria de pausar evoluções para {{pokemonName}}?\nEvoluções podem ser religadas na tela de equipe.",
+    "evolutionsPaused": "Evoluções foram paradas para {{pokemonName}}.",
+    "evolutionDone": "Parabéns!\nSeu {{pokemonName}} evolui para {{evolvedPokemonName}}!",
     "dailyRankings": "Classificação Diária",
     "weeklyRankings": "Classificação Semanal",
     "noRankings": "Sem Classificação",

src/locales/pt_BR/weather.ts

@@ -0,0 +1,44 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+/**
+ * The weather namespace holds text displayed when weather is active during a battle
+ */
+export const weather: SimpleTranslationEntries = {
+    "sunnyStartMessage": "A luz do sol ficou clara!",
+    "sunnyLapseMessage": "A luz do sol está forte.",
+    "sunnyClearMessage": "A luz do sol sumiu.",
+
+    "rainStartMessage": "Começou a chover!",
+    "rainLapseMessage": "A chuva continua forte.",
+    "rainClearMessage": "A chuva parou.",
+
+    "sandstormStartMessage": "Uma tempestade de areia se formou!",
+    "sandstormLapseMessage": "A tempestade de areia é violenta.",
+    "sandstormClearMessage": "A tempestade de areia diminuiu.",
+    "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} é atingido\npela tempestade de areia!",
+
+    "hailStartMessage": "Começou a chover granizo!",
+    "hailLapseMessage": "Granizo cai do céu.",
+    "hailClearMessage": "O granizo parou.",
+    "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} é atingido\npelo granizo!",
+
+    "snowStartMessage": "Começou a nevar!",
+    "snowLapseMessage": "A neve continua caindo.",
+    "snowClearMessage": "Parou de nevar.",
+
+    "fogStartMessage": "Uma névoa densa se formou!",
+    "fogLapseMessage": "A névoa continua forte.",
+    "fogClearMessage": "A névoa sumiu.",
+
+    "heavyRainStartMessage": "Um temporal começou!",
+    "heavyRainLapseMessage": "O temporal continua forte.",
+    "heavyRainClearMessage": "O temporal parou.",
+    
+    "harshSunStartMessage": "A luz do sol está escaldante!",
+    "harshSunLapseMessage": "A luz do sol é intensa.",
+    "harshSunClearMessage": "A luz do sol enfraqueceu.",
+
+    "strongWindsStartMessage": "Ventos fortes apareceram!",
+    "strongWindsLapseMessage": "Os ventos fortes continuam.",
+    "strongWindsClearMessage": "Os ventos fortes diminuíram.",
+}

src/locales/zh_CN/config.ts

@@ -12,6 +12,7 @@ import { pokemonStat } from "./pokemon-stat";
 import { starterSelectUiHandler } from "./starter-select-ui-handler";
 import { tutorial } from "./tutorial";
 import { nature } from "./nature";
+import { weather } from "./weather";
 
 
 export const zhCnConfig = {
@@ -29,5 +30,6 @@ export const zhCnConfig = {
     starterSelectUiHandler: starterSelectUiHandler,
     tutorial: tutorial,
 
-    nature: nature
+    nature: nature,
+    weather: weather
 }

src/locales/zh_CN/menu.ts

@@ -35,6 +35,11 @@ export const menu: SimpleTranslationEntries = {
     "boyOrGirl": "你是男孩还是女孩？",
     "boy": "男孩",
     "girl": "女孩",
+    "evolving": "What?\n{{pokemonName}} is evolving!",
+    "stoppedEvolving": "{{pokemonName}} stopped evolving.",
+    "pauseEvolutionsQuestion": "Would you like to pause evolutions for {{pokemonName}}?\nEvolutions can be re-enabled from the party screen.",
+    "evolutionsPaused": "Evolutions have been paused for {{pokemonName}}.",
+    "evolutionDone": "Congratulations!\nYour {{pokemonName}} evolved into {{evolvedPokemonName}}!",
     "dailyRankings": "每日排名",
     "weeklyRankings": "每周排名",
     "noRankings": "无排名",

src/locales/zh_CN/weather.ts

@@ -0,0 +1,44 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+/**
+ * The weather namespace holds text displayed when weather is active during a battle
+ */
+export const weather: SimpleTranslationEntries = {
+    "sunnyStartMessage": "The sunlight got bright!",
+    "sunnyLapseMessage": "The sunlight is strong.",
+    "sunnyClearMessage": "The sunlight faded.",
+
+    "rainStartMessage": "A downpour started!",
+    "rainLapseMessage": "The downpour continues.",
+    "rainClearMessage": "The rain stopped.",
+
+    "sandstormStartMessage": "A sandstorm brewed!",
+    "sandstormLapseMessage": "The sandstorm rages.",
+    "sandstormClearMessage": "The sandstorm subsided.",
+    "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is buffeted\nby the sandstorm!",
+
+    "hailStartMessage": "It started to hail!",
+    "hailLapseMessage": "Hail continues to fall.",
+    "hailClearMessage": "The hail stopped.",
+    "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is pelted\nby the hail!",
+
+    "snowStartMessage": "It started to snow!",
+    "snowLapseMessage": "The snow is falling down.",
+    "snowClearMessage": "The snow stopped.",
+
+    "fogStartMessage": "A thick fog emerged!",
+    "fogLapseMessage": "The fog continues.",
+    "fogClearMessage": "The fog disappeared.",
+
+    "heavyRainStartMessage": "A heavy downpour started!",
+    "heavyRainLapseMessage": "The heavy downpour continues.",
+    "heavyRainClearMessage": "The heavy rain stopped.",
+    
+    "harshSunStartMessage": "The sunlight got hot!",
+    "harshSunLapseMessage": "The sun is scorching hot.",
+    "harshSunClearMessage": "The harsh sunlight faded.",
+
+    "strongWindsStartMessage": "A heavy wind began!",
+    "strongWindsLapseMessage": "The wind blows intensely.",
+    "strongWindsClearMessage": "The heavy wind stopped."
+}

src/modifier/modifier-type.ts

@@ -978,11 +978,11 @@ const modifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.POKEBALL, 6),
     new WeightedModifierType(modifierTypes.RARE_CANDY, 2),
     new WeightedModifierType(modifierTypes.POTION, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => p.getInverseHp() >= 10 || p.getHpRatio() <= 0.875).length, 3);
+      const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 10 || p.getHpRatio() <= 0.875) && !p.isFainted()).length, 3);
       return thresholdPartyMemberCount * 3;
     }, 9),
     new WeightedModifierType(modifierTypes.SUPER_POTION, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => p.getInverseHp() >= 25 || p.getHpRatio() <= 0.75).length, 3);
+      const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 25 || p.getHpRatio() <= 0.75) && !p.isFainted()).length, 3);
       return thresholdPartyMemberCount;
     }, 3),
     new WeightedModifierType(modifierTypes.ETHER, (party: Pokemon[]) => {
@@ -1016,16 +1016,16 @@ const modifierPool: ModifierPool = {
       return party.filter(p => p.isFainted()).length >= Math.ceil(party.length / 2) ? 1 : 0;
     }, 1),
     new WeightedModifierType(modifierTypes.HYPER_POTION, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => p.getInverseHp() >= 100 || p.getHpRatio() <= 0.625).length, 3);
+      const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 100 || p.getHpRatio() <= 0.625) && !p.isFainted()).length, 3);
       return thresholdPartyMemberCount * 3;
     }, 9),
     new WeightedModifierType(modifierTypes.MAX_POTION, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => p.getInverseHp() >= 150 || p.getHpRatio() <= 0.5).length, 3);
+      const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 150 || p.getHpRatio() <= 0.5) && !p.isFainted()).length, 3);
       return thresholdPartyMemberCount;
     }, 3),
     new WeightedModifierType(modifierTypes.FULL_RESTORE, (party: Pokemon[]) => {
       const statusEffectPartyMemberCount = Math.min(party.filter(p => p.hp && !!p.status).length, 3);
-      const thresholdPartyMemberCount = Math.floor((Math.min(party.filter(p => p.getInverseHp() >= 150 || p.getHpRatio() <= 0.5).length, 3) + statusEffectPartyMemberCount) / 2);
+      const thresholdPartyMemberCount = Math.floor((Math.min(party.filter(p => (p.getInverseHp() >= 150 || p.getHpRatio() <= 0.5) && !p.isFainted()).length, 3) + statusEffectPartyMemberCount) / 2);
       return thresholdPartyMemberCount;
     }, 3),
     new WeightedModifierType(modifierTypes.ELIXIR, (party: Pokemon[]) => {

src/plugins/i18n.ts

@@ -110,6 +110,7 @@ declare module 'i18next' {
       starterSelectUiHandler: SimpleTranslationEntries;
       nature: SimpleTranslationEntries;
       growth: SimpleTranslationEntries;
+      weather: SimpleTranslationEntries;
     };
   }
 }