Merge branch 'main' of https://github.com/pagefaultgames/pokerogue into rockruff_dusk_form_bug

src/data/nature.ts

@@ -2,6 +2,7 @@ import { Stat, getStatName } from "./pokemon-stat";
 import * as Utils from "../utils";
 import { TextStyle, getBBCodeFrag } from "../ui/text";
 import { UiTheme } from "#app/enums/ui-theme";
+import i18next from 'i18next';
 
 export enum Nature {
   HARDY,
@@ -33,6 +34,10 @@ export enum Nature {
 
 export function getNatureName(nature: Nature, includeStatEffects: boolean = false, forStarterSelect: boolean = false, ignoreBBCode: boolean = false, uiTheme: UiTheme = UiTheme.DEFAULT): string {
   let ret = Utils.toReadableString(Nature[nature]);
+  //Translating nature
+  if(i18next.exists('nature:' + ret)){
+    ret = i18next.t('nature:' + ret as any)
+  }
   if (includeStatEffects) {
     const stats = Utils.getEnumValues(Stat).slice(1);
     let increasedStat: Stat = null;

src/locales/de/config.ts

@@ -2,9 +2,11 @@ import { ability } from "./ability";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
+import { growth } from "./growth";
 import { menu } from "./menu";
 import { menuUiHandler } from "./menu-ui-handler";
 import { move } from "./move";
+import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
@@ -24,5 +26,7 @@ export const deConfig = {
     pokemonStat: pokemonStat,
     pokemon: pokemon,
     starterSelectUiHandler: starterSelectUiHandler,
-    tutorial: tutorial
+    tutorial: tutorial,
+    nature: nature,
+    growth: growth
 }

src/locales/de/growth.ts

@@ -0,0 +1,10 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const growth: SimpleTranslationEntries = {
+    "Erratic": "Erratic",
+    "Fast": "Fast",
+    "Medium_Fast": "Medium Fast",
+    "Medium_Slow": "Medium Slow",
+    "Slow": "Slow",
+    "Fluctuating": "Fluctuating"
+} as const;

src/locales/de/nature.ts

@@ -0,0 +1,29 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const nature: SimpleTranslationEntries = {
+  "Hardy": "Robust",
+  "Lonely": "Solo",
+  "Brave": "Mutig",
+  "Adamant": "Hart",
+  "Naughty": "Frech",
+  "Bold": "Kühn",
+  "Docile": "Sanft",
+  "Relaxed": "Locker",
+  "Impish": "Pfiffig",
+  "Lax": "Lasch",
+  "Timid": "Scheu",
+  "Hasty": "Hastig",
+  "Serious": "Ernst",
+  "Jolly": "Froh",
+  "Naive": "Naiv",
+  "Modest": "Mäßig",
+  "Mild": "Mild",
+  "Quiet": "Ruhig",
+  "Bashful": "Zaghaft",
+  "Rash": "Hitzig",
+  "Calm": "Still",
+  "Gentle": "Zart",
+  "Sassy": "Forsch",
+  "Careful": "Sacht",
+  "Quirky": "Kauzig"
+} as const;

src/locales/en/config.ts

@@ -2,9 +2,11 @@ import { ability } from "./ability";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
+import { growth } from "./growth";
 import { menu } from "./menu";
 import { menuUiHandler } from "./menu-ui-handler";
 import { move } from "./move";
+import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
@@ -24,5 +26,7 @@ export const enConfig = {
     pokemonStat: pokemonStat,
     pokemon: pokemon,
     starterSelectUiHandler: starterSelectUiHandler,
-    tutorial: tutorial
+    tutorial: tutorial,
+    nature: nature,
+    growth: growth
 }

src/locales/en/growth.ts

@@ -0,0 +1,10 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const growth: SimpleTranslationEntries = {
+    "Erratic": "Erratic",
+    "Fast": "Fast",
+    "Medium_Fast": "Medium Fast",
+    "Medium_Slow": "Medium Slow",
+    "Slow": "Slow",
+    "Fluctuating": "Fluctuating"
+} as const;

src/locales/en/nature.ts

@@ -0,0 +1,29 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const nature: SimpleTranslationEntries = {
+  "Hardy": "Hardy",
+  "Lonely": "Lonely",
+  "Brave": "Brave",
+  "Adamant": "Adamant",
+  "Naughty": "Naughty",
+  "Bold": "Bold",
+  "Docile": "Docile",
+  "Relaxed": "Relaxed",
+  "Impish": "Impish",
+  "Lax": "Lax",
+  "Timid": "Timid",
+  "Hasty": "Hasty",
+  "Serious": "Serious",
+  "Jolly": "Jolly",
+  "Naive": "Naive",
+  "Modest": "Modest",
+  "Mild": "Mild",
+  "Quiet": "Quiet",
+  "Bashful": "Bashful",
+  "Rash": "Rash",
+  "Calm": "Calm",
+  "Gentle": "Gentle",
+  "Sassy": "Sassy",
+  "Careful": "Careful",
+  "Quirky": "Quirky"
+} as const;

src/locales/es/config.ts

@@ -2,9 +2,11 @@ import { ability } from "./ability";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
+import { growth } from "./growth";
 import { menu } from "./menu";
 import { menuUiHandler } from "./menu-ui-handler";
 import { move } from "./move";
+import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
@@ -24,5 +26,7 @@ export const esConfig = {
     pokemonStat: pokemonStat,
     pokemon: pokemon,
     starterSelectUiHandler: starterSelectUiHandler,
-    tutorial: tutorial
+    tutorial: tutorial,
+    nature: nature,
+    growth: growth
 }

src/locales/es/growth.ts

@@ -0,0 +1,10 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const growth: SimpleTranslationEntries = {
+    "Erratic": "Errático",
+    "Fast": "Rápido",
+    "Medium_Fast": "Medio Rápido",
+    "Medium_Slow": "Medio Lento",
+    "Slow": "Lento",
+    "Fluctuating": "Fluctuante"
+} as const;

src/locales/es/nature.ts

@@ -0,0 +1,29 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const nature: SimpleTranslationEntries = {
+  "Hardy": "Fuerte",
+  "Lonely": "Huraña",
+  "Brave": "Audaz",
+  "Adamant": "Firme",
+  "Naughty": "Pícara",
+  "Bold": "Osada",
+  "Docile": "Dócil",
+  "Relaxed": "Plácida",
+  "Impish": "Agitada",
+  "Lax": "Floja",
+  "Timid": "Miedosa",
+  "Hasty": "Activa",
+  "Serious": "Seria",
+  "Jolly": "Alegre",
+  "Naive": "Ingenua",
+  "Modest": "Modesta",
+  "Mild": "Afable",
+  "Quiet": "Mansa",
+  "Bashful": "Tímida",
+  "Rash": "Alocada",
+  "Calm": "Serena",
+  "Gentle": "Amable",
+  "Sassy": "Grosera",
+  "Careful": "Cauta",
+  "Quirky": "Rara"
+} as const;

src/locales/fr/config.ts

@@ -2,9 +2,11 @@ import { ability } from "./ability";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
+import { growth } from "./growth";
 import { menu } from "./menu";
 import { menuUiHandler } from "./menu-ui-handler";
 import { move } from "./move";
+import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
@@ -24,5 +26,7 @@ export const frConfig = {
     pokemonStat: pokemonStat,
     pokemon: pokemon,
     starterSelectUiHandler: starterSelectUiHandler,
-    tutorial: tutorial
+    tutorial: tutorial,
+    nature: nature,
+    growth: growth
 }

src/locales/fr/growth.ts

@@ -0,0 +1,10 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const growth: SimpleTranslationEntries = {
+    "Erratic": "Erratic",
+    "Fast": "Fast",
+    "Medium_Fast": "Medium Fast",
+    "Medium_Slow": "Medium Slow",
+    "Slow": "Slow",
+    "Fluctuating": "Fluctuating"
+} as const;

src/locales/fr/nature.ts

@@ -0,0 +1,29 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const nature: SimpleTranslationEntries = {
+  "Hardy": "Hardi",
+  "Lonely": "Solo",
+  "Brave": "Brave",
+  "Adamant": "Rigide",
+  "Naughty": "Mauvais",
+  "Bold": "Assuré",
+  "Docile": "Docile",
+  "Relaxed": "Relax",
+  "Impish": "Malin",
+  "Lax": "Lâche",
+  "Timid": "Timide",
+  "Hasty": "Pressé",
+  "Serious": "Sérieux",
+  "Jolly": "Jovial",
+  "Naive": "Naïf",
+  "Modest": "Modeste",
+  "Mild": "Doux",
+  "Quiet": "Discret",
+  "Bashful": "Pudique",
+  "Rash": "Foufou",
+  "Calm": "Calme",
+  "Gentle": "Gentil",
+  "Sassy": "Malpoli",
+  "Careful": "Prudent",
+  "Quirky": "Bizarre"
+} as const;

src/locales/it/config.ts

@@ -2,9 +2,11 @@ import { ability } from "./ability";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
+import { growth } from "./growth";
 import { menu } from "./menu";
 import { menuUiHandler } from "./menu-ui-handler";
 import { move } from "./move";
+import { nature } from "./nature";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
 import { pokemonStat } from "./pokemon-stat";
@@ -24,5 +26,7 @@ export const itConfig = {
     pokemonStat: pokemonStat,
     pokemon: pokemon,
     starterSelectUiHandler: starterSelectUiHandler,
-    tutorial: tutorial
+    tutorial: tutorial,
+    nature: nature,
+    growth: growth
 }

src/locales/it/growth.ts

@@ -0,0 +1,10 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const growth: SimpleTranslationEntries = {
+    "Erratic": "Erratic",
+    "Fast": "Fast",
+    "Medium_Fast": "Medium Fast",
+    "Medium_Slow": "Medium Slow",
+    "Slow": "Slow",
+    "Fluctuating": "Fluctuating"
+} as const;

src/locales/it/nature.ts

@@ -0,0 +1,29 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const nature: SimpleTranslationEntries = {
+  "Hardy": "Hardy",
+  "Lonely": "Lonely",
+  "Brave": "Brave",
+  "Adamant": "Adamant",
+  "Naughty": "Naughty",
+  "Bold": "Bold",
+  "Docile": "Docile",
+  "Relaxed": "Relaxed",
+  "Impish": "Impish",
+  "Lax": "Lax",
+  "Timid": "Timid",
+  "Hasty": "Hasty",
+  "Serious": "Serious",
+  "Jolly": "Jolly",
+  "Naive": "Naive",
+  "Modest": "Modest",
+  "Mild": "Mild",
+  "Quiet": "Quiet",
+  "Bashful": "Bashful",
+  "Rash": "Rash",
+  "Calm": "Calm",
+  "Gentle": "Gentle",
+  "Sassy": "Sassy",
+  "Careful": "Careful",
+  "Quirky": "Quirky"
+} as const;

src/locales/zh_CN/config.ts

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

src/locales/zh_CN/nature.ts

@@ -0,0 +1,29 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const nature: SimpleTranslationEntries = {
+  "Hardy": "Hardy",
+  "Lonely": "Lonely",
+  "Brave": "Brave",
+  "Adamant": "Adamant",
+  "Naughty": "Naughty",
+  "Bold": "Bold",
+  "Docile": "Docile",
+  "Relaxed": "Relaxed",
+  "Impish": "Impish",
+  "Lax": "Lax",
+  "Timid": "Timid",
+  "Hasty": "Hasty",
+  "Serious": "Serious",
+  "Jolly": "Jolly",
+  "Naive": "Naive",
+  "Modest": "Modest",
+  "Mild": "Mild",
+  "Quiet": "Quiet",
+  "Bashful": "Bashful",
+  "Rash": "Rash",
+  "Calm": "Calm",
+  "Gentle": "Gentle",
+  "Sassy": "Sassy",
+  "Careful": "Careful",
+  "Quirky": "Quirky"
+} as const;

src/plugins/i18n.ts

@@ -103,6 +103,8 @@ declare module 'i18next' {
       fightUiHandler: SimpleTranslationEntries;
       tutorial: SimpleTranslationEntries;
       starterSelectUiHandler: SimpleTranslationEntries;
+      nature: SimpleTranslationEntries;
+      growth: SimpleTranslationEntries;
     };
   }
 }

src/system/game-data.ts

@@ -754,7 +754,7 @@ export class GameData {
   tryClearSession(scene: BattleScene, slotId: integer): Promise<[success: boolean, newClear: boolean]> {
     return new Promise<[boolean, boolean]>(resolve => {
       if (bypassLogin) {
-        localStorage.removeItem('sessionData');
+        localStorage.removeItem(`sessionData${slotId ? slotId : ''}`);
         return resolve([true, true]);
       }
 

src/ui/starter-select-ui-handler.ts

@@ -1294,7 +1294,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         this.pokemonLuckText.setTint(getVariantTint(Math.min(luck - 1, 2) as Variant));
         this.pokemonLuckLabelText.setVisible(this.pokemonLuckText.visible);
 
-        this.pokemonGrowthRateText.setText(Utils.toReadableString(GrowthRate[species.growthRate]));
+        //Growth translate
+        let growthReadable = Utils.toReadableString(GrowthRate[species.growthRate]);
+        let growthAux = growthReadable.replace(" ", "_")
+        if(i18next.exists("growth:" + growthAux)){
+          growthReadable = i18next.t("growth:"+ growthAux as any)
+        }
+        this.pokemonGrowthRateText.setText(growthReadable);
+        
         this.pokemonGrowthRateText.setColor(getGrowthRateColor(species.growthRate));
         this.pokemonGrowthRateText.setShadowColor(getGrowthRateColor(species.growthRate, true));
         this.pokemonGrowthRateLabelText.setVisible(true);