Merge branch 'beta' into variant-icon-fix

package-lock.json

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

package.json

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

public/locales

@@ -1 +1 @@
-Subproject commit 833dc40ec7409031fcea147ccbc45ec9c0ba0213
+Subproject commit a7036a07875615674ea898d0fe3b182a1080af38

src/data/abilities/ability.ts

@@ -6907,6 +6907,8 @@ export function initAbilities() {
       .attr(IllusionBreakAbAttr)
       // The Pokemon loses its illusion when damaged by a move
       .attr(PostDefendIllusionBreakAbAttr, true)
+      // Disable Illusion in fusions
+      .attr(NoFusionAbilityAbAttr)
       // Illusion is available again after a battle
       .conditionalAttr((pokemon) => pokemon.isAllowedInBattle(), IllusionPostBattleAbAttr, false)
       .uncopiable()

src/data/moves/move.ts

@@ -3482,7 +3482,8 @@ export class CutHpStatStageBoostAttr extends StatStageChangeAttr {
 /**
  * Attribute implementing the stat boosting effect of {@link https://bulbapedia.bulbagarden.net/wiki/Order_Up_(move) | Order Up}.
  * If the user has a Pokemon with {@link https://bulbapedia.bulbagarden.net/wiki/Commander_(Ability) | Commander} in their mouth,
- * one of the user's stats are increased by 1 stage, depending on the "commanding" Pokemon's form.
+ * one of the user's stats are increased by 1 stage, depending on the "commanding" Pokemon's form. This effect does not respect
+ * effect chance, but Order Up itself may be boosted by Sheer Force.
  */
 export class OrderUpStatBoostAttr extends MoveEffectAttr {
   constructor() {
@@ -11024,7 +11025,7 @@ export function initMoves() {
       .makesContact(false),
     new AttackMove(Moves.LUMINA_CRASH, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2),
-    new AttackMove(Moves.ORDER_UP, PokemonType.DRAGON, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.ORDER_UP, PokemonType.DRAGON, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9)
       .attr(OrderUpStatBoostAttr)
       .makesContact(false),
     new AttackMove(Moves.JET_PUNCH, PokemonType.WATER, MoveCategory.PHYSICAL, 60, 100, 15, -1, 1, 9)

src/timed-event-manager.ts

@@ -340,7 +340,6 @@ const timedEvents: TimedEvent[] = [
       { species: Species.DEERLING, formIndex: 0 }, // Spring Deerling
       { species: Species.CLAUNCHER },
       { species: Species.WISHIWASHI },
-      { species: Species.MUDBRAY },
       { species: Species.DRAMPA },
       { species: Species.JANGMO_O },
       { species: Species.APPLIN },
@@ -351,7 +350,7 @@ const timedEvents: TimedEvent[] = [
       { wave: 8, type: "CATCHING_CHARM" },
       { wave: 25, type: "SHINY_CHARM" },
     ],
-  }
+  },
 ];
 
 export class TimedEventManager {

test/moves/order_up.test.ts

@@ -65,4 +65,23 @@ describe("Moves - Order Up", () => {
       affectedStats.forEach(st => expect(dondozo.getStatStage(st)).toBe(st === stat ? 3 : 2));
     },
   );
+
+  it("should be boosted by Sheer Force while still applying a stat boost", async () => {
+    game.override.passiveAbility(Abilities.SHEER_FORCE).starterForms({ [Species.TATSUGIRI]: 0 });
+
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
+
+    const [tatsugiri, dondozo] = game.scene.getPlayerField();
+
+    expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
+    expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
+
+    game.move.select(Moves.ORDER_UP, 1, BattlerIndex.ENEMY);
+    expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy();
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(dondozo.waveData.abilitiesApplied.has(Abilities.SHEER_FORCE)).toBeTruthy();
+    expect(dondozo.getStatStage(Stat.ATK)).toBe(3);
+  });
 });