Merge branch 'instruct' of https://github.com/Bertie690/pokerogue into instruct

This commit is contained in:
Bertie690 2025-01-17 00:02:51 -05:00
commit d86ce5403e
4 changed files with 11 additions and 11 deletions

View File

@ -1380,9 +1380,10 @@ export class UserHpDamageAttr extends FixedDamageAttr {
} }
export class TargetHalfHpDamageAttr extends FixedDamageAttr { export class TargetHalfHpDamageAttr extends FixedDamageAttr {
/** the initial amount of hp the target had before the first hit; /**
used for multi lens hp cutting * The initial amount of hp the target had before the first hit.
*/ * Used for calculating multi lens damage.
*/
private initialHp: number; private initialHp: number;
constructor() { constructor() {
super(0); super(0);

View File

@ -1108,9 +1108,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return this.getStat(Stat.HP); return this.getStat(Stat.HP);
} }
/** /** Returns the amount of hp currently missing from this {@linkcode Pokemon} (max - current) */
Returns the amount of hp currently missing from this {@linkcode Pokemon} (max - current)
*/
getInverseHp(): integer { getInverseHp(): integer {
return this.getMaxHp() - this.hp; return this.getMaxHp() - this.hp;
} }

View File

@ -75,7 +75,7 @@ export class MoveHelper extends GameManagerHelper {
} }
/** /**
* Changes a pokemon's moveset to the given move(s). * Changes a pokemon's moveset to the given move(s).
* Used when the normal moveset override can't be used (such as when it's necessary to check or update properties of the moveset). * Used when the normal moveset override can't be used (such as when it's necessary to check or update properties of the moveset).
* @param pokemon - The {@linkcode Pokemon} being modified * @param pokemon - The {@linkcode Pokemon} being modified
* @param moveset - The {@linkcode Moves} (single or array) to change the Pokemon's moveset to * @param moveset - The {@linkcode Moves} (single or array) to change the Pokemon's moveset to

View File

@ -277,10 +277,11 @@ export default class UI extends Phaser.GameObjects.Container {
return true; return true;
} }
/** Process a player input of a button (delivering it to the current UI handler for processing) /**
* @param button The {@linkcode Button} being inputted * Process a player input of a button (delivering it to the current UI handler for processing)
* @returns true if the input attempt succeeds * @param button The {@linkcode Button} being inputted
*/ * @returns true if the input attempt succeeds
*/
processInput(button: Button): boolean { processInput(button: Button): boolean {
if (this.overlayActive) { if (this.overlayActive) {
return false; return false;