Allow PP Ups to be edited

data/moves.ts

@@ -20893,7 +20893,6 @@ export const Moves: import('../sim/dex-moves').MoveDataTable = {
 		isNonstandard: "Past",
 		name: "Trump Card",
 		pp: 5,
-		noPPBoosts: true,
 		priority: 0,
 		flags: { contact: 1, protect: 1, mirror: 1, metronome: 1 },
 		secondary: null,

sim/TEAMS.md

@@ -170,7 +170,7 @@ Armaldo||leftovers|swiftswim|xscissor,stoneedge,aquatail,rapidspin|Adamant|128,2
 The format is a list of pokemon delimited by `]`, where every Pokémon is:
 
 ```
-NICKNAME|SPECIES|ITEM|ABILITY|MOVES|NATURE|EVS|GENDER|IVS|SHINY|LEVEL|HAPPINESS,POKEBALL,HIDDENPOWERTYPE,GIGANTAMAX,DYNAMAXLEVEL,TERATYPE
+NICKNAME|SPECIES|ITEM|ABILITY|MOVES;PPUPS|NATURE|EVS|GENDER|IVS|SHINY|LEVEL|HAPPINESS,POKEBALL,HIDDENPOWERTYPE,GIGANTAMAX,DYNAMAXLEVEL,TERATYPE
 ```
 
 - `SPECIES` is left blank if it's identical to `NICKNAME`
@@ -180,6 +180,9 @@ NICKNAME|SPECIES|ITEM|ABILITY|MOVES|NATURE|EVS|GENDER|IVS|SHINY|LEVEL|HAPPINESS,
 
 - `MOVES` is a comma-separated list of move IDs.
 
+- `PPUPS` correspond to the moves as specified in `MOVES`. A blank value is for
+  3 PP Ups, and if all values are blank, the semicolon and commas can be removed.
+
 - `NATURE` left blank means Serious, except in Gen 1-2, where it means no Nature.
 
 - `EVS` and `IVS` are comma-separated in standard order:

sim/pokemon.ts

@@ -346,8 +346,11 @@ export class Pokemon {
 				if (!set.hpType) set.hpType = move.type;
 				move = this.battle.dex.moves.get('hiddenpower');
 			}
-			let basepp = move.noPPBoosts ? move.pp : move.pp * 8 / 5;
-			if (this.battle.gen < 3) basepp = Math.min(61, basepp);
+			const defaultPPUps = move.id === 'trumpcard' ? 0 : 3;
+			let PPUps = this.set.movePPUps ? this.set.movePPUps[this.set.moves.indexOf(moveid)] : defaultPPUps;
+			PPUps = this.battle.clampIntRange(PPUps, 0, 3);
+			let basepp = move.noPPBoosts ? move.pp : move.pp * (5 + PPUps) / 5;
+			if (this.battle.gen < 3 && move.pp === 40) basepp -= PPUps;
 			this.baseMoveSlots.push({
 				move: move.name,
 				id: move.id,

sim/teams.ts

@@ -38,6 +38,7 @@ export interface PokemonSet {
 	 * These should always be converted to ids before use.
 	 */
 	moves: string[];
+	movePPUps?: number[];
 	/**
 	 * This can be an id, e.g. "adamant" or a full name, e.g. "Adamant".
 	 * This should always be converted to an id before use.
@@ -135,8 +136,19 @@ export const Teams = new class Teams {
 			// ability
 			buf += `|${this.packName(set.ability)}`;
 
-			// moves
-			buf += '|' + set.moves.map(this.packName).join(',');
+			// moves and PP Ups
+			let moves = '|';
+			let PPUps = '';
+			for (let i = 0; i < set.moves.length; i++) {
+				moves += (i ? ',' : '') + this.packName(set.moves[i]);
+				PPUps += (i ? ',' : ';');
+				const defaultPPUps = toID(set.moves[i]) === 'trumpcard' ? 0 : 3;
+				if ((set.movePPUps?.[i] ?? defaultPPUps) !== defaultPPUps) {
+					PPUps += set.movePPUps![i].toString();
+				}
+			}
+			if (PPUps.length === set.moves.length) PPUps = '';
+			buf += moves + PPUps;
 
 			// nature
 			buf += `|${set.nature || ''}`;
@@ -220,6 +232,7 @@ export const Teams = new class Teams {
 		const team = [];
 		let i = 0;
 		let j = 0;
+		let k = 0;
 
 		// limit to 24
 		for (let count = 0; count < 24; count++) {
@@ -255,11 +268,30 @@ export const Teams = new class Teams {
 			i = j + 1;
 
 			// moves
-			j = buf.indexOf('|', i);
-			if (j < 0) return null;
+			j = buf.indexOf(';', i);
+			k = buf.indexOf('|', i);
+			if (j < 0 || j > k) {
+				j = k;
+				if (j < 0) return null;
+			}
 			set.moves = buf.substring(i, j).split(',', 24).map(name => this.unpackName(name, Dex.moves));
 			i = j + 1;
 
+			// move PP ups
+			if (buf.charAt(j) === ';') {
+				j = buf.indexOf('|', i);
+				if (j < 0) return null;
+				const PPUps = buf.substring(i, j).split(',', 24);
+				for (let index = 0; index < set.moves.length; index++) {
+					const defaultPPUps = toID(set.moves[index]) === 'trumpcard' ? 0 : 3;
+					if (!set.movePPUps) set.movePPUps = [];
+					set.movePPUps.push(PPUps[index] ? parseInt(PPUps[index]) : defaultPPUps);
+				}
+				i = j + 1;
+			} else {
+				set.movePPUps = set.moves.map(move => toID(move) === 'trumpcard' ? 0 : 3);
+			}
+
 			// nature
 			j = buf.indexOf('|', i);
 			if (j < 0) return null;
@@ -436,11 +468,17 @@ export const Teams = new class Teams {
 		}
 
 		// moves
-		for (let move of set.moves) {
+		for (let i = 0; i < set.moves.length; i++) {
+			let move = set.moves[i];
+			let PPUps = ``;
 			if (move.startsWith(`Hidden Power `) && move.charAt(13) !== '[') {
 				move = `Hidden Power [${move.slice(13)}]`;
 			}
-			out += `- ${move}  \n`;
+			const defaultPPUps = toID(move) === 'trumpcard' ? 0 : 3;
+			if ((set.movePPUps?.[i] ?? defaultPPUps) !== defaultPPUps) {
+				PPUps = ` (PP Ups: ${set.movePPUps![i]})`;
+			}
+			out += `- ${move}${PPUps}  \n`;
 		}
 
 		return out;
@@ -526,9 +564,10 @@ export const Teams = new class Teams {
 			if (line !== 'undefined') set.nature = aggressive ? toID(line) : line;
 		} else if (line.startsWith('-') || line.startsWith('~')) {
 			line = line.slice(line.charAt(1) === ' ' ? 2 : 1);
-			if (line.startsWith('Hidden Power [')) {
-				const hpType = line.slice(14, -1);
-				line = 'Hidden Power ' + hpType;
+			let [move, PPUps] = line.split(' (PP Ups: ');
+			if (move.startsWith('Hidden Power [')) {
+				const hpType = move.slice(14, -1);
+				move = 'Hidden Power ' + hpType;
 				if (!set.ivs && Dex.types.isName(hpType)) {
 					set.ivs = { hp: 31, atk: 31, def: 31, spa: 31, spd: 31, spe: 31 };
 					const hpIVs = Dex.types.get(hpType).HPivs || {};
@@ -537,10 +576,13 @@ export const Teams = new class Teams {
 					}
 				}
 			}
-			if (line === 'Frustration' && set.happiness === undefined) {
+			if (!set.movePPUps) set.movePPUps = [];
+			const defaultPPUps = toID(move) === 'trumpcard' ? 0 : 3;
+			set.movePPUps.push(parseInt(PPUps?.charAt(0)) ?? defaultPPUps);
+			if (move === 'Frustration' && set.happiness === undefined) {
 				set.happiness = 0;
 			}
-			set.moves.push(line);
+			set.moves.push(move);
 		}
 	}
 	/** Accepts a team in any format (JSON, packed, or exported) */

test/sim/moves/trumpcard.js

@@ -12,7 +12,7 @@ describe('Trump Card', () => {
 
 	it('should power-up the less PP the move has', () => {
 		battle = common.createBattle([
-			[{ species: 'Eevee', ability: 'runaway', moves: ['trumpcard'] }],
+			[{ species: 'Eevee', ability: 'runaway', moves: ['trumpcard'], movePPUps: [0] }],
 			[{ species: 'Lugia', ability: 'multiscale', moves: ['recover'] }],
 		]);
 
@@ -54,7 +54,7 @@ describe('Trump Card', () => {
 
 	it('should work if called via Custap Berry in Gen 4', () => {
 		battle = common.gen(4).createBattle([
-			[{ species: 'Eevee', level: 1, ability: 'runaway', item: 'custapberry', moves: ['trumpcard'] }],
+			[{ species: 'Eevee', level: 1, ability: 'runaway', item: 'custapberry', moves: ['trumpcard'], movePPUps: [0] }],
 			[{ species: 'Scizor', ability: 'technician', moves: ['falseswipe'] }],
 		]);