diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 2d63f21654e..523c4dc9125 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -61,12 +61,12 @@ import CandyBar from './ui/candy-bar'; export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1"; export const SEED_OVERRIDE = ''; -export const STARTER_SPECIES_OVERRIDE = 0; +export const STARTER_SPECIES_OVERRIDE = 492; export const STARTER_FORM_OVERRIDE = 0; -export const STARTING_LEVEL_OVERRIDE = 0; +export const STARTING_LEVEL_OVERRIDE = 90; export const STARTING_WAVE_OVERRIDE = 0; export const STARTING_BIOME_OVERRIDE = Biome.TOWN; -export const STARTING_MONEY_OVERRIDE = 0; +export const STARTING_MONEY_OVERRIDE = 1000000; export const ABILITY_OVERRIDE = Abilities.NONE; export const MOVE_OVERRIDE = Moves.NONE; diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index e582fdfce1d..aac59f13f7c 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1,7 +1,7 @@ import { Abilities } from "./enums/abilities"; import BattleScene, { AnySound } from '../battle-scene'; import { GrowthRate } from './exp'; -import { SpeciesWildEvolutionDelay, pokemonEvolutions, pokemonPrevolutions } from './pokemon-evolutions'; +import { WildEvolutionDelay, pokemonEvolutions, pokemonPrevolutions } from './pokemon-evolutions'; import { Species } from './enums/species'; import { Type } from './type'; import { LevelMoves, pokemonFormLevelMoves, pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves, pokemonSpeciesLevelMoves } from './pokemon-level-moves'; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 8078a7c06b9..e6a386194b4 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -19,6 +19,7 @@ import { VoucherType, getVoucherTypeIcon, getVoucherTypeName } from '../system/v import { FormChangeItem, SpeciesFormChangeItemTrigger, pokemonFormChanges } from '../data/pokemon-forms'; import { ModifierTier } from './modifier-tier'; import { Nature, getNatureName, getNatureStatMultiplier } from '#app/data/nature'; +import { Species } from "../data/enums/species"; const outputModifierData = false; const useMaxWeightForOutput = false; @@ -556,6 +557,8 @@ export class FormChangeItemModifierType extends PokemonModifierType implements G if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) && !!pokemonFormChanges[pokemon.species.speciesId].find(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger) && (fc.trigger as SpeciesFormChangeItemTrigger).item === this.formChangeItem)) return null; + else if (pokemon.species.speciesId === Species.SHAYMIN && formChangeItem === FormChangeItem.GRACIDEA) //allow Shaymin to accept Gracidea anytime + return null; return PartyUiHandler.NoEffectMessage; }, FormChangeItem[formChangeItem].toLowerCase());