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

Ensure ChargeMove's is method calls super

Browse Source
This commit is contained in:
Sirz Benjie 2025-06-09 13:03:35 -05:00
parent 50a5611837
commit 5f1a9f788f
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1045,7 +1045,13 @@ export class SelfStatusMove extends Move {
} }
} }
type SubMove = new (...args: any[]) => Move; // TODO: Figure out how to improve the signature of this so that
// the `ChargeMove` function knows that the argument `Base` is a specific subclass of move that cannot
// be abstract.
// Right now, I only know how to do this by using the type conjunction (the & operators)
type SubMove = new (...args: any[]) => Move & {
is<K extends keyof MoveClassMap>(moveKind: K): this is MoveClassMap[K];
};
function ChargeMove<TBase extends SubMove>(Base: TBase, nameAppend: string) { function ChargeMove<TBase extends SubMove>(Base: TBase, nameAppend: string) {
return class extends Base { return class extends Base {
@ -1063,7 +1069,7 @@ function ChargeMove<TBase extends SubMove>(Base: TBase, nameAppend: string) {
override is<K extends keyof MoveClassMap>(moveKind: K): this is MoveClassMap[K] { override is<K extends keyof MoveClassMap>(moveKind: K): this is MoveClassMap[K] {
// Anything subclassing this is a charge move. // Anything subclassing this is a charge move.
return moveKind === "ChargeMove" || moveKind === nameAppend; return moveKind === "ChargeMove" || moveKind === nameAppend || super.is(moveKind);
} }
/** /**