Merge branch 'revelation_dance' of https://github.com/PyGaVS/pokerogue into revelation_dance

package-lock.json

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

package.json

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

src/data/moves/move.ts

@@ -2454,13 +2454,14 @@ export class StatusEffectAttr extends MoveEffectAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true);
     const statusCheck = moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance;
+    const quiet = move.category !== MoveCategory.STATUS;
     if (statusCheck) {
       const pokemon = this.selfTarget ? user : target;
-      if (user !== target && move.category === MoveCategory.STATUS && !target.canSetStatus(this.effect, false, false, user, true)) {
+      if (user !== target && move.category === MoveCategory.STATUS && !target.canSetStatus(this.effect, quiet, false, user, true)) {
         return false;
       }
       if (((!pokemon.status || this.overrideStatus) || (pokemon.status.effect === this.effect && moveChance < 0))
-        && pokemon.trySetStatus(this.effect, true, user, this.turnsRemaining, null, this.overrideStatus, false)) {
+        && pokemon.trySetStatus(this.effect, true, user, this.turnsRemaining, null, this.overrideStatus, quiet)) {
         applyPostAttackAbAttrs(ConfusionOnStatusEffectAbAttr, user, target, move, null, false, this.effect);
         return true;
       }

src/data/trainers/TrainerPartyTemplate.ts

@@ -224,18 +224,19 @@ export const trainerPartyTemplates = {
  */
 export function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
   const waveIndex = globalScene.currentBattle?.waveIndex;
-  switch (waveIndex) {
-    case ClassicFixedBossWaves.EVIL_GRUNT_1:
-      return trainerPartyTemplates.TWO_AVG;
-    case ClassicFixedBossWaves.EVIL_GRUNT_2:
-      return trainerPartyTemplates.THREE_AVG;
-    case ClassicFixedBossWaves.EVIL_GRUNT_3:
-      return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
-    case ClassicFixedBossWaves.EVIL_ADMIN_1:
-      return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
-    default:
-      return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_1){
+    return trainerPartyTemplates.TWO_AVG;
   }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_2){
+    return trainerPartyTemplates.THREE_AVG;
+  }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_3){
+    return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
+  }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_ADMIN_1){
+    return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
+  }
+  return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
 }
 
 export function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {

src/system/version_migration/versions/v1_9_0.ts

@@ -15,11 +15,6 @@ const migratePartyData: SessionSaveMigrator = {
   migrate: (data: SessionSaveData): void => {
     // this stuff is copied straight from the constructor fwiw
     const mapParty = (pkmnData: PokemonData) => {
-      pkmnData.status &&= new Status(
-        pkmnData.status.effect,
-        pkmnData.status.toxicTurnCount,
-        pkmnData.status.sleepTurnsRemaining,
-      );
       // remove empty moves from moveset
       pkmnData.moveset = (pkmnData.moveset ?? [new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.GROWL)])
         .filter(m => !!m)