mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-19 14:52:19 +02:00
Merge branch 'beta' into slow-start-msg
This commit is contained in:
damocleas
GitHub
commit
4b9796a484
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -1,2 +1,3 @@
|
||||
# Auto detect text files and perform LF normalization
|
||||
* text=auto
|
||||
* -crlf
|
||||
|
||||
@ -13,10 +13,10 @@
|
||||
"1005",
|
||||
"1006",
|
||||
"1006",
|
||||
"1007-apex",
|
||||
"1007-apex",
|
||||
"1008-ultimate",
|
||||
"1008-ultimate",
|
||||
"1007-apex-build-Disabled",
|
||||
"1007-apex-build-Disabled",
|
||||
"1008-ultimate-mode-Disabled",
|
||||
"1008-ultimate-mode-Disabled",
|
||||
"115-mega",
|
||||
"115-mega",
|
||||
"127-mega",
|
||||
@ -185,9 +185,9 @@
|
||||
"531-mega",
|
||||
"569-gigantamax",
|
||||
"569-gigantamax",
|
||||
"6-mega",
|
||||
"6-mega",
|
||||
"6-mega-x",
|
||||
"6-mega-x",
|
||||
"6-mega-y",
|
||||
"6-mega-y",
|
||||
"6058",
|
||||
"6058",
|
||||
@ -825,8 +825,8 @@
|
||||
"873",
|
||||
"874",
|
||||
"874",
|
||||
"875-no",
|
||||
"875-no",
|
||||
"875-no-ice",
|
||||
"875-no-ice",
|
||||
"875",
|
||||
"875",
|
||||
"876-female",
|
||||
@ -963,26 +963,26 @@
|
||||
"929",
|
||||
"930",
|
||||
"930",
|
||||
"931-blue",
|
||||
"931-blue",
|
||||
"931-green",
|
||||
"931-green",
|
||||
"931-white",
|
||||
"931-white",
|
||||
"931-yellow",
|
||||
"931-yellow",
|
||||
"931-blue-plumage-Disabled",
|
||||
"931-blue-plumage-Disabled",
|
||||
"931-green-plumage-Disabled",
|
||||
"931-green-plumage-Disabled",
|
||||
"931-white-plumage-Disabled",
|
||||
"931-white-plumage-Disabled",
|
||||
"931-yellow-plumage-Disabled",
|
||||
"931-yellow-plumage-Disabled",
|
||||
"932",
|
||||
"932",
|
||||
"933",
|
||||
"933",
|
||||
"934",
|
||||
"934",
|
||||
"935",
|
||||
"935",
|
||||
"936",
|
||||
"936",
|
||||
"937",
|
||||
"937",
|
||||
"935-Disabled",
|
||||
"935-Disabled",
|
||||
"936-Disabled",
|
||||
"936-Disabled",
|
||||
"937-Disabled",
|
||||
"937-Disabled",
|
||||
"938",
|
||||
"938",
|
||||
"939",
|
||||
@ -1073,6 +1073,8 @@
|
||||
"978-droopy",
|
||||
"978-stretchy",
|
||||
"978-stretchy",
|
||||
"979-Disabled",
|
||||
"979-Disabled",
|
||||
"980",
|
||||
"980",
|
||||
"981",
|
||||
@ -1131,10 +1133,10 @@
|
||||
"1005b",
|
||||
"1006b",
|
||||
"1006b",
|
||||
"1007b-apex",
|
||||
"1007b-apex",
|
||||
"1008b-ultimate",
|
||||
"1008b-ultimate",
|
||||
"1007b-apex-build-Disabled",
|
||||
"1007b-apex-build-Disabled",
|
||||
"1008b-ultimate-mode-Disabled",
|
||||
"1008b-ultimate-mode-Disabled",
|
||||
"115b-mega",
|
||||
"115b-mega",
|
||||
"127b-mega",
|
||||
@ -1303,9 +1305,9 @@
|
||||
"531b-mega",
|
||||
"569b-gigantamax",
|
||||
"569b-gigantamax",
|
||||
"6b-mega",
|
||||
"6b-mega",
|
||||
"6b-mega-x",
|
||||
"6b-mega-x",
|
||||
"6b-mega-y",
|
||||
"6b-mega-y",
|
||||
"6058b",
|
||||
"6058b",
|
||||
@ -1943,8 +1945,8 @@
|
||||
"873b",
|
||||
"874b",
|
||||
"874b",
|
||||
"875b-no",
|
||||
"875b-no",
|
||||
"875b-no-ice",
|
||||
"875b-no-ice",
|
||||
"875b",
|
||||
"875b",
|
||||
"876b-female",
|
||||
@ -2083,26 +2085,26 @@
|
||||
"929b",
|
||||
"930b",
|
||||
"930b",
|
||||
"931b-blue",
|
||||
"931b-blue",
|
||||
"931b-green",
|
||||
"931b-green",
|
||||
"931b-white",
|
||||
"931b-white",
|
||||
"931b-yellow",
|
||||
"931b-yellow",
|
||||
"931b-blue-plumage-Disabled",
|
||||
"931b-blue-plumage-Disabled",
|
||||
"931b-green-plumage-Disabled",
|
||||
"931b-green-plumage-Disabled",
|
||||
"931b-white-plumage-Disabled",
|
||||
"931b-white-plumage-Disabled",
|
||||
"931b-yellow-plumage-Disabled",
|
||||
"931b-yellow-plumage-Disabled",
|
||||
"932b",
|
||||
"932b",
|
||||
"933b",
|
||||
"933b",
|
||||
"934b",
|
||||
"934b",
|
||||
"935b",
|
||||
"935b",
|
||||
"936b",
|
||||
"936b",
|
||||
"937b",
|
||||
"937b",
|
||||
"935b-Disabled",
|
||||
"935b-Disabled",
|
||||
"936b-Disabled",
|
||||
"936b-Disabled",
|
||||
"937b-Disabled",
|
||||
"937b-Disabled",
|
||||
"938b",
|
||||
"938b",
|
||||
"939b",
|
||||
@ -2251,10 +2253,10 @@
|
||||
"1005sb",
|
||||
"1006sb",
|
||||
"1006sb",
|
||||
"1007sb-apex",
|
||||
"1007sb-apex",
|
||||
"1008sb-ultimate",
|
||||
"1008sb-ultimate",
|
||||
"1007sb-apex-build-Disabled",
|
||||
"1007sb-apex-build-Disabled",
|
||||
"1008sb-ultimate-mode-Disabled",
|
||||
"1008sb-ultimate-mode-Disabled",
|
||||
"115sb-mega",
|
||||
"115sb-mega",
|
||||
"127sb-mega",
|
||||
@ -3063,8 +3065,8 @@
|
||||
"873sb",
|
||||
"874sb",
|
||||
"874sb",
|
||||
"875sb-no",
|
||||
"875sb-no",
|
||||
"875sb-no-ice",
|
||||
"875sb-no-ice",
|
||||
"875sb",
|
||||
"875sb",
|
||||
"876sb-female",
|
||||
@ -3203,26 +3205,26 @@
|
||||
"929sb",
|
||||
"930sb",
|
||||
"930sb",
|
||||
"931sb-blue",
|
||||
"931sb-blue",
|
||||
"931sb-green",
|
||||
"931sb-green",
|
||||
"931sb-white",
|
||||
"931sb-white",
|
||||
"931sb-yellow",
|
||||
"931sb-yellow",
|
||||
"931sb-blue-plumage-Disabled",
|
||||
"931sb-blue-plumage-Disabled",
|
||||
"931sb-green-plumage-Disabled",
|
||||
"931sb-green-plumage-Disabled",
|
||||
"931sb-white-plumage-Disabled",
|
||||
"931sb-white-plumage-Disabled",
|
||||
"931sb-yellow-plumage-Disabled",
|
||||
"931sb-yellow-plumage-Disabled",
|
||||
"932sb",
|
||||
"932sb",
|
||||
"933sb",
|
||||
"933sb",
|
||||
"934sb",
|
||||
"934sb",
|
||||
"935sb",
|
||||
"935sb",
|
||||
"936sb",
|
||||
"936sb",
|
||||
"937sb",
|
||||
"937sb",
|
||||
"935sb-Disabled",
|
||||
"935sb-Disabled",
|
||||
"936sb-Disabled",
|
||||
"936sb-Disabled",
|
||||
"937sb-Disabled",
|
||||
"937sb-Disabled",
|
||||
"938sb",
|
||||
"938sb",
|
||||
"939sb",
|
||||
@ -3376,10 +3378,10 @@
|
||||
"1005s",
|
||||
"1006s",
|
||||
"1006s",
|
||||
"1007s-apex",
|
||||
"1007s-apex",
|
||||
"1008s-ultimate",
|
||||
"1008s-ultimate",
|
||||
"1007s-apex-build-Disabled",
|
||||
"1007s-apex-build-Disabled",
|
||||
"1008s-ultimate-mode-Disabled",
|
||||
"1008s-ultimate-mode-Disabled",
|
||||
"115s-mega",
|
||||
"115s-mega",
|
||||
"127s-mega",
|
||||
@ -4188,8 +4190,8 @@
|
||||
"873s",
|
||||
"874s",
|
||||
"874s",
|
||||
"875s-no",
|
||||
"875s-no",
|
||||
"875s-no-ice",
|
||||
"875s-no-ice",
|
||||
"875s",
|
||||
"875s",
|
||||
"876s-female",
|
||||
@ -4328,26 +4330,26 @@
|
||||
"929s",
|
||||
"930s",
|
||||
"930s",
|
||||
"931s-blue",
|
||||
"931s-blue",
|
||||
"931s-green",
|
||||
"931s-green",
|
||||
"931s-white",
|
||||
"931s-white",
|
||||
"931s-yellow",
|
||||
"931s-yellow",
|
||||
"931s-blue-plumage-Disabled",
|
||||
"931s-blue-plumage-Disabled",
|
||||
"931s-green-plumage-Disabled",
|
||||
"931s-green-plumage-Disabled",
|
||||
"931s-white-plumage-Disabled",
|
||||
"931s-white-plumage-Disabled",
|
||||
"931s-yellow-plumage-Disabled",
|
||||
"931s-yellow-plumage-Disabled",
|
||||
"932s",
|
||||
"932s",
|
||||
"933s",
|
||||
"933s",
|
||||
"934s",
|
||||
"934s",
|
||||
"935s",
|
||||
"935s",
|
||||
"936s",
|
||||
"936s",
|
||||
"937s",
|
||||
"937s",
|
||||
"935s-Disabled",
|
||||
"935s-Disabled",
|
||||
"936s-Disabled",
|
||||
"936s-Disabled",
|
||||
"937s-Disabled",
|
||||
"937s-Disabled",
|
||||
"938s",
|
||||
"938s",
|
||||
"939s",
|
||||
@ -4438,6 +4440,8 @@
|
||||
"978s-droopy",
|
||||
"978s-stretchy",
|
||||
"978s-stretchy",
|
||||
"979s-Disabled",
|
||||
"979s-Disabled",
|
||||
"980s",
|
||||
"980s",
|
||||
"981s",
|
||||
@ -4485,11 +4489,10 @@
|
||||
"1000",
|
||||
"1001",
|
||||
"1004",
|
||||
"1007-apex",
|
||||
"1007-apex",
|
||||
"1007-apex",
|
||||
"1007-apex",
|
||||
"1008-ultimate",
|
||||
"1007-apex-build-Disabled",
|
||||
"1007-apex-build-Disabled",
|
||||
"1008-ultimate-mode-Disabled",
|
||||
"1008-ultimate-mode-Disabled",
|
||||
"127-mega",
|
||||
"142-mega",
|
||||
"150-mega",
|
||||
@ -4698,21 +4701,21 @@
|
||||
"933_3",
|
||||
"933_3",
|
||||
"934",
|
||||
"935",
|
||||
"935_3",
|
||||
"935_3",
|
||||
"936_1",
|
||||
"936_1",
|
||||
"936_2",
|
||||
"936_2",
|
||||
"936_3",
|
||||
"936_3",
|
||||
"937_1",
|
||||
"937_1",
|
||||
"937_2",
|
||||
"937_2",
|
||||
"937_3",
|
||||
"937_3",
|
||||
"935-Disabled",
|
||||
"935_3-Disabled",
|
||||
"935_3-Disabled",
|
||||
"936_1-Disabled",
|
||||
"936_1-Disabled",
|
||||
"936_2-Disabled",
|
||||
"936_2-Disabled",
|
||||
"936_3-Disabled",
|
||||
"936_3-Disabled",
|
||||
"937_1-Disabled",
|
||||
"937_1-Disabled",
|
||||
"937_2-Disabled",
|
||||
"937_2-Disabled",
|
||||
"937_3-Disabled",
|
||||
"937_3-Disabled",
|
||||
"94-mega_1",
|
||||
"94-mega_1",
|
||||
"94-mega_2",
|
||||
@ -4755,11 +4758,10 @@
|
||||
"1000b",
|
||||
"1001b",
|
||||
"1004b",
|
||||
"1007b-apex",
|
||||
"1007b-apex",
|
||||
"1007b-apex",
|
||||
"1007b-apex",
|
||||
"1008b-ultimate",
|
||||
"1007b-apex-build-Disabled",
|
||||
"1007b-apex-build-Disabled",
|
||||
"1008b-ultimate-mode-Disabled",
|
||||
"1008b-ultimate-mode-Disabled",
|
||||
"127b-mega",
|
||||
"142b-mega",
|
||||
"150b-mega",
|
||||
@ -4920,24 +4922,24 @@
|
||||
"932b",
|
||||
"933b",
|
||||
"934b",
|
||||
"935_1b",
|
||||
"935_1b",
|
||||
"935_2b",
|
||||
"935_2b",
|
||||
"935_3b",
|
||||
"935_3b",
|
||||
"936_1b",
|
||||
"936_1b",
|
||||
"936_2b",
|
||||
"936_2b",
|
||||
"936_3b",
|
||||
"936_3b",
|
||||
"937_1b",
|
||||
"937_1b",
|
||||
"937_2b",
|
||||
"937_2b",
|
||||
"937_3b",
|
||||
"937_3b",
|
||||
"935_1b-Disabled",
|
||||
"935_1b-Disabled",
|
||||
"935_2b-Disabled",
|
||||
"935_2b-Disabled",
|
||||
"935_3b-Disabled",
|
||||
"935_3b-Disabled",
|
||||
"936_1b-Disabled",
|
||||
"936_1b-Disabled",
|
||||
"936_2b-Disabled",
|
||||
"936_2b-Disabled",
|
||||
"936_3b-Disabled",
|
||||
"936_3b-Disabled",
|
||||
"937_1b-Disabled",
|
||||
"937_1b-Disabled",
|
||||
"937_2b-Disabled",
|
||||
"937_2b-Disabled",
|
||||
"937_3b-Disabled",
|
||||
"937_3b-Disabled",
|
||||
"94b-mega",
|
||||
"948b",
|
||||
"949b",
|
||||
|
||||
@ -3860,7 +3860,7 @@ export class PostTurnStatusHealAbAttr extends PostTurnAbAttr {
|
||||
}
|
||||
|
||||
override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
|
||||
return (pokemon.status !== null) && this.effects.includes(pokemon.status.effect) && !pokemon.isFullHp();
|
||||
return !Utils.isNullOrUndefined(pokemon.status) && this.effects.includes(pokemon.status.effect) && !pokemon.isFullHp();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -4103,7 +4103,7 @@ export class FetchBallAbAttr extends PostTurnAbAttr {
|
||||
}
|
||||
|
||||
override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
|
||||
return !simulated && globalScene.currentBattle.lastUsedPokeball !== null && !!pokemon.isPlayer;
|
||||
return !simulated && !Utils.isNullOrUndefined(globalScene.currentBattle.lastUsedPokeball) && !!pokemon.isPlayer;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -64,7 +64,7 @@ export abstract class ArenaTag {
|
||||
}
|
||||
}
|
||||
|
||||
onOverlap(_arena: Arena): void {}
|
||||
onOverlap(_arena: Arena, _source: Pokemon | null): void {}
|
||||
|
||||
lapse(_arena: Arena): boolean {
|
||||
return this.turnCount < 1 || !!--this.turnCount;
|
||||
@ -706,7 +706,7 @@ export class ArenaTrapTag extends ArenaTag {
|
||||
this.maxLayers = maxLayers;
|
||||
}
|
||||
|
||||
onOverlap(arena: Arena): void {
|
||||
onOverlap(arena: Arena, _source: Pokemon | null): void {
|
||||
if (this.layers < this.maxLayers) {
|
||||
this.layers++;
|
||||
|
||||
@ -1427,11 +1427,7 @@ export class SuppressAbilitiesTag extends ArenaTag {
|
||||
public override onAdd(_arena: Arena): void {
|
||||
const pokemon = this.getSourcePokemon();
|
||||
if (pokemon) {
|
||||
globalScene.queueMessage(
|
||||
i18next.t("arenaTag:neutralizingGasOnAdd", {
|
||||
pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
|
||||
}),
|
||||
);
|
||||
this.playActivationMessage(pokemon);
|
||||
|
||||
for (const fieldPokemon of globalScene.getField(true)) {
|
||||
if (fieldPokemon && fieldPokemon.id !== pokemon.id) {
|
||||
@ -1441,8 +1437,9 @@ export class SuppressAbilitiesTag extends ArenaTag {
|
||||
}
|
||||
}
|
||||
|
||||
public override onOverlap(_arena: Arena): void {
|
||||
public override onOverlap(_arena: Arena, source: Pokemon | null): void {
|
||||
this.sourceCount++;
|
||||
this.playActivationMessage(source);
|
||||
}
|
||||
|
||||
public onSourceLeave(arena: Arena): void {
|
||||
@ -1481,6 +1478,16 @@ export class SuppressAbilitiesTag extends ArenaTag {
|
||||
public isBeingRemoved() {
|
||||
return this.beingRemoved;
|
||||
}
|
||||
|
||||
private playActivationMessage(pokemon: Pokemon | null) {
|
||||
if (pokemon) {
|
||||
globalScene.queueMessage(
|
||||
i18next.t("arenaTag:neutralizingGasOnAdd", {
|
||||
pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: swap `sourceMove` and `sourceId` and make `sourceMove` an optional parameter
|
||||
|
||||
@ -5542,6 +5542,31 @@ export class LeechSeedAttr extends AddBattlerTagAttr {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the appropriate battler tag for Smack Down and Thousand arrows
|
||||
* @extends AddBattlerTagAttr
|
||||
*/
|
||||
export class FallDownAttr extends AddBattlerTagAttr {
|
||||
constructor() {
|
||||
super(BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds Grounded Tag to the target and checks if fallDown message should be displayed
|
||||
* @param user the {@linkcode Pokemon} using the move
|
||||
* @param target the {@linkcode Pokemon} targeted by the move
|
||||
* @param move the {@linkcode Move} invoking this effect
|
||||
* @param args n/a
|
||||
* @returns `true` if the effect successfully applies; `false` otherwise
|
||||
*/
|
||||
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
|
||||
if (!target.isGrounded()) {
|
||||
globalScene.queueMessage(i18next.t("moveTriggers:fallDown", { targetPokemonName: getPokemonNameWithAffix(target) }));
|
||||
}
|
||||
return super.apply(user, target, move, args);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the appropriate battler tag for Gulp Missile when Surf or Dive is used.
|
||||
* @extends MoveEffectAttr
|
||||
@ -9646,7 +9671,7 @@ export function initMoves() {
|
||||
.target(MoveTarget.BOTH_SIDES)
|
||||
.unimplemented(),
|
||||
new AttackMove(Moves.SMACK_DOWN, PokemonType.ROCK, MoveCategory.PHYSICAL, 50, 100, 15, 100, 0, 5)
|
||||
.attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true)
|
||||
.attr(FallDownAttr)
|
||||
.attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED)
|
||||
.attr(RemoveBattlerTagAttr, [ BattlerTagType.FLYING, BattlerTagType.FLOATING, BattlerTagType.TELEKINESIS ])
|
||||
.attr(HitsTagAttr, BattlerTagType.FLYING)
|
||||
@ -10097,7 +10122,7 @@ export function initMoves() {
|
||||
.triageMove(),
|
||||
new AttackMove(Moves.THOUSAND_ARROWS, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
|
||||
.attr(NeutralDamageAgainstFlyingTypeMultiplierAttr)
|
||||
.attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true)
|
||||
.attr(FallDownAttr)
|
||||
.attr(HitsTagAttr, BattlerTagType.FLYING)
|
||||
.attr(HitsTagAttr, BattlerTagType.FLOATING)
|
||||
.attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED)
|
||||
|
||||
@ -673,7 +673,7 @@ export class Arena {
|
||||
): boolean {
|
||||
const existingTag = this.getTagOnSide(tagType, side);
|
||||
if (existingTag) {
|
||||
existingTag.onOverlap(this);
|
||||
existingTag.onOverlap(this, globalScene.getPokemonById(sourceId));
|
||||
|
||||
if (existingTag instanceof ArenaTrapTag) {
|
||||
const { tagType, side, turnCount, layers, maxLayers } = existingTag as ArenaTrapTag;
|
||||
|
||||
@ -28,17 +28,28 @@ export class MessagePhase extends Phase {
|
||||
super.start();
|
||||
|
||||
if (this.text.indexOf("$") > -1) {
|
||||
const pokename: string[] = [];
|
||||
const repname = [ "#POKEMON1", "#POKEMON2" ];
|
||||
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
|
||||
pokename.push(globalScene.getPlayerField()[p].getNameToRender());
|
||||
this.text = this.text.split(pokename[p]).join(repname[p]);
|
||||
}
|
||||
const pageIndex = this.text.indexOf("$");
|
||||
globalScene.unshiftPhase(
|
||||
new MessagePhase(
|
||||
this.text.slice(pageIndex + 1),
|
||||
this.callbackDelay,
|
||||
this.prompt,
|
||||
this.promptDelay,
|
||||
this.speaker,
|
||||
),
|
||||
);
|
||||
this.text = this.text.slice(0, pageIndex).trim();
|
||||
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
|
||||
this.text = this.text.split(repname[p]).join(pokename[p]);
|
||||
}
|
||||
if (pageIndex !== -1) {
|
||||
globalScene.unshiftPhase(
|
||||
new MessagePhase(
|
||||
this.text.slice(pageIndex + 1),
|
||||
this.callbackDelay,
|
||||
this.prompt,
|
||||
this.promptDelay,
|
||||
this.speaker,
|
||||
),
|
||||
);
|
||||
this.text = this.text.slice(0, pageIndex).trim();
|
||||
}
|
||||
}
|
||||
|
||||
if (this.speaker) {
|
||||
|
||||
@ -76,6 +76,12 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
|
||||
const fadeMap = new Map<number, number>();
|
||||
const actionPattern = /@(c|d|s|f)\{(.*?)\}/;
|
||||
let actionMatch: RegExpExecArray | null;
|
||||
const pokename: string[] = [];
|
||||
const repname = [ "#POKEMON1", "#POKEMON2" ];
|
||||
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
|
||||
pokename.push(globalScene.getPlayerField()[p].getNameToRender());
|
||||
text = text.split(pokename[p]).join(repname[p]);
|
||||
}
|
||||
while ((actionMatch = actionPattern.exec(text))) {
|
||||
switch (actionMatch[1]) {
|
||||
case "c":
|
||||
@ -94,6 +100,9 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
|
||||
text = text.slice(0, actionMatch.index) + text.slice(actionMatch.index + actionMatch[2].length + 4);
|
||||
}
|
||||
|
||||
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
|
||||
text = text.split(repname[p]).join(pokename[p]);
|
||||
}
|
||||
if (text) {
|
||||
// Predetermine overflow line breaks to avoid words breaking while displaying
|
||||
const textWords = text.split(" ");
|
||||
|
||||
@ -1742,36 +1742,26 @@ export default class PokedexUiHandler extends MessageUiHandler {
|
||||
container.icon.setTint(0);
|
||||
}
|
||||
|
||||
if (data.eggMove1) {
|
||||
container.eggMove1Icon.setVisible(true);
|
||||
} else {
|
||||
container.eggMove1Icon.setVisible(false);
|
||||
}
|
||||
if (data.eggMove2) {
|
||||
container.eggMove2Icon.setVisible(true);
|
||||
} else {
|
||||
container.eggMove2Icon.setVisible(false);
|
||||
}
|
||||
if (data.tmMove1) {
|
||||
container.tmMove1Icon.setVisible(true);
|
||||
} else {
|
||||
container.tmMove1Icon.setVisible(false);
|
||||
}
|
||||
if (data.tmMove2) {
|
||||
container.tmMove2Icon.setVisible(true);
|
||||
} else {
|
||||
container.tmMove2Icon.setVisible(false);
|
||||
}
|
||||
if (data.passive1) {
|
||||
container.passive1Icon.setVisible(true);
|
||||
} else {
|
||||
container.passive1Icon.setVisible(false);
|
||||
}
|
||||
if (data.passive2) {
|
||||
container.passive2Icon.setVisible(true);
|
||||
} else {
|
||||
container.passive2Icon.setVisible(false);
|
||||
}
|
||||
const pairs: [boolean | undefined, Phaser.GameObjects.Image][] = [
|
||||
[data.eggMove1, container.eggMove1Icon],
|
||||
[data.eggMove2, container.eggMove2Icon],
|
||||
[data.tmMove1, container.tmMove1Icon],
|
||||
[data.tmMove2, container.tmMove2Icon],
|
||||
[data.passive1, container.passive1Icon],
|
||||
[data.passive2, container.passive2Icon],
|
||||
];
|
||||
|
||||
pairs.forEach(([unlocked, icon]) => {
|
||||
if (unlocked) {
|
||||
icon.setVisible(true);
|
||||
icon.clearTint();
|
||||
} else if (unlocked === false) {
|
||||
icon.setVisible(true);
|
||||
icon.setTint(0x808080);
|
||||
} else {
|
||||
icon.setVisible(false);
|
||||
}
|
||||
});
|
||||
|
||||
if (this.showDecorations) {
|
||||
if (this.pokerusSpecies.includes(data.species)) {
|
||||
|
||||
11
src/ui/ui.ts
11
src/ui/ui.ts
@ -328,17 +328,28 @@ export default class UI extends Phaser.GameObjects.Container {
|
||||
prompt?: boolean | null,
|
||||
promptDelay?: number | null,
|
||||
): void {
|
||||
const pokename: string[] = [];
|
||||
const repname = [ "#POKEMON1", "#POKEMON2" ];
|
||||
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
|
||||
pokename.push(globalScene.getPlayerField()[p].getNameToRender());
|
||||
text = text.split(pokename[p]).join(repname[p]);
|
||||
}
|
||||
if (prompt && text.indexOf("$") > -1) {
|
||||
const messagePages = text.split(/\$/g).map(m => m.trim());
|
||||
// biome-ignore lint/complexity/useOptionalChain: optional chain would change this to be null instead of undefined.
|
||||
let showMessageAndCallback = () => callback && callback();
|
||||
for (let p = messagePages.length - 1; p >= 0; p--) {
|
||||
const originalFunc = showMessageAndCallback;
|
||||
messagePages[p] = messagePages[p].split(repname[0]).join(pokename[0]);
|
||||
messagePages[p] = messagePages[p].split(repname[1]).join(pokename[1]);
|
||||
showMessageAndCallback = () => this.showText(messagePages[p], null, originalFunc, null, true);
|
||||
}
|
||||
showMessageAndCallback();
|
||||
} else {
|
||||
const handler = this.getHandler();
|
||||
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
|
||||
text = text.split(repname[p]).join(pokename[p]);
|
||||
}
|
||||
if (handler instanceof MessageUiHandler) {
|
||||
(handler as MessageUiHandler).showText(text, delay, callback, callbackDelay, prompt, promptDelay);
|
||||
} else {
|
||||
|
||||
@ -27,8 +27,8 @@ describe("Moves - Chilly Reception", () => {
|
||||
.battleType("single")
|
||||
.moveset([Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE])
|
||||
.enemyMoveset(Array(4).fill(Moves.SPLASH))
|
||||
.enemyAbility(Abilities.NONE)
|
||||
.ability(Abilities.NONE);
|
||||
.enemyAbility(Abilities.BALL_FETCH)
|
||||
.ability(Abilities.BALL_FETCH);
|
||||
});
|
||||
|
||||
it("should still change the weather if user can't switch out", async () => {
|
||||
@ -72,7 +72,6 @@ describe("Moves - Chilly Reception", () => {
|
||||
game.override
|
||||
.battleType("single")
|
||||
.enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE])
|
||||
.enemyAbility(Abilities.NONE)
|
||||
.moveset(Array(4).fill(Moves.SPLASH));
|
||||
|
||||
await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
|
||||
@ -89,7 +88,6 @@ describe("Moves - Chilly Reception", () => {
|
||||
.battleType("single")
|
||||
.startingWave(8)
|
||||
.enemyMoveset(Array(4).fill(Moves.CHILLY_RECEPTION))
|
||||
.enemyAbility(Abilities.NONE)
|
||||
.enemySpecies(Species.MAGIKARP)
|
||||
.moveset([Moves.SPLASH, Moves.THUNDERBOLT]);
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
import { Stat } from "#enums/stat";
|
||||
import { ArenaTagSide } from "#app/data/arena-tag";
|
||||
import { ArenaTagType } from "#app/enums/arena-tag-type";
|
||||
import { TurnEndPhase } from "#app/phases/turn-end-phase";
|
||||
import { Abilities } from "#enums/abilities";
|
||||
import { Moves } from "#enums/moves";
|
||||
import { Species } from "#enums/species";
|
||||
import { Stat } from "#enums/stat";
|
||||
import GameManager from "#test/testUtils/gameManager";
|
||||
import Phaser from "phaser";
|
||||
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
|
||||
@ -24,13 +24,16 @@ describe("Moves - Tailwind", () => {
|
||||
|
||||
beforeEach(() => {
|
||||
game = new GameManager(phaserGame);
|
||||
game.override.battleType("double");
|
||||
game.override.moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]);
|
||||
game.override.enemyMoveset(Moves.SPLASH);
|
||||
game.override
|
||||
.battleType("double")
|
||||
.moveset([Moves.TAILWIND, Moves.SPLASH])
|
||||
.enemyMoveset(Moves.SPLASH)
|
||||
.enemyAbility(Abilities.BALL_FETCH)
|
||||
.ability(Abilities.BALL_FETCH);
|
||||
});
|
||||
|
||||
it("doubles the Speed stat of the Pokemons on its side", async () => {
|
||||
await game.startBattle([Species.MAGIKARP, Species.MEOWTH]);
|
||||
await game.classicMode.startBattle([Species.MAGIKARP, Species.MEOWTH]);
|
||||
const magikarp = game.scene.getPlayerField()[0];
|
||||
const meowth = game.scene.getPlayerField()[1];
|
||||
|
||||
@ -43,7 +46,7 @@ describe("Moves - Tailwind", () => {
|
||||
game.move.select(Moves.TAILWIND);
|
||||
game.move.select(Moves.SPLASH, 1);
|
||||
|
||||
await game.phaseInterceptor.to(TurnEndPhase);
|
||||
await game.phaseInterceptor.to("TurnEndPhase");
|
||||
|
||||
expect(magikarp.getEffectiveStat(Stat.SPD)).toBe(magikarpSpd * 2);
|
||||
expect(meowth.getEffectiveStat(Stat.SPD)).toBe(meowthSpd * 2);
|
||||
@ -53,7 +56,7 @@ describe("Moves - Tailwind", () => {
|
||||
it("lasts for 4 turns", async () => {
|
||||
game.override.battleType("single");
|
||||
|
||||
await game.startBattle([Species.MAGIKARP]);
|
||||
await game.classicMode.startBattle([Species.MAGIKARP]);
|
||||
|
||||
game.move.select(Moves.TAILWIND);
|
||||
await game.toNextTurn();
|
||||
@ -76,7 +79,7 @@ describe("Moves - Tailwind", () => {
|
||||
it("does not affect the opposing side", async () => {
|
||||
game.override.battleType("single");
|
||||
|
||||
await game.startBattle([Species.MAGIKARP]);
|
||||
await game.classicMode.startBattle([Species.MAGIKARP]);
|
||||
|
||||
const ally = game.scene.getPlayerPokemon()!;
|
||||
const enemy = game.scene.getEnemyPokemon()!;
|
||||
@ -91,7 +94,7 @@ describe("Moves - Tailwind", () => {
|
||||
|
||||
game.move.select(Moves.TAILWIND);
|
||||
|
||||
await game.phaseInterceptor.to(TurnEndPhase);
|
||||
await game.phaseInterceptor.to("TurnEndPhase");
|
||||
|
||||
expect(ally.getEffectiveStat(Stat.SPD)).toBe(allySpd * 2);
|
||||
expect(enemy.getEffectiveStat(Stat.SPD)).equal(enemySpd);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user