From b231b887aa0adedfd1534101c7081af72509e468 Mon Sep 17 00:00:00 2001 From: Benjamin Odom Date: Thu, 9 May 2024 01:40:23 -0500 Subject: [PATCH 1/3] Update ability.ts (#671) --- src/data/ability.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 04cd18adac8..f2220c850dc 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -3305,7 +3305,7 @@ export function initAbilities() { new Ability(Abilities.EMERGENCY_EXIT, 7) .unimplemented(), new Ability(Abilities.WATER_COMPACTION, 7) - .attr(PostDefendStatChangeAbAttr, (target, user, move) => move.type === Type.WATER, BattleStat.DEF, 2), + .attr(PostDefendStatChangeAbAttr, (target, user, move) => move.type === Type.WATER && move.category !== MoveCategory.STATUS, BattleStat.DEF, 2), new Ability(Abilities.MERCILESS, 7) .unimplemented(), new Ability(Abilities.SHIELDS_DOWN, 7) From c1cff02a18d7b9612ac8dda980426ccd48c775c8 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 06:22:33 -0400 Subject: [PATCH 2/3] Fix bug with accounts being unable to create new saves --- src/system/game-data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 30cc7c96dfb..e342f337ac2 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -418,7 +418,7 @@ export class GameData { .then(response => response.text()) .then(response => { if (!response.length || response[0] !== '{') { - if (response.startsWith('failed to open save file')) { + if (response.startsWith('no rows in result set')) { this.scene.queueMessage('Save data could not be found. If this is a new account, you can safely ignore this message.', null, true); return resolve(true); } else if (response.indexOf('Too many connections') > -1) { From 7f0362e124b629e509722fbea4e544dfb27dd3d3 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 07:30:19 -0400 Subject: [PATCH 3/3] Fix it for real this time --- src/system/game-data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/system/game-data.ts b/src/system/game-data.ts index e342f337ac2..2be2ee15593 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -418,7 +418,7 @@ export class GameData { .then(response => response.text()) .then(response => { if (!response.length || response[0] !== '{') { - if (response.startsWith('no rows in result set')) { + if (response.startsWith('sql: no rows in result set')) { this.scene.queueMessage('Save data could not be found. If this is a new account, you can safely ignore this message.', null, true); return resolve(true); } else if (response.indexOf('Too many connections') > -1) {