diff --git a/public/images/ui/bgb.png b/public/images/ui/bgb.png deleted file mode 100644 index 7de677ddf..000000000 Binary files a/public/images/ui/bgb.png and /dev/null differ diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index 9dec8d4fc..e9a11dbf3 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -337,7 +337,7 @@ export const trainerTypeDialogue = { $@c{serious_mopen_fists}Don't hold back, I want you to give me everything you've got!` ], victory: [ - `@c{shock}Wow… You actually cleaned me out.\nAre you actually a beginner? + `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner? $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way. $By the way, the professor asked me to give you these items. They look pretty cool. $@c{serious_smile_fists}Good luck out there!` diff --git a/src/data/move.ts b/src/data/move.ts index e3fbc1291..adf35c17d 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -17,6 +17,7 @@ import { PokemonHeldItemModifier } from "../modifier/modifier"; import { BattlerIndex } from "../battle"; import { Stat } from "./pokemon-stat"; import { TerrainType } from "./terrain"; +import { SpeciesFormChangeActiveTrigger } from "./pokemon-forms"; export enum MoveCategory { PHYSICAL, @@ -2103,6 +2104,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { switchOutTarget.hideInfo(); switchOutTarget.setVisible(false); switchOutTarget.scene.field.remove(switchOutTarget); + user.scene.triggerPokemonFormChange(switchOutTarget, SpeciesFormChangeActiveTrigger, true); if (switchOutTarget.hp) user.scene.unshiftPhase(new SwitchSummonPhase(user.scene, switchOutTarget.getFieldIndex(), user.scene.currentBattle.trainer.getNextSummonIndex((switchOutTarget as EnemyPokemon).trainerSlot), false, this.batonPass, false)); diff --git a/src/data/weather.ts b/src/data/weather.ts index 802e6cf53..aeb07a7db 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -243,6 +243,7 @@ export function getRandomWeatherType(arena: any /* Importing from arena causes a break; case Biome.TALL_GRASS: weatherPool = [ + { weatherType: WeatherType.NONE, weight: 8 }, { weatherType: WeatherType.RAIN, weight: 5 }, { weatherType: WeatherType.FOG, weight: 2 } ]; diff --git a/src/tutorial.ts b/src/tutorial.ts index 303c4aaba..b8509df6f 100644 --- a/src/tutorial.ts +++ b/src/tutorial.ts @@ -16,7 +16,8 @@ const tutorialHandlers = { return new Promise(resolve => { scene.ui.showText(`Welcome to PokéRogue! This is a battle-focused Pokémon fangame with roguelite elements. $This game is not monetized and we claim no ownership of Pokémon nor of the copyrighted assets used. - $The game is a work in progress, but fully playable.\nFor bug reports, please use the Discord community.`, null, () => resolve(), null, true); + $The game is a work in progress, but fully playable.\nFor bug reports, please use the Discord community. + $If the game runs slowly, please ensure 'Hardware Acceleration' is turned on in your browser settings.`, null, () => resolve(), null, true); }); }, [Tutorial.Access_Menu]: (scene: BattleScene) => {