merge conflicts

src/battle-scene.ts

@@ -1387,7 +1387,7 @@ export default class BattleScene extends SceneBase {
  case Species.ZYGARDE:
  return Utils.randSeedInt(4);
  case Species.MINIOR:
- return Utils.randSeedInt(6);
+ return Utils.randSeedInt(7);
  case Species.ALCREMIE:
  return Utils.randSeedInt(9);
  case Species.MEOWSTIC:

src/data/ability.ts

@@ -7,7 +7,7 @@ import { Weather, WeatherType } from "./weather";
 import { BattlerTag, GroundedTag } from "./battler-tags";
 import { StatusEffect, getNonVolatileStatusEffects, getStatusEffectDescriptor, getStatusEffectHealText } from "./status-effect";
 import { Gender } from "./gender";
-import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, IncrementMovePriorityAttr, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr, MoveAttr, MultiHitAttr, ChargeAttr, SacrificialAttr, SacrificialAttrOnHit, NeutralDamageAgainstFlyingTypeMultiplierAttr, FixedDamageAttr } from "./move";
+import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, IncrementMovePriorityAttr, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr, MoveAttr, MultiHitAttr, SacrificialAttr, SacrificialAttrOnHit, NeutralDamageAgainstFlyingTypeMultiplierAttr, FixedDamageAttr } from "./move";
 import { ArenaTagSide, ArenaTrapTag } from "./arena-tag";
 import { BerryModifier, PokemonHeldItemModifier } from "../modifier/modifier";
 import { TerrainType } from "./terrain";
@@ -1139,7 +1139,9 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr {
  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
  // Disable showAbility during getTargetBenefitScore
  this.showAbility = args[4];
- if ((args[0] as Utils.NumberHolder).value <= 0 || (args[1] as Move).id === Moves.ORDER_UP) {
+
+ const exceptMoves = [ Moves.ORDER_UP, Moves.ELECTRO_SHOT ];
+ if ((args[0] as Utils.NumberHolder).value <= 0 || exceptMoves.includes((args[1] as Move).id)) {
  return false;
  }
 
@@ -1329,7 +1331,6 @@ export class AddSecondStrikeAbAttr extends PreAttackAbAttr {
  */
  const exceptAttrs: Constructor<MoveAttr>[] = [
  MultiHitAttr,
- ChargeAttr,
  SacrificialAttr,
  SacrificialAttrOnHit
  ];
@@ -1345,6 +1346,7 @@ export class AddSecondStrikeAbAttr extends PreAttackAbAttr {
 
  /** Also check if this move is an Attack move and if it's only targeting one Pokemon */
  return numTargets === 1
+ && !move.isChargingMove()
  && !exceptAttrs.some(attr => move.hasAttr(attr))
  && !exceptMoves.some(id => move.id === id)
  && move.category !== MoveCategory.STATUS;
@@ -2431,11 +2433,12 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
  super(true);
  }
 
- applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+ async applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): Promise<boolean> {
  const targets = pokemon.getOpponents();
  if (simulated || !targets.length) {
  return simulated;
  }
+ const promises: Promise<void>[] = [];
 
  let target: Pokemon = targets[0];
  if (targets.length > 1) {
@@ -2447,6 +2450,7 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
  if (target.battleData.illusion.active) {
  return false;
  }
+ target = target!;
  pokemon.summonData.speciesForm = target.getSpeciesForm();
  pokemon.summonData.fusionSpeciesForm = target.getFusionSpeciesForm();
  pokemon.summonData.ability = target.getAbility().id;
@@ -2463,18 +2467,23 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
  pokemon.setStatStage(s, target.getStatStage(s));
  }
 
- pokemon.summonData.moveset = target.getMoveset().map(m => new PokemonMove(m?.moveId ?? Moves.NONE, m?.ppUsed, m?.ppUp));
+ pokemon.summonData.moveset = target.getMoveset().map(m => {
+ const pp = m?.getMove().pp ?? 0;
+ // if PP value is less than 5, do nothing. If greater, we need to reduce the value to 5 using a negative ppUp value.
+ const ppUp = pp <= 5 ? 0 : (5 - pp) / Math.max(Math.floor(pp / 5), 1);
+ return new PokemonMove(m?.moveId ?? Moves.NONE, 0, ppUp);
+ });
  pokemon.summonData.types = target.getTypes();
+ promises.push(pokemon.updateInfo());
 
-
+ pokemon.scene.queueMessage(i18next.t("abilityTriggers:postSummonTransform", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), targetName: target!.name, }));
  pokemon.scene.playSound("battle_anims/PRSFX- Transform");
-
- pokemon.loadAssets(false).then(() => {
+ promises.push(pokemon.loadAssets(false).then(() => {
  pokemon.playAnim();
  pokemon.updateInfo();
- });
+ }));
 
- pokemon.scene.queueMessage(i18next.t("abilityTriggers:postSummonTransform", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), targetName: target.name, }));
+ await Promise.all(promises);
 
  return true;
  }
@@ -4213,6 +4222,11 @@ export class RedirectTypeMoveAbAttr extends RedirectMoveAbAttr {
 
 export class BlockRedirectAbAttr extends AbAttr { }
 
+/**
+ * Used by Early Bird, makes the pokemon wake up faster
+ * @param statusEffect - The {@linkcode StatusEffect} to check for
+ * @see {@linkcode apply}
+ */
 export class ReduceStatusEffectDurationAbAttr extends AbAttr {
  private statusEffect: StatusEffect;
 
@@ -4222,9 +4236,19 @@ export class ReduceStatusEffectDurationAbAttr extends AbAttr {
  this.statusEffect = statusEffect;
  }
 
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ /**
+ * Reduces the number of sleep turns remaining by an extra 1 when applied
+ * @param args - The args passed to the `AbAttr`:
+ * - `[0]` - The {@linkcode StatusEffect} of the Pokemon
+ * - `[1]` - The number of turns remaining until the status is healed
+ * @returns `true` if the ability was applied
+ */
+ apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ if (!(args[1] instanceof Utils.NumberHolder)) {
+ return false;
+ }
  if (args[0] === this.statusEffect) {
- (args[1] as Utils.IntegerHolder).value = Utils.toDmgValue((args[1] as Utils.IntegerHolder).value / 2);
+ args[1].value -= 1;
  return true;
  }
 

src/data/arena-tag.ts

@@ -970,6 +970,9 @@ export class GravityTag extends ArenaTag {
  if (pokemon !== null) {
  pokemon.removeTag(BattlerTagType.FLOATING);
  pokemon.removeTag(BattlerTagType.TELEKINESIS);
+ if (pokemon.getTag(BattlerTagType.FLYING)) {
+ pokemon.addTag(BattlerTagType.INTERRUPTED);
+ }
  }
  });
  }