Merge 7dfe1ce216 into 6c0253ada4

src/data/balance/biomes.ts

@@ -7,7 +7,6 @@ import { TimeOfDay } from "#enums/time-of-day";
 import { TrainerType } from "#enums/trainer-type";
 import { randSeedInt } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
-import { toCamelCase } from "#utils/strings";
 import i18next from "i18next";
 
 export function getBiomeName(biome: BiomeId | -1) {
@@ -16,13 +15,13 @@ export function getBiomeName(biome: BiomeId | -1) {
   }
   switch (biome) {
     case BiomeId.GRASS:
-      return i18next.t("biome:grass");
+      return i18next.t("biome:GRASS");
     case BiomeId.RUINS:
-      return i18next.t("biome:ruins");
+      return i18next.t("biome:RUINS");
     case BiomeId.END:
-      return i18next.t("biome:end");
+      return i18next.t("biome:END");
     default:
-      return i18next.t(`biome:${toCamelCase(BiomeId[biome])}`);
+      return i18next.t(`biome:${BiomeId[biome].toUpperCase()}`);
   }
 }
 

src/data/double-battle-dialogue.ts

@@ -2,43 +2,43 @@
 // that caused this to be moved out in the first place
 export const doubleBattleDialogue = {
   blue_red_double: {
-    encounter: ["doubleBattleDialogue:blueRedDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:blue_red_double.encounter.1"],
-    victory: ["doubleBattleDialogue:blueRedDouble.victory.1"],
+    victory: ["doubleBattleDialogue:blue_red_double.victory.1"],
   },
   red_blue_double: {
-    encounter: ["doubleBattleDialogue:redBlueDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:red_blue_double.encounter.1"],
-    victory: ["doubleBattleDialogue:redBlueDouble.victory.1"],
+    victory: ["doubleBattleDialogue:red_blue_double.victory.1"],
   },
   tate_liza_double: {
-    encounter: ["doubleBattleDialogue:tateLizaDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:tate_liza_double.encounter.1"],
-    victory: ["doubleBattleDialogue:tateLizaDouble.victory.1"],
+    victory: ["doubleBattleDialogue:tate_liza_double.victory.1"],
   },
   liza_tate_double: {
-    encounter: ["doubleBattleDialogue:lizaTateDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:liza_tate_double.encounter.1"],
-    victory: ["doubleBattleDialogue:lizaTateDouble.victory.1"],
+    victory: ["doubleBattleDialogue:liza_tate_double.victory.1"],
   },
   wallace_steven_double: {
-    encounter: ["doubleBattleDialogue:wallaceStevenDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:wallace_steven_double.encounter.1"],
-    victory: ["doubleBattleDialogue:wallaceStevenDouble.victory.1"],
+    victory: ["doubleBattleDialogue:wallace_steven_double.victory.1"],
   },
   steven_wallace_double: {
-    encounter: ["doubleBattleDialogue:stevenWallaceDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:steven_wallace_double.encounter.1"],
-    victory: ["doubleBattleDialogue:stevenWallaceDouble.victory.1"],
+    victory: ["doubleBattleDialogue:steven_wallace_double.victory.1"],
   },
   alder_iris_double: {
-    encounter: ["doubleBattleDialogue:alderIrisDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:alder_iris_double.encounter.1"],
-    victory: ["doubleBattleDialogue:alderIrisDouble.victory.1"],
+    victory: ["doubleBattleDialogue:alder_iris_double.victory.1"],
   },
   iris_alder_double: {
-    encounter: ["doubleBattleDialogue:irisAlderDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:iris_alder_double.encounter.1"],
-    victory: ["doubleBattleDialogue:irisAlderDouble.victory.1"],
+    victory: ["doubleBattleDialogue:iris_alder_double.victory.1"],
   },
   marnie_piers_double: {
-    encounter: ["doubleBattleDialogue:marniePiersDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:marnie_piers_double.encounter.1"],
-    victory: ["doubleBattleDialogue:marniePiersDouble.victory.1"],
+    victory: ["doubleBattleDialogue:marnie_piers_double.victory.1"],
   },
   piers_marnie_double: {
-    encounter: ["doubleBattleDialogue:piersMarnieDouble.encounter.1"],
+    encounter: ["doubleBattleDialogue:piers_marnie_double.encounter.1"],
-    victory: ["doubleBattleDialogue:piersMarnieDouble.victory.1"],
+    victory: ["doubleBattleDialogue:piers_marnie_double.victory.1"],
   },
 };

src/data/trainers/trainer-config.ts

@@ -1865,43 +1865,27 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(
       0,
       getRandomPartyMemberFunc([
-        SpeciesId.METAPOD,
-        SpeciesId.LEDYBA,
-        SpeciesId.CLEFFA,
-        SpeciesId.WOOPER,
-        SpeciesId.TEDDIURSA,
-        SpeciesId.REMORAID,
-        SpeciesId.HOUNDOUR,
-        SpeciesId.SILCOON,
         SpeciesId.PLUSLE,
         SpeciesId.VOLBEAT,
-        SpeciesId.SPINDA,
+        SpeciesId.PACHIRISU,
-        SpeciesId.BONSLY,
+        SpeciesId.SILCOON,
+        SpeciesId.METAPOD,
+        SpeciesId.IGGLYBUFF,
         SpeciesId.PETILIL,
-        SpeciesId.SPRITZEE,
+        SpeciesId.EEVEE,
-        SpeciesId.MILCERY,
-        SpeciesId.PICHU,
       ]),
     )
     .setPartyMemberFunc(
       1,
       getRandomPartyMemberFunc(
         [
-          SpeciesId.KAKUNA,
-          SpeciesId.SPINARAK,
-          SpeciesId.IGGLYBUFF,
-          SpeciesId.PALDEA_WOOPER,
-          SpeciesId.PHANPY,
-          SpeciesId.MANTYKE,
-          SpeciesId.ELECTRIKE,
-          SpeciesId.CASCOON,
           SpeciesId.MINUN,
           SpeciesId.ILLUMISE,
-          SpeciesId.SPINDA,
+          SpeciesId.EMOLGA,
-          SpeciesId.MIME_JR,
+          SpeciesId.CASCOON,
+          SpeciesId.KAKUNA,
+          SpeciesId.CLEFFA,
           SpeciesId.COTTONEE,
-          SpeciesId.SWIRLIX,
-          SpeciesId.FIDOUGH,
           SpeciesId.EEVEE,
         ],
         TrainerSlot.TRAINER_PARTNER,

src/field/arena.ts

@@ -895,7 +895,7 @@ export class Arena {
       case BiomeId.CAVE:
         return 14.24;
       case BiomeId.DESERT:
-        return 9.02;
+        return 1.143;
       case BiomeId.ICE_CAVE:
         return 0.0;
       case BiomeId.MEADOW:
@@ -923,7 +923,7 @@ export class Arena {
       case BiomeId.JUNGLE:
         return 0.0;
       case BiomeId.FAIRY_CAVE:
-        return 0.0;
+        return 4.542;
       case BiomeId.TEMPLE:
         return 2.547;
       case BiomeId.ISLAND:

src/ui/pokedex-page-ui-handler.ts

@@ -57,7 +57,7 @@ import { addWindow } from "#ui/ui-theme";
 import { BooleanHolder, getLocalizedSpriteKey, isNullOrUndefined, padInt, rgbHexToRgba } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
-import { toCamelCase, toTitleCase } from "#utils/strings";
+import { toTitleCase } from "#utils/strings";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
 import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText";
@@ -1517,13 +1517,13 @@ export class PokedexPageUiHandler extends MessageUiHandler {
                   this.biomes.map(b => {
                     options.push({
                       label:
-                        i18next.t(`biome:${toCamelCase(BiomeId[b.biome])}`) +
+                        i18next.t(`biome:${BiomeId[b.biome].toUpperCase()}`) +
                         " - " +
-                        i18next.t(`biome:${toCamelCase(BiomePoolTier[b.tier])}`) +
+                        i18next.t(`biome:${BiomePoolTier[b.tier].toUpperCase()}`) +
                         (b.tod.length === 1 && b.tod[0] === -1
                           ? ""
                           : " (" +
-                            b.tod.map(tod => i18next.t(`biome:${toCamelCase(TimeOfDay[tod])}`)).join(", ") +
+                            b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") +
                             ")"),
                       handler: () => false,
                     });
@@ -1538,13 +1538,13 @@ export class PokedexPageUiHandler extends MessageUiHandler {
                     this.preBiomes.map(b => {
                       options.push({
                         label:
-                          i18next.t(`biome:${toCamelCase(BiomeId[b.biome])}`) +
+                          i18next.t(`biome:${BiomeId[b.biome].toUpperCase()}`) +
                           " - " +
-                          i18next.t(`biome:${toCamelCase(BiomePoolTier[b.tier])}`) +
+                          i18next.t(`biome:${BiomePoolTier[b.tier].toUpperCase()}`) +
                           (b.tod.length === 1 && b.tod[0] === -1
                             ? ""
                             : " (" +
-                              b.tod.map(tod => i18next.t(`biome:${toCamelCase(TimeOfDay[tod])}`)).join(", ") +
+                              b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") +
                               ")"),
                         handler: () => false,
                       });