Merge 1f77955fb0 into ec09186264

* Replace Title BGM with custom BGM by Firel

Also added descriptions for the battle scene and arena's getBgmLoopPoint methods.

---------

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

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.5.0",
+	"version": "1.5.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.5.0",
+			"version": "1.5.2",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.5.0",
+	"version": "1.5.2",
 	"type": "module",
 	"scripts": {
 		"start": "vite",

src/battle-scene.ts

@@ -2084,8 +2084,11 @@ export default class BattleScene extends SceneBase {
     return sound;
   }
 
+  /** The loop point of any given battle, mystery encounter, or title track, read as seconds and milliseconds. */
   getBgmLoopPoint(bgmName: string): number {
     switch (bgmName) {
+      case "title": //Firel PokéRogue Title
+        return 46.500;
       case "battle_kanto_champion": //B2W2 Kanto Champion Battle
         return 13.950;
       case "battle_johto_champion": //B2W2 Johto Champion Battle

src/data/mystery-encounters/utils/encounter-phase-utils.ts

@@ -890,7 +890,7 @@ export function getRandomEncounterSpecies(level: number, isBoss: boolean = false
 
   if (eventEncounters.length > 0 && randSeedInt(2) === 1) {
     const eventEncounter = randSeedItem(eventEncounters);
-    const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, !isNullOrUndefined(eventEncounter.blockEvolution), isBoss, globalScene.gameMode);
+    const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, !eventEncounter.blockEvolution, isBoss, globalScene.gameMode);
     isEventEncounter = true;
     bossSpecies = getPokemonSpecies(levelSpecies);
   } else {

src/field/arena.ts

@@ -695,6 +695,7 @@ export class Arena {
     globalScene.loadBgm(this.bgm);
   }
 
+  /** The loop point of any given biome track, read as seconds and milliseconds. */
   getBgmLoopPoint(): number {
     switch (this.biomeType) {
       case Biome.TOWN:

src/inputs-controller.ts

@@ -344,12 +344,16 @@ export class InputsController {
      * Handles the keydown event for the keyboard.
      *
      * @param event The keyboard event.
+     *
+     * @remarks On Mac the keyup event for a pressed key is not fired if the meta key is held down. To
+     * insure that that key is not repeatedly input until the user presses it again only emit events
+     * when the meta key is not held.
      */
   keyboardKeyDown(event): void {
     this.lastSource = "keyboard";
     this.ensureKeyboardIsInit();
     const buttonDown = getButtonWithKeycode(this.getActiveConfig(Device.KEYBOARD), event.keyCode);
-    if (buttonDown !== undefined) {
+    if (buttonDown !== undefined && !event.metaKey) {
       if (this.buttonLock.includes(buttonDown)) {
         return;
       }

src/test/inputs/inputs.test.ts

@@ -52,6 +52,11 @@ describe("Inputs", () => {
     expect(game.inputsHandler.log.length).toBe(5);
   });
 
+  it("keyboard - test input holding meta key - 0 input", async() => {
+    await game.inputsHandler.pressKeyboardKey(cfg_keyboard_qwerty.deviceMapping.KEY_ARROW_UP, 1, true);
+    expect(game.inputsHandler.log.length).toBe(0);
+  });
+
   it("keyboard - test input holding for 200ms - 1 input", async() => {
     await game.inputsHandler.pressKeyboardKey(cfg_keyboard_qwerty.deviceMapping.KEY_ARROW_UP, 200);
     expect(game.inputsHandler.log.length).toBe(1);

src/test/utils/inputsHandler.ts

@@ -48,9 +48,9 @@ export default class InputsHandler {
     });
   }
 
-  pressKeyboardKey(key: integer, duration: integer): Promise<void> {
+  pressKeyboardKey(key: integer, duration: integer, isMetaPressed: boolean = false): Promise<void> {
     return new Promise(async (resolve) => {
-      this.scene.input.keyboard?.emit("keydown", { keyCode: key });
+      this.scene.input.keyboard?.emit("keydown", { keyCode: key, metaKey: isMetaPressed });
       await holdOn(duration);
       this.scene.input.keyboard?.emit("keyup", { keyCode: key });
       resolve();

src/timed-event-manager.ts

@@ -102,7 +102,7 @@ const timedEvents: TimedEvent[] = [
     endDate: new Date(Date.UTC(2025, 1, 3, 0)),
     bannerKey: "yearofthesnakeevent-",
     scale: 0.21,
-    availableLangs: [],
+    availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ],
     eventEncounters: [
       { species: Species.EKANS },
       { species: Species.ONIX },