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

Fixed errors

Browse Source
This commit is contained in:
Bertie690 2025-04-24 20:34:30 -04:00
parent ba2bf7dd01
commit cf11517629
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eslint.config.js
View File

@ -18,9 +18,9 @@ export default tseslint.config(
"@typescript-eslint": tseslint.plugin, "@typescript-eslint": tseslint.plugin,
}, },
rules: { rules: {
// Prevent fallthrough on switch without an explicit "falls through" comment. // Prevent fallthrough on switch without an explicit "falls through" comment with explanatino.
// Note: Move to biome if/when they add "falls through" comments // Note: Move to biome if/when they add "falls through" comments
"no-fallthrough": ["error", { commentPattern: "falls through" }], "no-fallthrough": ["error", { commentPattern: "^ falls through" }],
"no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this) "no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this)
"no-extra-semi": "error", // Disallows unnecessary semicolons for TypeScript-specific syntax "no-extra-semi": "error", // Disallows unnecessary semicolons for TypeScript-specific syntax
"import-x/extensions": ["error", "never", { json: "always" }], // Enforces no extension for imports unless json "import-x/extensions": ["error", "never", { json: "always" }], // Enforces no extension for imports unless json

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

@ -652,7 +652,7 @@ export default class Move implements Localizable {
break; break;
case MoveFlags.IGNORE_ABILITIES: case MoveFlags.IGNORE_ABILITIES:
if (user.hasAbilityWithAttr(MoveAbilityBypassAbAttr)) { if (user.hasAbilityWithAttr(MoveAbilityBypassAbAttr)) {
const abilityEffectsIgnored = new BooleanHolder(false); const abilityEffectsIgnored = new BooleanHolder(false);
applyAbAttrs(MoveAbilityBypassAbAttr, user, abilityEffectsIgnored, false, this); applyAbAttrs(MoveAbilityBypassAbAttr, user, abilityEffectsIgnored, false, this);
if (abilityEffectsIgnored.value) { if (abilityEffectsIgnored.value) {
return true; return true;
@ -1512,7 +1512,7 @@ export class TargetHalfHpDamageAttr extends FixedDamageAttr {
switch (user.turnData.hitCount - user.turnData.hitsLeft) { switch (user.turnData.hitCount - user.turnData.hitsLeft) {
case 0: case 0:
// first hit of move; update initialHp tracker // first hit of move; update initialHp tracker
this.initialHp = target.hp; this.initialHp = target.hp; // falls through
default: default:
// multi lens added hit; use initialHp tracker to ensure correct damage // multi lens added hit; use initialHp tracker to ensure correct damage
(args[0] as NumberHolder).value = toDmgValue(this.initialHp / 2); (args[0] as NumberHolder).value = toDmgValue(this.initialHp / 2);
@ -3160,7 +3160,7 @@ export class StatStageChangeAttr extends MoveEffectAttr {
private get showMessage () { private get showMessage () {
return this.options?.showMessage ?? true; return this.options?.showMessage ?? true;
} }
/** /**
* Attempts to change stats of the user or target (depending on value of selfTarget) if conditions are met * Attempts to change stats of the user or target (depending on value of selfTarget) if conditions are met
* @param user {@linkcode Pokemon} the user of the move * @param user {@linkcode Pokemon} the user of the move
@ -6326,11 +6326,11 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
if (!allyPokemon?.isActive(true) && switchOutTarget.hp) { if (!allyPokemon?.isActive(true) && switchOutTarget.hp) {
globalScene.pushPhase(new BattleEndPhase(false)); globalScene.pushPhase(new BattleEndPhase(false));
if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) { if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) {
globalScene.pushPhase(new SelectBiomePhase()); globalScene.pushPhase(new SelectBiomePhase());
} }
globalScene.pushPhase(new NewBattlePhase()); globalScene.pushPhase(new NewBattlePhase());
} }
} }

1
src/phases/move-effect-phase.ts
View File

@ -222,6 +222,7 @@ export class MoveEffectPhase extends PokemonPhase {
pokemonName: getPokemonNameWithAffix(target), pokemonName: getPokemonNameWithAffix(target),
}), }),
); );
// falls through to play msg
case HitCheckResult.NO_EFFECT_NO_MESSAGE: case HitCheckResult.NO_EFFECT_NO_MESSAGE:
case HitCheckResult.PROTECTED: case HitCheckResult.PROTECTED:
case HitCheckResult.TARGET_NOT_ON_FIELD: case HitCheckResult.TARGET_NOT_ON_FIELD: