[Balance][ME] Various ME Balance changes (#4700)

* balance changes and updates to various MEs

* fix import to new item

* fix import to new item

* Update src/data/mystery-encounters/utils/encounter-pokemon-utils.ts

Co-authored-by: NightKev <[email protected]>

* Update src/phases/select-modifier-phase.ts

Co-authored-by: NightKev <[email protected]>

* Update src/modifier/modifier.ts

Co-authored-by: NightKev <[email protected]>

* Update src/modifier/modifier.ts

Co-authored-by: NightKev <[email protected]>

* revert item atlas changes

* eslint

* revert 'revert item atlas'

* update locale repo to latest commit

* Fix fiery fallout missing argument

* [balance] Training session ME does not update Seen/Defeated GameStats

* [balance] update Weird Dream ME maximum spawn wave

* [ME] update CombinationRequirements to allow AND or OR combinations

* refactor: CombinationPokemonRequirement `.Some()` and `Every()`

* chore: rename `orRequirements` to `requirements`

* fix: returns of `Some()` and `Any()`

* apply `Some()` / `Any()` pattern to `CombinationSceneRequirement` too

* revert 'offer you can't refuse' giving Silver Pokeball'

* Apply code review suggestions

* [me] Weird Dream: apply same old gateau logic to team in options 1 and 2

---------

Co-authored-by: ImperialSympathizer <[email protected]>
Co-authored-by: ImperialSympathizer <[email protected]>
Co-authored-by: NightKev <[email protected]>
Co-authored-by: flx-sta <[email protected]>
Co-authored-by: innerthunder <[email protected]>

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/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)
  ]
 };
 

src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts

@@ -1,4 +1,4 @@
-import { leaveEncounterWithoutBattle, setEncounterExp, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { generateModifierType, leaveEncounterWithoutBattle, setEncounterExp, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
@@ -14,6 +14,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import i18next from "i18next";
 
 /** the i18n namespace for this encounter */
 const namespace = "mysteryEncounters/anOfferYouCantRefuse";
@@ -98,6 +99,8 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter =
  }
  }
 
+ const shinyCharm = generateModifierType(scene, modifierTypes.SHINY_CHARM);
+ encounter.setDialogueToken("itemName", shinyCharm?.name ?? i18next.t("modifierType:ModifierType.SHINY_CHARM.name"));
  encounter.setDialogueToken("liepardName", getPokemonSpecies(Species.LIEPARD).getName());
 
  return true;
@@ -123,7 +126,7 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter =
  return true;
  })
  .withOptionPhase(async (scene: BattleScene) => {
- // Give the player a Shiny charm
+ // Give the player a Shiny Charm
  scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.SHINY_CHARM));
  leaveEncounterWithoutBattle(scene, true);
  })
@@ -132,9 +135,11 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter =
  .withOption(
  MysteryEncounterOptionBuilder
  .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
- .withPrimaryPokemonRequirement(new CombinationPokemonRequirement(
- new MoveRequirement(EXTORTION_MOVES, true),
- new AbilityRequirement(EXTORTION_ABILITIES, true))
+ .withPrimaryPokemonRequirement(
+ CombinationPokemonRequirement.Some(
+ new MoveRequirement(EXTORTION_MOVES, true),
+ new AbilityRequirement(EXTORTION_ABILITIES, true)
+ )
  )
  .withDialogue({
  buttonLabel: `${namespace}:option.2.label`,

src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts

@@ -193,12 +193,14 @@ const WAVE_LEVEL_BREAKPOINTS = [ 30, 50, 70, 100, 120, 140, 160 ];
 export const BugTypeSuperfanEncounter: MysteryEncounter =
  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.BUG_TYPE_SUPERFAN)
  .withEncounterTier(MysteryEncounterTier.GREAT)
- .withPrimaryPokemonRequirement(new CombinationPokemonRequirement(
- // Must have at least 1 Bug type on team, OR have a bug item somewhere on the team
- new HeldItemRequirement([ "BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier" ], 1),
- new AttackTypeBoosterHeldItemTypeRequirement(Type.BUG, 1),
- new TypeRequirement(Type.BUG, false, 1)
- ))
+ .withPrimaryPokemonRequirement(
+ CombinationPokemonRequirement.Some(
+ // Must have at least 1 Bug type on team, OR have a bug item somewhere on the team
+ new HeldItemRequirement([ "BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier" ], 1),
+ new AttackTypeBoosterHeldItemTypeRequirement(Type.BUG, 1),
+ new TypeRequirement(Type.BUG, false, 1)
+ )
+ )
  .withMaxAllowedEncounters(1)
  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
  .withIntroSpriteConfigs([]) // These are set in onInit()
@@ -405,11 +407,13 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
  .build())
  .withOption(MysteryEncounterOptionBuilder
  .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
- .withPrimaryPokemonRequirement(new CombinationPokemonRequirement(
- // Meets one or both of the below reqs
- new HeldItemRequirement([ "BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier" ], 1),
- new AttackTypeBoosterHeldItemTypeRequirement(Type.BUG, 1)
- ))
+ .withPrimaryPokemonRequirement(
+ CombinationPokemonRequirement.Some(
+ // Meets one or both of the below reqs
+ new HeldItemRequirement([ "BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier" ], 1),
+ new AttackTypeBoosterHeldItemTypeRequirement(Type.BUG, 1)
+ )
+ )
  .withDialogue({
  buttonLabel: `${namespace}:option.3.label`,
  buttonTooltip: `${namespace}:option.3.tooltip`,

src/data/mystery-encounters/encounters/clowning-around-encounter.ts

@@ -11,7 +11,7 @@ import { Species } from "#enums/species";
 import { TrainerType } from "#enums/trainer-type";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Abilities } from "#enums/abilities";
-import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { applyAbilityOverrideToPokemon, applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { Type } from "#app/data/type";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
@@ -425,17 +425,8 @@ function onYesAbilitySwap(scene: BattleScene, resolve) {
  const onPokemonSelected = (pokemon: PlayerPokemon) => {
  // Do ability swap
  const encounter = scene.currentBattle.mysteryEncounter!;
- if (pokemon.isFusion()) {
- if (!pokemon.fusionCustomPokemonData) {
- pokemon.fusionCustomPokemonData = new CustomPokemonData();
- }
- pokemon.fusionCustomPokemonData.ability = encounter.misc.ability;
- } else {
- if (!pokemon.customPokemonData) {
- pokemon.customPokemonData = new CustomPokemonData();
- }
- pokemon.customPokemonData.ability = encounter.misc.ability;
- }
+
+ applyAbilityOverrideToPokemon(pokemon, encounter.misc.ability);
  encounter.setDialogueToken("chosenPokemon", pokemon.getNameToRender());
  scene.ui.setMode(Mode.MESSAGE).then(() => resolve(true));
  };

src/data/mystery-encounters/encounters/dark-deal-encounter.ts

@@ -14,6 +14,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
 import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
 import { PokemonFormChangeItemModifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { Challenges } from "#enums/challenges";
 
 /** i18n namespace for encounter */
 const namespace = "mysteryEncounters/darkDeal";
@@ -141,6 +142,7 @@ export const DarkDealEncounter: MysteryEncounter =
  // Removes random pokemon (including fainted) from party and adds name to dialogue data tokens
  // Will never return last battle able mon and instead pick fainted/unable to battle
  const removedPokemon = getRandomPlayerPokemon(scene, true, false, true);
+
  // Get all the pokemon's held items
  const modifiers = removedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier));
  scene.removePokemonFromPlayerParty(removedPokemon);
@@ -160,7 +162,13 @@ export const DarkDealEncounter: MysteryEncounter =
  scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.ROGUE_BALL));
 
  // Start encounter with random legendary (7-10 starter strength) that has level additive
- const bossTypes: Type[] = encounter.misc.removedTypes;
+ // If this is a mono-type challenge, always ensure the required type is filtered for
+ let bossTypes: Type[] = encounter.misc.removedTypes;
+ const singleTypeChallenges = scene.gameMode.challenges.filter(c => c.value && c.id === Challenges.SINGLE_TYPE);
+ if (scene.gameMode.isChallenge && singleTypeChallenges.length > 0) {
+ bossTypes = singleTypeChallenges.map(c => (c.value - 1) as Type);
+ }
+
  const bossModifiers: PokemonHeldItemModifier[] = encounter.misc.modifiers;
  // Starter egg tier, 35/50/10/5 %odds for tiers 6/7/8/9+
  const roll = randSeedInt(100);

src/data/mystery-encounters/encounters/delibirdy-encounter.ts

@@ -45,10 +45,13 @@ export const DelibirdyEncounter: MysteryEncounter =
  .withEncounterTier(MysteryEncounterTier.GREAT)
  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
  .withSceneRequirement(new MoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER)) // Must have enough money for it to spawn at the very least
- .withPrimaryPokemonRequirement(new CombinationPokemonRequirement( // Must also have either option 2 or 3 available to spawn
- new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS),
- new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true)
- ))
+ .withPrimaryPokemonRequirement(
+ CombinationPokemonRequirement.Some(
+ // Must also have either option 2 or 3 available to spawn
+ new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS),
+ new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true)
+ )
+ )
  .withIntroSpriteConfigs([
  {
  spriteKey: "",
@@ -196,7 +199,7 @@ export const DelibirdyEncounter: MysteryEncounter =
  const encounter = scene.currentBattle.mysteryEncounter!;
  const modifier: BerryModifier | HealingBoosterModifier = encounter.misc.chosenModifier;
 
- // Give the player a Candy Jar if they gave a Berry, and a Healing Charm for Reviver Seed
+ // Give the player a Candy Jar if they gave a Berry, and a Berry Pouch for Reviver Seed
  if (modifier instanceof BerryModifier) {
  // Check if the player has max stacks of that Candy Jar already
  const existing = scene.findModifier(m => m instanceof LevelIncrementBoosterModifier) as LevelIncrementBoosterModifier;
@@ -211,8 +214,8 @@ export const DelibirdyEncounter: MysteryEncounter =
  scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.CANDY_JAR));
  }
  } else {
- // Check if the player has max stacks of that Healing Charm already
- const existing = scene.findModifier(m => m instanceof HealingBoosterModifier) as HealingBoosterModifier;
+ // Check if the player has max stacks of that Berry Pouch already
+ const existing = scene.findModifier(m => m instanceof PreserveBerryModifier) as PreserveBerryModifier;
 
  if (existing && existing.getStackCount() >= existing.getMaxStackCount(scene)) {
  // At max stacks, give the first party pokemon a Shell Bell instead
@@ -221,7 +224,7 @@ export const DelibirdyEncounter: MysteryEncounter =
  scene.playSound("item_fanfare");
  await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
  } else {
- scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.HEALING_CHARM));
+ scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.BERRY_POUCH));
  }
  }
 
@@ -290,8 +293,8 @@ export const DelibirdyEncounter: MysteryEncounter =
  const encounter = scene.currentBattle.mysteryEncounter!;
  const modifier = encounter.misc.chosenModifier;
 
- // Check if the player has max stacks of Berry Pouch already
- const existing = scene.findModifier(m => m instanceof PreserveBerryModifier) as PreserveBerryModifier;
+ // Check if the player has max stacks of Healing Charm already
+ const existing = scene.findModifier(m => m instanceof HealingBoosterModifier) as HealingBoosterModifier;
 
  if (existing && existing.getStackCount() >= existing.getMaxStackCount(scene)) {
  // At max stacks, give the first party pokemon a Shell Bell instead
@@ -300,7 +303,7 @@ export const DelibirdyEncounter: MysteryEncounter =
  scene.playSound("item_fanfare");
  await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
  } else {
- scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.BERRY_POUCH));
+ scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.HEALING_CHARM));
  }
 
  // Remove the modifier if its stacks go to 0