Merge branch 'beta' into move-cleanup

public/images/trainer/future_self_f.json

@@ -0,0 +1,41 @@
+{
+ "textures": [
+ {
+ "image": "future_self_f.png",
+ "format": "RGBA8888",
+ "size": {
+ "w": 29,
+ "h": 69
+ },
+ "scale": 1,
+ "frames": [
+ {
+ "filename": "0001.png",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 69,
+ "h": 69
+ },
+ "spriteSourceSize": {
+ "x": 21,
+ "y": 0,
+ "w": 29,
+ "h": 69
+ },
+ "frame": {
+ "x": 0,
+ "y": 0,
+ "w": 29,
+ "h": 69
+ }
+ }
+ ]
+ }
+ ],
+ "meta": {
+ "app": "https://www.codeandweb.com/texturepacker",
+ "version": "3.0",
+ "smartupdate": "$TexturePacker:SmartUpdate:4eb16332c2e77886e4e621b62269f05e:26f1bc53c853efdbe228d67604b95b54:d25525a5db42bd57d2afe4b6e3081ee1$"
+ }
+}

public/images/trainer/future_self_m.json

@@ -0,0 +1,41 @@
+{
+ "textures": [
+ {
+ "image": "future_self_m.png",
+ "format": "RGBA8888",
+ "size": {
+ "w": 36,
+ "h": 73
+ },
+ "scale": 1,
+ "frames": [
+ {
+ "filename": "0001.png",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 73,
+ "h": 73
+ },
+ "spriteSourceSize": {
+ "x": 18,
+ "y": 0,
+ "w": 36,
+ "h": 73
+ },
+ "frame": {
+ "x": 0,
+ "y": 0,
+ "w": 36,
+ "h": 73
+ }
+ }
+ ]
+ }
+ ],
+ "meta": {
+ "app": "https://www.codeandweb.com/texturepacker",
+ "version": "3.0",
+ "smartupdate": "$TexturePacker:SmartUpdate:0d8d68d06ae75bc93d72b54183a9df02:d3d509801da9ff5c0bd4793a05ece391:83c4b8c2ed25ea7d9795bec5c40c8602$"
+ }
+}

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;
@@ -2420,11 +2422,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;
  if (targets.length > 1) {
@@ -2433,7 +2436,7 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
  target = targets[0];
  }
 
- target = target!; // compiler doesn't know its guranteed to be defined
+ target = target!;
  pokemon.summonData.speciesForm = target.getSpeciesForm();
  pokemon.summonData.fusionSpeciesForm = target.getFusionSpeciesForm();
  pokemon.summonData.ability = target.getAbility().id;
@@ -2450,18 +2453,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;
  }

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);
+ }
  }
  });
  }

src/data/balance/pokemon-evolutions.ts

@@ -10,7 +10,7 @@ import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { TimeOfDay } from "#enums/time-of-day";
-import { DamageMoneyRewardModifier, ExtraModifierModifier, MoneyMultiplierModifier } from "#app/modifier/modifier";
+import { DamageMoneyRewardModifier, ExtraModifierModifier, MoneyMultiplierModifier, TempExtraModifierModifier } from "#app/modifier/modifier";
 import { SpeciesFormKey } from "#enums/species-form-key";
 
 
@@ -1652,11 +1652,11 @@ export const pokemonEvolutions: PokemonEvolutions = {
  new SpeciesFormEvolution(Species.GHOLDENGO, "chest", "", 1, null, new SpeciesEvolutionCondition(p => p.evoCounter
  + p.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length
  + p.scene.findModifiers(m => m instanceof MoneyMultiplierModifier
- || m instanceof ExtraModifierModifier).length > 9), SpeciesWildEvolutionDelay.VERY_LONG),
+ || m instanceof ExtraModifierModifier || m instanceof TempExtraModifierModifier).length > 9), SpeciesWildEvolutionDelay.VERY_LONG),
  new SpeciesFormEvolution(Species.GHOLDENGO, "roaming", "", 1, null, new SpeciesEvolutionCondition(p => p.evoCounter
  + p.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length
  + p.scene.findModifiers(m => m instanceof MoneyMultiplierModifier
- || m instanceof ExtraModifierModifier).length > 9), SpeciesWildEvolutionDelay.VERY_LONG)
+ || m instanceof ExtraModifierModifier || m instanceof TempExtraModifierModifier).length > 9), SpeciesWildEvolutionDelay.VERY_LONG)
  ]
 };