Merge 0f97000cb3 into 5d4b805c13

[UI/UX][Bug] Removed extra division by 6 in starter-select-ui-handler.ts (#6245 )
Removed division by 6 in starter-select-ui-handler.ts
2025-09-01 20:29:38 +02:00 · 2025-08-09 16:47:29 -05:00 · 2025-08-09 15:27:47 -05:00 · 2025-08-09 13:51:08 -05:00 · 2025-08-09 13:48:25 -05:00 · 2025-08-09 15:11:03 +00:00
8 changed files with 367 additions and 319 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -3,9 +3,6 @@
 # everything (whole code-base) - Junior Devs
 * @pagefaultgames/junior-dev-team

-# github actions/templates etc. - Dev Leads
-/.github @pagefaultgames/senior-dev-team
-
 # Art Team
 /public/**/*.png @pagefaultgames/art-team
 /public/**/*.json @pagefaultgames/art-team
@ -20,3 +17,10 @@

 # Balance Files; contain actual code logic and must also be owned by dev team
 /src/data/balance @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
+/src/data/trainers @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
+
+# GitHub actions/templates etc. - Senior Devs
+# Should be defined last in the file to make sure these always override all other definitions
+/.github @pagefaultgames/senior-dev-team
+package.json @pagefaultgames/senior-dev-team
+pnpm-lock.yaml @pagefaultgames/senior-dev-team
--- a/public/images/trainer/rocket_boss_giovanni_1.json
+++ b/public/images/trainer/rocket_boss_giovanni_1.json
@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "rocket_boss_giovanni_1.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 79,
+				"h": 79
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 39,
+						"h": 79
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 79
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 79
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:d6c5e1804414106d43a7c46f83468d39:1f3f7898a58950988acac6ee7167e012:5f742cbdaafcd5ae864f18ec2af7512a$"
+	}
+}
--- a/public/images/trainer/rocket_boss_giovanni_1.png
+++ b/public/images/trainer/rocket_boss_giovanni_1.png
--- a/public/images/ui/legacy/summary_moves_effect.png
+++ b/public/images/ui/legacy/summary_moves_effect.png
--- a/public/images/ui/summary_moves_effect.png
+++ b/public/images/ui/summary_moves_effect.png
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@ -223,9 +223,8 @@ export class TrainerConfig {
      case TrainerType.LARRY_ELITE:
        trainerType = TrainerType.LARRY;
        break;
-      case TrainerType.ROCKET_BOSS_GIOVANNI_1:
      case TrainerType.ROCKET_BOSS_GIOVANNI_2:
-        trainerType = TrainerType.GIOVANNI;
+        trainerType = TrainerType.ROCKET_BOSS_GIOVANNI_1;
        break;
      case TrainerType.MAXIE_2:
        trainerType = TrainerType.MAXIE;
@ -895,7 +894,7 @@ export class TrainerConfig {

  /**
   * Helper function to check if a specialty type is set
-   * @returns true if specialtyType is defined and not Type.UNKNOWN
+   * @returns `true` if `specialtyType` is defined and not {@link PokemonType.UNKNOWN}
   */
  hasSpecialtyType(): boolean {
    return !isNullOrUndefined(this.specialtyType) && this.specialtyType !== PokemonType.UNKNOWN;
@ -1871,10 +1870,12 @@ export const trainerConfigs: TrainerConfigs = {
        SpeciesId.CLEFFA,
        SpeciesId.WOOPER,
        SpeciesId.TEDDIURSA,
+        SpeciesId.REMORAID,
        SpeciesId.HOUNDOUR,
        SpeciesId.SILCOON,
        SpeciesId.PLUSLE,
        SpeciesId.VOLBEAT,
+        SpeciesId.SPINDA,
        SpeciesId.BONSLY,
        SpeciesId.PETILIL,
        SpeciesId.SPRITZEE,
@ -1891,10 +1892,12 @@ export const trainerConfigs: TrainerConfigs = {
          SpeciesId.IGGLYBUFF,
          SpeciesId.PALDEA_WOOPER,
          SpeciesId.PHANPY,
+          SpeciesId.MANTYKE,
          SpeciesId.ELECTRIKE,
          SpeciesId.CASCOON,
          SpeciesId.MINUN,
          SpeciesId.ILLUMISE,
+          SpeciesId.SPINDA,
          SpeciesId.MIME_JR,
          SpeciesId.COTTONEE,
          SpeciesId.SWIRLIX,
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@ -1053,7 +1053,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
    this.moveInfoOverlay = new MoveInfoOverlay({
      top: true,
      x: 1,
-      y: globalScene.scaledCanvas.height / 6 - MoveInfoOverlay.getHeight() - 29,
+      y: globalScene.scaledCanvas.height - MoveInfoOverlay.getHeight() - 29,
    });

    this.starterSelectContainer.add([
Author	SHA1	Message	Date
Blitzy	6216eeae60	Merge `0f97000cb3` into `5d4b805c13`	2025-08-09 16:47:29 -05:00
Wlowscha	5d4b805c13	[UI/UX][Bug] Removed extra division by 6 in starter-select-ui-handler.ts (#6245 ) Removed division by 6 in starter-select-ui-handler.ts	2025-08-09 15:27:47 -05:00
Blitzy	0f97000cb3	Merge branch 'beta' into PikaEevee	2025-08-09 13:51:08 -05:00
Blitzy	845ed61ee8	Update trainer-config.ts	2025-08-09 13:48:25 -05:00
Lugiad	e862334819	[UI/UX] Summary Move Effect UI adjustments (#6223 ) Summary Effect tab UI image adjustments	2025-08-09 15:11:03 +00:00
NightKev	79576ad117	[GitHub] Update `.github/CODEOWNERS` file (#6240 ) * [GitHub] Update `.github/CODEOWNERS` file `@pagefaultgames/senior-dev-team` added to `package.json` and `pnpm-lock.yaml` `@pagefaultgames/balance-team` added to `/src/data/trainers` * Move senior dev team entries to the bottom of the file	2025-08-09 03:18:40 +00:00
Madmadness65	f0a56a3049	[Sprite] Add unique trainer sprite for Rocket Boss Giovanni (#6235 )	2025-08-09 02:15:33 +00:00
Madmadness65	7316628448	[Misc] Fix comment formatting nitpick in ability-id Adds a space between every `/**` and `{@link`.	2025-08-08 20:31:51 -05:00