feat!: Hotfix 1.11.8 to main (#7062)

* update submodules

* test: disable Roost test due to broken interaction

* chore: update `markdown-it` sub-dep

* github: add "beta" scope for "fix" prefix (#7058)

* refactor: clean up `updatePlayerMoney` in `encounter-phase-utils.ts`

#7057

* chore!: update version to 1.11.8

* fix(encounter): "The Pokemon Salesman" ME won't pick invalid Pokemon

#7060

Non-starter Pokemon will be filtered out of the event Pokemon pool
before being passed to the ME

* chore: update submodules

---------

Co-authored-by: damocleas <damocleas25@gmail.com>

Author: damocleas

.github/scripts/pr-title.mts

@@ -61,6 +61,9 @@ const PREFIX_SCOPE_MAP = {
   test: ALL_SCOPES,
 } as const satisfies Record<Prefixes, readonly AllScopes[]>;
 
+// @ts-expect-error: Add special scope for fixing bugs that only existed on the beta branch
+PREFIX_SCOPE_MAP.fix = [...ALL_SCOPES, "beta"];
+
 async function run(): Promise<void> {
   try {
     const authToken = core.getInput("github_token", { required: true });

CONTRIBUTING.md

@@ -226,3 +226,6 @@ Try to keep the title under 72 characters, as GitHub cuts off commit titles long
 > All scopes are valid when using the "docs", "feat", "fix", "refactor" and "test" prefixes. \
 > All scopes except "audio", "battle", "graphics", and "ui" are valid when using the "balance" prefix. \
 > No other prefixes have valid scopes.
+>
+> There is a special "beta" scope for the "fix" prefix,
+> for fixing bugs that only existed on the `beta` branch that never made it onto `main`.

assets

@@ -1,7 +1,7 @@
 {
   "name": "pokemon-rogue-battle",
   "private": true,
-  "version": "1.11.7",
+  "version": "1.11.8",
   "type": "module",
   "scripts": {
     "start:prod": "vite --mode production",

locales

@@ -7,6 +7,7 @@ onlyBuiltDependencies:
   - msw
 
 overrides:
+  markdown-it@>=13.0.0 <14.1.1: '>=14.1.1'
   undici@<6.23.0: '>=6.23.0'
 
 shellEmulator: true

package.json

@@ -94,16 +94,22 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui
       false,
       false,
       false,
-      s => !NON_LEGEND_PARADOX_POKEMON.includes(s.speciesId) && !NON_LEGEND_ULTRA_BEASTS.includes(s.speciesId),
+      s =>
+        !NON_LEGEND_PARADOX_POKEMON.includes(s.speciesId)
+        && !NON_LEGEND_ULTRA_BEASTS.includes(s.speciesId)
+        && Object.keys(speciesStarterCosts) // The event expects the chosen pokemon to be a valid starter,
+          .map(sId => Number.parseInt(sId)) // and will break if a non-starter is chosen
+          .includes(s.speciesId),
     );
 
     let pokemon: PlayerPokemon;
-    /**
+    /*
      * Mon is determined as follows:
-     * If you roll the 1% for Shiny Magikarp, you get Magikarp with a random variant
-     * If an event with more than 1 valid event encounter species is active, you have 20% chance to get one of those
-     * If the rolled species has no HA, and there are valid event encounters, you will get one of those
-     * If the rolled species has no HA and there are no valid event encounters, you will get Shiny Magikarp
+     * - If you roll the 1% for Shiny Magikarp, you get Magikarp with a random variant
+     * - If an event with more than 1 valid event encounter species is active, you have 20% chance to get one of those
+     * - If the rolled species has no HA, and there are valid event encounters, you will get one of those
+     * - If the rolled species has no HA and there are no valid event encounters, you will get Shiny Magikarp
+     *
      * Mons rolled from the event encounter pool get 3 extra shiny rolls
      */
     if (

pnpm-lock.yaml

@@ -463,36 +463,28 @@ export async function loadCustomMovesForEncounter(moves: MoveId | MoveId[]): Pro
 }
 
 /**
- * Will update player money, and animate change (sound optional)
- * @param changeValue
- * @param playSound
- * @param showMessage
+ * @param moneyAmount - The amount of money being added; negative values remove money
+ * @param playSound - (Default `true`) Whether to play a sound afterward
+ * @param showMessage - (Default `true`) Whether to show a message afterward
  */
-export function updatePlayerMoney(changeValue: number, playSound = true, showMessage = true): void {
-  globalScene.money = Math.min(Math.max(globalScene.money + changeValue, 0), Number.MAX_SAFE_INTEGER);
+export function updatePlayerMoney(moneyAmount: number, playSound = true, showMessage = true): void {
+  globalScene.money = Phaser.Math.Clamp(globalScene.money + moneyAmount, 0, Number.MAX_SAFE_INTEGER);
   globalScene.updateMoneyText();
-  globalScene.animateMoneyChanged(false);
+  const isIncrease = moneyAmount >= 0;
+  globalScene.animateMoneyChanged(isIncrease);
+
   if (playSound) {
     globalScene.playSound("se/buy");
   }
+
   if (showMessage) {
-    if (changeValue < 0) {
-      globalScene.phaseManager.queueMessage(
-        i18next.t("mysteryEncounterMessages:paidMoney", {
-          amount: -changeValue,
-        }),
-        null,
-        true,
-      );
-    } else {
-      globalScene.phaseManager.queueMessage(
-        i18next.t("mysteryEncounterMessages:receiveMoney", {
-          amount: changeValue,
-        }),
-        null,
-        true,
-      );
-    }
+    const i18nKey = isIncrease ? "receive" : "paid";
+    const amount = isIncrease ? moneyAmount : -moneyAmount;
+    globalScene.phaseManager.queueMessage(
+      i18next.t(`mysteryEncounterMessages:${i18nKey}Money`, { amount }),
+      null,
+      true,
+    );
   }
 }