feat!: Hotfix 1.11.10 to main (#7076)

damocleas · Madmadness65 · Blitz425 · web-flow · commit d99792b96f07 · 2026-02-16T20:20:26.000-05:00
* update submodules * feat: Add the rest of the Team Flare admins (#7059) This adds Aliana, Celosia, and Mable as potential Team Flare admins to battle. Co-authored-by: damocleas <damocleas25@gmail.com> * balance: Further changes to Random Trainers in Biomes, Trainer Party Templates, and Team Flare Grunt / Admin pools (#7063) * Update Trainer Party Templates, Flare Admin and Grunt pools * Update trainer-config.ts * Adjust Abyss Biome and Mysterious Sisters Pool * Update trainer-config.ts * Update src/data/trainers/trainer-config.ts * Add more trainers to Biomes, Fix Mysterious Sisters config and Red's Lugia * Move Breeder to Rare Volcano, remove Two Weak template on Mysterious Sisters --------- Co-authored-by: Mourouh <61661226+Mourouh@users.noreply.github.com> * balance: 1.11.7 Post-Update Egg Move and Passive Adjustments (#7065) Initial Egg + Passive Update Co-authored-by: damocleas <damocleas25@gmail.com> * github: Add `Awaiting Assets` to submodule workflow (#7072) * detect `awaiting assets` * add locales block * only unblock `locales` * unblock assets * fix(ability): Supersweet Syrup is not blocked by Own Tempo et al #7073 * Add false to Supersweet's Intimidate attribute * Add test and change fix to modify `PostSummonStatStageChangeAbAttr` Now the `intimidate` param defaults to `false` --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * chore!: update version to `1.11.10` --------- Co-authored-by: Madmadness65 <59298170+Madmadness65@users.noreply.github.com> Co-authored-by: Blitzy <118096277+Blitz425@users.noreply.github.com> Co-authored-by: Mourouh <61661226+Mourouh@users.noreply.github.com> Co-authored-by: Fabi <192151969+fabske0@users.noreply.github.com> Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
diff --git a/.github/workflows/detect-labels.yml b/.github/workflows/detect-labels.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
     upload-label-data:
-        if: github.event.label.name == 'Awaiting Locales' || github.event.label.name == 'Update Locales' || github.event.label.name == 'Update Assets'
+        if: github.event.label.name == 'Awaiting Locales' || github.event.label.name == 'Awaiting Assets' || github.event.label.name == 'Update Locales' || github.event.label.name == 'Update Assets'
         runs-on: ubuntu-latest
         steps:
             - name: Save PR info
diff --git a/.github/workflows/update-submodule.yml b/.github/workflows/update-submodule.yml
@@ -70,7 +70,7 @@ jobs:
       ref: ${{ steps.read-label-data.outputs.ref }}
       repo: ${{ steps.read-label-data.outputs.repo }}
 
-  block-pr:
+  block-locales-pr:
     needs: read-label-data
     if: needs.read-label-data.outputs.label == 'Awaiting Locales'
     runs-on: ubuntu-latest
@@ -87,6 +87,23 @@ jobs:
           gh pr review ${{ needs.read-label-data.outputs.prNumber }} -R ${{ github.repository }} --request-changes --body "This pull request is blocked until the associated locales PR is merged.
           To unblock and update the locales submodule, add the \`Update Locales\` label."
 
+  block-assets-pr:
+    needs: read-label-data
+    if: needs.read-label-data.outputs.label == 'Awaiting Assets'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .nvmrc
+          sparse-checkout-cone-mode: false
+
+      - name: "Block PR"
+        run: |
+          gh pr review ${{ needs.read-label-data.outputs.prNumber }} -R ${{ github.repository }} --request-changes --body "This pull request is blocked until the associated assets PR is merged.
+          To unblock and update the assets submodule, add the \`Update Assets\` label."
+
   update-locales:
     needs: read-label-data
     if: needs.read-label-data.outputs.label == 'Update Locales'
@@ -132,7 +149,7 @@ jobs:
       - name: Unblock PR
         run: |
           REVIEW_ID=$(gh api repos/${{ github.repository }}/pulls/${{ needs.read-label-data.outputs.prNumber }}/reviews \
-              --jq '.[] | select(.user.login == "github-actions[bot]" and .state == "CHANGES_REQUESTED") | .id' | head -n 1)
+              --jq '.[] | select(.user.login == "github-actions[bot]" and .state == "CHANGES_REQUESTED" and (.body // "" | contains("Update Locales"))) | .id' | head -n 1)
           if [ -n "$REVIEW_ID" ]; then
               gh api --method PUT repos/${{ github.repository }}/pulls/${{ needs.read-label-data.outputs.prNumber }}/reviews/$REVIEW_ID/dismissals \
               -f message="Locales updated, unblocking PR."
@@ -178,3 +195,13 @@ jobs:
       - name: Remove label
         run: |
           gh pr edit ${{ needs.read-label-data.outputs.prNumber }} -R ${{ github.repository }} --remove-label "Update Assets"
+          gh pr edit ${{ needs.read-label-data.outputs.prNumber }} -R ${{ github.repository }} --remove-label "Awaiting Assets"
+
+      - name: Unblock PR
+        run: |
+          REVIEW_ID=$(gh api repos/${{ github.repository }}/pulls/${{ needs.read-label-data.outputs.prNumber }}/reviews \
+              --jq '.[] | select(.user.login == "github-actions[bot]" and .state == "CHANGES_REQUESTED" and (.body // "" | contains("Update Assets"))) | .id' | head -n 1)
+          if [ -n "$REVIEW_ID" ]; then
+              gh api --method PUT repos/${{ github.repository }}/pulls/${{ needs.read-label-data.outputs.prNumber }}/reviews/$REVIEW_ID/dismissals \
+              -f message="Assets updated, unblocking PR."
+          fi
diff --git a/assets b/assets
@@ -1 +1 @@
-Subproject commit ba7f0606c937ac766910c21803db786ca3654ea5
+Subproject commit 79c1a70a6f6095c74c1208146b1da7aca54b12a0
diff --git a/locales b/locales
@@ -1 +1 @@
-Subproject commit 51f870b3ac87d9c73ad1906449c9f3719183fe65
+Subproject commit 58073d46e42634fbf5603218328b69afd51fbf60
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pokemon-rogue-battle",
   "private": true,
-  "version": "1.11.9",
+  "version": "1.11.10",
   "type": "module",
   "scripts": {
     "start:prod": "vite --mode production",
diff --git a/src/data/abilities/ab-attrs.ts b/src/data/abilities/ab-attrs.ts
@@ -2370,7 +2370,7 @@ export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr {
   private readonly selfTarget: boolean;
   private readonly intimidate: boolean;
 
-  constructor(stats: readonly BattleStat[], stages: number, selfTarget = false, intimidate = true) {
+  constructor(stats: readonly BattleStat[], stages: number, selfTarget = false, intimidate = false) {
     super(true);
 
     this.stats = stats;
diff --git a/src/data/balance/biomes.ts b/src/data/balance/biomes.ts
@@ -1713,9 +1713,9 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS]: [ TrainerType.VOLKNER, TrainerType.ELESA, TrainerType.CLEMONT ]
   },
   [BiomeId.VOLCANO]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.FIREBREATHER ],
-    [BiomePoolTier.UNCOMMON]: [],
-    [BiomePoolTier.RARE]: [],
+    [BiomePoolTier.COMMON]: [ TrainerType.FIREBREATHER, TrainerType.HIKER ],
+    [BiomePoolTier.UNCOMMON]: [ TrainerType.DRAGON_TAMER ],
+    [BiomePoolTier.RARE]: [ TrainerType.BREEDER ],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
     [BiomePoolTier.BOSS]: [ TrainerType.BLAINE, TrainerType.FLANNERY, TrainerType.KABU ]
@@ -1761,7 +1761,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS]: [ TrainerType.CLAIR, TrainerType.DRAYDEN, TrainerType.RAIHAN ]
   },
   [BiomeId.ABYSS]: {
-    [BiomePoolTier.COMMON]: [],
+    [BiomePoolTier.COMMON]: [ TrainerType.VETERAN ],
     [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
@@ -1827,7 +1827,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
   [BiomeId.ISLAND]: {
     [BiomePoolTier.COMMON]: [ TrainerType.RICH_KID ],
     [BiomePoolTier.UNCOMMON]: [ TrainerType.RICH ],
-    [BiomePoolTier.RARE]: [],
+    [BiomePoolTier.RARE]: [ TrainerType.YOUNG_COUPLE ],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
     [BiomePoolTier.BOSS]: [ TrainerType.NESSA ]
diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts
@@ -134,7 +134,7 @@ export const speciesEggMoves = {
   [SpeciesId.ENTEI]: [ MoveId.BURNING_BULWARK, MoveId.DRAGON_DANCE, MoveId.EARTHQUAKE, MoveId.PYRO_BALL ],
   [SpeciesId.SUICUNE]: [ MoveId.RECOVER, MoveId.NASTY_PLOT, MoveId.FREEZE_DRY, MoveId.STEAM_ERUPTION ],
   [SpeciesId.LARVITAR]: [ MoveId.DRAGON_DANCE, MoveId.MOUNTAIN_GALE, MoveId.SHORE_UP, MoveId.DIAMOND_STORM ],
-  [SpeciesId.LUGIA]: [ MoveId.STORED_POWER, MoveId.SCALD, MoveId.AURA_SPHERE, MoveId.LUMINA_CRASH ],
+  [SpeciesId.LUGIA]: [ MoveId.STORED_POWER, MoveId.STEAM_ERUPTION, MoveId.AURA_SPHERE, MoveId.LUMINA_CRASH ],
   [SpeciesId.HO_OH]: [ MoveId.BRAVE_BIRD, MoveId.PETAL_BLIZZARD, MoveId.REVIVAL_BLESSING, MoveId.DRAGON_DANCE ],
   [SpeciesId.CELEBI]: [ MoveId.PHOTON_GEYSER, MoveId.MATCHA_GOTCHA, MoveId.REVIVAL_BLESSING, MoveId.QUIVER_DANCE ],
 
diff --git a/src/data/balance/init-biomes.ts b/src/data/balance/init-biomes.ts
@@ -5322,7 +5322,8 @@ export function initBiomes() {
       [BiomeId.BEACH, BiomePoolTier.UNCOMMON],
       [BiomeId.LAKE, BiomePoolTier.COMMON],
       [BiomeId.MEADOW, BiomePoolTier.UNCOMMON],
-      [BiomeId.FAIRY_CAVE, BiomePoolTier.UNCOMMON]
+      [BiomeId.FAIRY_CAVE, BiomePoolTier.UNCOMMON],
+      [BiomeId.VOLCANO, BiomePoolTier.RARE]
     ]
     ],
     [TrainerType.BUG_CATCHER, [
@@ -5358,6 +5359,7 @@ export function initBiomes() {
     [TrainerType.DRAGON_TAMER, [
       [BiomeId.BADLANDS, BiomePoolTier.UNCOMMON],
       [BiomeId.WASTELAND, BiomePoolTier.COMMON]
+      [BiomeId.VOLCANO, BiomePoolTier.UNCOMMON],
     ]
     ],
     [TrainerType.FAIRY_TALE_GIRL, [
@@ -5388,6 +5390,7 @@ export function initBiomes() {
     [TrainerType.HIKER, [
       [BiomeId.MOUNTAIN, BiomePoolTier.COMMON],
       [BiomeId.CAVE, BiomePoolTier.COMMON],
+      [BiomeId.VOLCANO, BiomePoolTier.COMMON],
       [BiomeId.BADLANDS, BiomePoolTier.COMMON]
     ]
     ],
@@ -5506,6 +5509,7 @@ export function initBiomes() {
     ]
     ],
     [TrainerType.VETERAN, [
+      [BiomeId.ABYSS, BiomePoolTier.COMMON],
       [BiomeId.WASTELAND, BiomePoolTier.COMMON]
     ]
     ],
@@ -5521,6 +5525,7 @@ export function initBiomes() {
     ],
     [TrainerType.YOUNG_COUPLE, [
       [BiomeId.LAKE, BiomePoolTier.UNCOMMON],
+      [BiomeId.ISLAND, BiomePoolTier.RARE],
       [BiomeId.SNOWY_FOREST, BiomePoolTier.RARE]
     ]
     ],
diff --git a/src/data/balance/passives.ts b/src/data/balance/passives.ts
@@ -932,7 +932,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
   [SpeciesId.COPPERAJAH]: { 0: AbilityId.EARTH_EATER, 1: AbilityId.EARTH_EATER },
   [SpeciesId.DRACOZOLT]: { 0: AbilityId.NO_GUARD },
   [SpeciesId.ARCTOZOLT]: { 0: AbilityId.WATER_ABSORB },
-  [SpeciesId.DRACOVISH]: { 0: AbilityId.THERMAL_EXCHANGE },
+  [SpeciesId.DRACOVISH]: { 0: AbilityId.MOLD_BREAKER },
   [SpeciesId.ARCTOVISH]: { 0: AbilityId.STRONG_JAW },
   [SpeciesId.DURALUDON]: { 0: AbilityId.FILTER, 1: AbilityId.FILTER },
   [SpeciesId.ARCHALUDON]: { 0: AbilityId.TRANSISTOR },
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
@@ -525,7 +525,7 @@ export class SingleGenerationChallenge extends Challenge {
       ],
       [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN],
       [TrainerType.COLRESS],
-      [TrainerType.BRYONY],
+      [TrainerType.BRYONY, TrainerType.ALIANA, TrainerType.CELOSIA, TrainerType.MABLE],
       [TrainerType.FABA, TrainerType.PLUMERIA],
       [TrainerType.OLEANA],
       [TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI],
@@ -539,7 +539,7 @@ export class SingleGenerationChallenge extends Challenge {
       ],
       [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN],
       [TrainerType.ZINZOLIN],
-      [TrainerType.BRYONY, TrainerType.XEROSIC],
+      [TrainerType.BRYONY, TrainerType.ALIANA, TrainerType.CELOSIA, TrainerType.MABLE],
       [TrainerType.FABA, TrainerType.PLUMERIA],
       [TrainerType.OLEANA],
       [TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI],
diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts
@@ -792,6 +792,24 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       victory: ["dialogue:xerosic.victory.1", "dialogue:xerosic.victory.2", "dialogue:xerosic.victory.3"],
     },
   ],
+  [TrainerType.ALIANA]: [
+    {
+      encounter: ["dialogue:aliana.encounter.1", "dialogue:aliana.encounter.2"],
+      victory: ["dialogue:aliana.victory.1", "dialogue:aliana.victory.2"],
+    },
+  ],
+  [TrainerType.CELOSIA]: [
+    {
+      encounter: ["dialogue:celosia.encounter.1", "dialogue:celosia.encounter.2"],
+      victory: ["dialogue:celosia.victory.1", "dialogue:celosia.victory.2"],
+    },
+  ],
+  [TrainerType.MABLE]: [
+    {
+      encounter: ["dialogue:mable.encounter.1", "dialogue:mable.encounter.2"],
+      victory: ["dialogue:mable.victory.1", "dialogue:mable.victory.2"],
+    },
+  ],
   [TrainerType.AETHER_GRUNT]: [
     {
       encounter: [
diff --git a/src/data/trainers/evil-admin-trainer-pools.ts b/src/data/trainers/evil-admin-trainer-pools.ts
@@ -222,23 +222,22 @@ const PLASMA_COLRESS: TrainerTierPools = {
 
 const FLARE: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    SpeciesId.SCRAGGY,
-    SpeciesId.FOONGUS,
-    SpeciesId.BUNNELBY,
+    SpeciesId.ABSOL,
+    SpeciesId.CROAGUNK,
+    SpeciesId.BUDEW,
+    SpeciesId.VENIPEDE,
+    [SpeciesId.SCRAGGY, SpeciesId.PANCHAM],
     SpeciesId.FLETCHLING,
-    SpeciesId.PANCHAM,
     SpeciesId.ESPURR,
-    SpeciesId.SKRELP,
-    SpeciesId.CLAUNCHER,
+    SpeciesId.HELIOPTILE,
+    [SpeciesId.SKRELP, SpeciesId.CLAUNCHER],
     SpeciesId.KLEFKI,
-    SpeciesId.PHANTUMP,
-    SpeciesId.PUMPKABOO,
   ],
   [TrainerPoolTier.UNCOMMON]: [
     SpeciesId.LITWICK,
-    SpeciesId.HEATMOR,
+    SpeciesId.FLABEBE,
+    [SpeciesId.PHANTUMP, SpeciesId.PUMPKABOO],
     SpeciesId.BINACLE,
-    SpeciesId.HELIOPTILE,
     SpeciesId.AVALUGG,
     SpeciesId.CAPSAKID,
   ],
@@ -247,20 +246,21 @@ const FLARE: TrainerTierPools = {
 
 const FLARE_XEROSIC: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    SpeciesId.EKANS,
+    SpeciesId.SNUBBULL,
     SpeciesId.LITWICK,
     SpeciesId.PANCHAM,
     SpeciesId.BINACLE,
     [SpeciesId.SKRELP, SpeciesId.CLAUNCHER],
     SpeciesId.HELIOPTILE,
     SpeciesId.KLEFKI,
+    SpeciesId.CAPSAKID,
   ],
   [TrainerPoolTier.UNCOMMON]: [
     SpeciesId.ROTOM, // Always Rotom-Heat, Xerosic has their specialty type set to fire
+    SpeciesId.LARVESTA,
+    SpeciesId.FLABEBE,
     [SpeciesId.TYRUNT, SpeciesId.AMAURA],
     SpeciesId.NOIBAT,
-    SpeciesId.SIZZLIPEDE,
-    SpeciesId.CAPSAKID,
   ],
   [TrainerPoolTier.RARE]: [SpeciesId.BELDUM, SpeciesId.HISUI_SLIGGOO, SpeciesId.HISUI_AVALUGG],
 };
diff --git a/src/data/trainers/fixed-battle-configs.ts b/src/data/trainers/fixed-battle-configs.ts
@@ -132,7 +132,7 @@ export const classicFixedBattles: FixedBattleConfigs = {
           [TrainerType.MATT, TrainerType.SHELLY],
           [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN],
           TrainerType.COLRESS,
-          TrainerType.BRYONY,
+          [TrainerType.BRYONY, TrainerType.ALIANA, TrainerType.CELOSIA, TrainerType.MABLE],
           TrainerType.FABA,
           TrainerType.PLUMERIA,
           TrainerType.OLEANA,
@@ -185,7 +185,7 @@ export const classicFixedBattles: FixedBattleConfigs = {
           [TrainerType.MATT, TrainerType.SHELLY],
           [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN],
           TrainerType.ZINZOLIN,
-          [TrainerType.BRYONY, TrainerType.XEROSIC],
+          [TrainerType.BRYONY, TrainerType.ALIANA, TrainerType.CELOSIA, TrainerType.MABLE],
           TrainerType.FABA,
           TrainerType.PLUMERIA,
           TrainerType.OLEANA,
diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
diff --git a/src/enums/trainer-type.ts b/src/enums/trainer-type.ts
diff --git a/test/abilities/supersweet-syrup.test.ts b/test/abilities/supersweet-syrup.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pokemon-rogue-battle",`
`3`	`3`	`"private": true,`
`4`		`- "version": "1.11.9",`
	`4`	`+ "version": "1.11.10",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"start:prod": "vite --mode production",`