mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-24 07:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes stuff

Browse Source
This commit is contained in:
Bertie690 2025-08-19 15:20:41 -04:00
parent 7b912ee033
commit 1cd0f41207
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/data/moves/move.ts
View File

@ -5375,9 +5375,9 @@ export abstract class VariableMoveTypeChartAttr extends MoveAttr {
* @param target - The {@linkcode Pokemon} targeted by the move * @param target - The {@linkcode Pokemon} targeted by the move
* @param move - The {@linkcode Move} with this attribute * @param move - The {@linkcode Move} with this attribute
* @param args - * @param args -
* `[0]`: A {@linkcode NumberHolder} holding the current type effectiveness * - `[0]`: A {@linkcode NumberHolder} holding the current type effectiveness
* `[1]`: The target's entire defensive type profile * - `[1]`: The target's entire defensive type profile
* `[2]`: The current {@linkcode PokemonType} of the move * - `[2]`: The current {@linkcode PokemonType} of the move
* @returns `true` if application of the attribute succeeds * @returns `true` if application of the attribute succeeds
*/ */
public abstract override apply(user: Pokemon, target: Pokemon, move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean; public abstract override apply(user: Pokemon, target: Pokemon, move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean;
@ -5422,16 +5422,14 @@ export class NeutralDamageAgainstFlyingTypeAttr extends VariableMoveTypeChartAtt
export class HitsSameTypeAttr extends VariableMoveTypeChartAttr { export class HitsSameTypeAttr extends VariableMoveTypeChartAttr {
public override apply(user: Pokemon, _target: Pokemon, _move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean { public override apply(user: Pokemon, _target: Pokemon, _move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean {
const [multiplier, types] = args; const [multiplier, types] = args;
if (user.getTypes(true).some(type => types.includes(type))) { const userTypes = user.getTypes(true);
// Synchronoise is never effective if the user is typeless
if (!userTypes.includes(PokemonType.UNKNOWN) && userTypes.some(type => types.includes(type))) {
return false; return false;
} }
multiplier.value = 0; multiplier.value = 0;
return true; return true;
} }
getCondition(): MoveConditionFunc {
return unknownTypeCondition;
}
} }
@ -5441,6 +5439,8 @@ export class HitsSameTypeAttr extends VariableMoveTypeChartAttr {
export class FlyingTypeMultiplierAttr extends VariableMoveTypeChartAttr { export class FlyingTypeMultiplierAttr extends VariableMoveTypeChartAttr {
apply(user: Pokemon, target: Pokemon, _move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean { apply(user: Pokemon, target: Pokemon, _move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean {
const multiplier = args[0]; const multiplier = args[0];
// Intentionally exclude `move` to not re-trigger the effects of various moves
// TODO: Do we need to pass `useIllusion` here?
multiplier.value *= target.getAttackTypeEffectiveness(PokemonType.FLYING, {source: user}); multiplier.value *= target.getAttackTypeEffectiveness(PokemonType.FLYING, {source: user});
return true; return true;
} }
@ -8259,8 +8259,6 @@ export class ExposedMoveAttr extends AddBattlerTagAttr {
} }
const unknownTypeCondition: MoveConditionFunc = (user, target, move) => !user.getTypes().includes(PokemonType.UNKNOWN);
export type MoveTargetSet = { export type MoveTargetSet = {
targets: BattlerIndex[]; targets: BattlerIndex[];
multiple: boolean; multiple: boolean;

14
test/moves/synchronoise.test.ts
View File

@ -82,11 +82,25 @@ describe("Moves - Synchronoise", () => {
}); });
it("should count as ineffective if no enemies share types with the user", async () => { it("should count as ineffective if no enemies share types with the user", async () => {
await game.classicMode.startBattle([SpeciesId.MAGNETON]);
const magneton = game.field.getPlayerPokemon();
const karp = game.field.getEnemyPokemon();
game.move.use(MoveId.SYNCHRONOISE);
await game.toEndOfTurn();
expect(magneton).toHaveUsedMove({ move: MoveId.SYNCHRONOISE, result: MoveResult.MISS });
expect(karp).toHaveFullHp();
});
it("should never affect any Pokemon if the user is typeless", async () => {
await game.classicMode.startBattle([SpeciesId.BIBAREL]); await game.classicMode.startBattle([SpeciesId.BIBAREL]);
const bibarel = game.field.getPlayerPokemon(); const bibarel = game.field.getPlayerPokemon();
const karp = game.field.getEnemyPokemon(); const karp = game.field.getEnemyPokemon();
bibarel.summonData.types = [PokemonType.UNKNOWN]; bibarel.summonData.types = [PokemonType.UNKNOWN];
karp.summonData.types = [PokemonType.UNKNOWN];
game.move.use(MoveId.SYNCHRONOISE); game.move.use(MoveId.SYNCHRONOISE);
await game.toEndOfTurn(); await game.toEndOfTurn();