Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Linked: Fix Upper Hand

Browse Source
This commit is contained in:
Kris Johnson 2026-03-17 22:58:12 -06:00
parent e7b13b7df3
commit e57a806630
1 changed files with 39 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
data/mods/linked/moves.ts
View File

@ -41,29 +41,23 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
inherit: true, inherit: true,
onTry(source, target) { onTry(source, target) {
const action = this.queue.willMove(target); const action = this.queue.willMove(target);
if (!action || action.choice !== 'move' || if (!action || action.choice !== 'move') return false;
// @ts-expect-error modded
if (!action.linked) {
const move = action.move;
if (move.category === 'Status' && move.id !== 'mefirst') {
return false;
}
} else {
// @ts-expect-error modded // @ts-expect-error modded
(!action.linked && action.move.category === 'Status' && action.move.id !== 'mefirst')) { if (action.linked.every(move => move.category === 'Status' && move.id !== 'mefirst')) {
this.attrLastMove('[still]'); return false;
this.add('-fail', source); }
return null;
} }
if (target.volatiles.mustrecharge && target.volatiles.mustrecharge.duration! < 2) { if (target.volatiles['mustrecharge'] && target.volatiles['mustrecharge'].duration! < 2) {
// Duration may not be lower than 2 if Sucker Punch is used as a low-priority move // Duration may not be lower than 2 if Sucker Punch is used as a low-priority move
// i.e. if Sucker Punch is linked with a negative priority move // i.e. if Sucker Punch is linked with a negative priority move
this.attrLastMove('[still]'); return false;
this.add('-fail', source);
return null;
}
// @ts-expect-error modded
if (action.linked) {
// @ts-expect-error modded
for (const linkedMove of action.linked) {
if (linkedMove.category !== 'Status' || linkedMove.id === 'mefirst') return;
}
this.attrLastMove('[still]');
this.add('-fail', source);
return null;
} }
}, },
}, },
@ -71,29 +65,23 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
inherit: true, inherit: true,
onTry(source, target) { onTry(source, target) {
const action = this.queue.willMove(target); const action = this.queue.willMove(target);
if (!action || action.choice !== 'move' || if (!action || action.choice !== 'move') return false;
// @ts-expect-error modded
if (!action.linked) {
const move = action.move;
if (move.category === 'Status' && move.id !== 'mefirst') {
return false;
}
} else {
// @ts-expect-error modded // @ts-expect-error modded
(!action.linked && action.move.category === 'Status' && action.move.id !== 'mefirst')) { if (action.linked.every(move => move.category === 'Status' && move.id !== 'mefirst')) {
this.attrLastMove('[still]'); return false;
this.add('-fail', source); }
return null;
} }
if (target.volatiles.mustrecharge && target.volatiles.mustrecharge.duration! < 2) { if (target.volatiles['mustrecharge'] && target.volatiles['mustrecharge'].duration! < 2) {
// Duration may not be lower than 2 if Sucker Punch is used as a low-priority move // Duration may not be lower than 2 if Sucker Punch is used as a low-priority move
// i.e. if Sucker Punch is linked with a negative priority move // i.e. if Sucker Punch is linked with a negative priority move
this.attrLastMove('[still]'); return false;
this.add('-fail', source);
return null;
}
// @ts-expect-error modded
if (action.linked) {
// @ts-expect-error modded
for (const linkedMove of action.linked) {
if (linkedMove.category !== 'Status' || linkedMove.id === 'mefirst') return;
}
this.attrLastMove('[still]');
this.add('-fail', source);
return null;
} }
}, },
}, },
@ -101,29 +89,23 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
inherit: true, inherit: true,
onTry(source, target) { onTry(source, target) {
const action = this.queue.willMove(target); const action = this.queue.willMove(target);
if (!action || action.choice !== 'move' || action.move.priority < 0.1 || if (!action || action.choice !== 'move') return false;
// @ts-expect-error modded
if (!action.linked) {
const move = action.move;
if (move.priority < 0.1 || move.category === 'Status') {
return false;
}
} else {
// @ts-expect-error modded // @ts-expect-error modded
(!action.linked && action.move.category === 'Status' && action.move.id !== 'mefirst')) { if (action.linked.every(move => move.priority < 0.1 || move.category === 'Status')) {
this.attrLastMove('[still]'); return false;
this.add('-fail', source); }
return null;
} }
if (target.volatiles.mustrecharge && target.volatiles.mustrecharge.duration! < 2) { if (target.volatiles['mustrecharge'] && target.volatiles['mustrecharge'].duration! < 2) {
// Duration may not be lower than 2 if Sucker Punch is used as a low-priority move // Duration may not be lower than 2 if Sucker Punch is used as a low-priority move
// i.e. if Sucker Punch is linked with a negative priority move // i.e. if Sucker Punch is linked with a negative priority move
this.attrLastMove('[still]'); return false;
this.add('-fail', source);
return null;
}
// @ts-expect-error modded
if (action.linked) {
// @ts-expect-error modded
for (const linkedMove of action.linked) {
if (linkedMove.category !== 'Status' || linkedMove.id === 'mefirst') return;
}
this.attrLastMove('[still]');
this.add('-fail', source);
return null;
} }
}, },
}, },