Allow PP Ups to be edited

play.pokemonshowdown.com/js/client-teambuilder.js

@@ -1374,10 +1374,10 @@
 			// moves
 			if (!set.moves) set.moves = [];
 			buf += '<div class="setcol setcol-moves"><div class="setcell"><label>Moves</label>';
-			buf += '<input type="text" name="move1" class="textbox chartinput" value="' + BattleLog.escapeHTML(set.moves[0]) + '" autocomplete="off" /></div>';
-			buf += '<div class="setcell"><input type="text" name="move2" class="textbox chartinput" value="' + BattleLog.escapeHTML(set.moves[1]) + '" autocomplete="off" /></div>';
-			buf += '<div class="setcell"><input type="text" name="move3" class="textbox chartinput" value="' + BattleLog.escapeHTML(set.moves[2]) + '" autocomplete="off" /></div>';
-			buf += '<div class="setcell"><input type="text" name="move4" class="textbox chartinput" value="' + BattleLog.escapeHTML(set.moves[3]) + '" autocomplete="off" /></div>';
+			for (var i = 0; i <= 3; i++) {
+				if (i > 0) buf += '<div class="setcell">';
+				buf += '<input type="text" name="move' + (i + 1) + '" class="textbox chartinput" value="' + BattleLog.escapeHTML(set.moves[i]) + '" autocomplete="off" /></div>';
+			}
 			buf += '</div>';
 
 			// stats
@@ -2926,6 +2926,19 @@
 				buf += '</div></div>';
 			}
 
+			for (var i = 0; i <= 3; i++) {
+				buf += '<div class="formrow"><label class="formlabel" title="Move ' + (i + 1) + ' PP Ups">Move ' + (i + 1) + ' PP Ups:</label><div>';
+				var defaultPPUps = toID(set.moves[i]) === 'trumpcard' ? 0 : 3;
+				var movePPUps = defaultPPUps;
+				if (set.movePPUps && !isNaN(set.movePPUps[i])) movePPUps = set.movePPUps[i];
+				buf += '<select name="move' + i + 'ppups" class="button">';
+				for (var j = 0; j <= 3; j++) {
+					buf += '<option value="' + j + '" ' + (movePPUps === j ? 'selected' : '') + '>' + j + '</option>';
+				}
+				buf += '</select>';
+				buf += '</div></div>';
+			}
+
 			buf += '</form>';
 			if (species.cosmeticFormes) {
 				buf += '<button class="altform button">Change sprite</button>';
@@ -3008,6 +3021,13 @@
 				delete set.teraType;
 			}
 
+			// PP Ups
+			for (var i = 0; i <= 3; i++) {
+				if (!set.movePPUps) set.movePPUps = [];
+				var PPUps = this.$chart.find('select[name=move' + i + 'ppups]').val();
+				set.movePPUps[i] = parseInt(PPUps);
+			}
+
 			// update details cell
 			var buf = '';
 			var GenderChart = {
@@ -3354,13 +3374,15 @@
 				this.unChooseMove(this.curSet.moves[0]);
 				this.curSet.moves[0] = val;
 				this.chooseMove(val);
+				this.setPPUps(val, 0);
 				if (selectNext) this.$('input[name=move2]').select();
 				break;
 			case 'move2':
 				if (!this.curSet.moves[0]) this.curSet.moves[0] = '';
 				this.unChooseMove(this.curSet.moves[1]);
 				this.curSet.moves[1] = val;
 				this.chooseMove(val);
+				this.setPPUps(val, 1);
 				if (selectNext) this.$('input[name=move3]').select();
 				break;
 			case 'move3':
@@ -3369,6 +3391,7 @@
 				this.unChooseMove(this.curSet.moves[2]);
 				this.curSet.moves[2] = val;
 				this.chooseMove(val);
+				this.setPPUps(val, 2);
 				if (selectNext) this.$('input[name=move4]').select();
 				break;
 			case 'move4':
@@ -3378,6 +3401,7 @@
 				this.unChooseMove(this.curSet.moves[3]);
 				this.curSet.moves[3] = val;
 				this.chooseMove(val);
+				this.setPPUps(val, 3);
 				if (selectNext) {
 					this.stats();
 					this.$('button.setstats').focus();
@@ -3571,6 +3595,15 @@
 			this.updateSetTop();
 			if (selectNext) this.$(set.item || !this.$('input[name=item]').length ? (this.$('input[name=ability]').length ? 'input[name=ability]' : 'input[name=move1]') : 'input[name=item]').select();
 		},
+		setPPUps: function (move, slot) {
+			var set = this.curSet;
+			if (!set.movePPUps) set.movePPUps = [];
+			if (toID(move) === 'trumpcard') {
+				set.movePPUps[slot] = 0;
+			} else {
+				set.movePPUps[slot] = 3;
+			}
+		},
 
 		/*********************************************************
 		 * Utility functions

play.pokemonshowdown.com/js/storage.js

@@ -802,14 +802,23 @@ Storage.packTeam = function (team) {
 		// ability
 		buf += '|' + toID(set.ability);
 
-		// moves
-		buf += '|';
+		// moves and PP Ups
+		var moves = '|';
+		var PPUps = '';
 		if (set.moves) for (var j = 0; j < set.moves.length; j++) {
 			var moveid = toID(set.moves[j]);
 			if (j && !moveid) continue;
-			buf += (j ? ',' : '') + moveid;
+			moves += (j ? ',' : '') + moveid;
 			if (moveid.substr(0, 11) === 'hiddenpower' && moveid.length > 11) hasHP = true;
+			PPUps += (j ? ',' : ';');
+			if (set.movePPUps) {
+				var defaultPPUps = toID(set.moves[j]) === 'trumpcard' ? 0 : 3;
+				var PPUp = isNaN(set.movePPUps[j]) ? defaultPPUps : set.movePPUps[j];
+				if (PPUp !== defaultPPUps) PPUps += set.movePPUps[j].toString();
+			}
 		}
+		if (PPUps.length === set.moves.length) PPUps = '';
+		buf += moves + PPUps;
 
 		// nature
 		buf += '|' + (set.nature || '');
@@ -882,7 +891,7 @@ Storage.fastUnpackTeam = function (buf) {
 	if (!buf) return [];
 
 	var team = [];
-	var i = 0, j = 0;
+	var i = 0, j = 0, k = 0;
 
 	while (true) {
 		var set = {};
@@ -912,10 +921,30 @@ Storage.fastUnpackTeam = function (buf) {
 		i = j + 1;
 
 		// moves
-		j = buf.indexOf('|', i);
+		j = buf.indexOf(';', i);
+		k = buf.indexOf('|', i);
+		if (j < 0 || j > k) j = k;
 		set.moves = buf.substring(i, j).split(',');
 		i = j + 1;
 
+		// move PP ups
+		if (buf.charAt(j) === ';') {
+			j = buf.indexOf('|', i);
+			if (j < 0) return null;
+			set.movePPUps = buf.substring(i, j).split(',');
+			for (var index = 0; index < set.movePPUps.length; index++) {
+				var defaultPPUps = toID(set.moves[index]) === 'trumpcard' ? 0 : 3;
+				set.movePPUps[index] = parseInt(set.movePPUps[index], 10);
+				if (isNaN(set.movePPUps[index])) set.movePPUps[index] = defaultPPUps;
+			}
+			i = j + 1;
+		} else {
+			set.movePPUps = [];
+			for (var index = 0; index < set.moves.length; index++) {
+				set.movePPUps[index] = toID(set.moves[index]) === 'trumpcard' ? 0 : 3;
+			}
+		}
+
 		// nature
 		j = buf.indexOf('|', i);
 		set.nature = buf.substring(i, j);
@@ -999,7 +1028,7 @@ Storage.unpackTeam = function (buf) {
 	if (!buf) return [];
 
 	var team = [];
-	var i = 0, j = 0;
+	var i = 0, j = 0, k = 0;
 
 	while (true) {
 		var set = {};
@@ -1028,12 +1057,35 @@ Storage.unpackTeam = function (buf) {
 		i = j + 1;
 
 		// moves
-		j = buf.indexOf('|', i);
+		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(',').map(function (moveid) {
 			return Dex.moves.get(moveid).name;
 		});
 		i = j + 1;
 
+		// move PP ups
+		if (buf.charAt(j) === ';') {
+			j = buf.indexOf('|', i);
+			if (j < 0) return null;
+			set.movePPUps = buf.substring(i, j).split(',');
+			for (var index = 0; index < set.movePPUps.length; index++) {
+				var defaultPPUps = toID(set.moves[index]) === 'trumpcard' ? 0 : 3;
+				set.movePPUps[index] = parseInt(set.movePPUps[index], 10);
+				if (isNaN(set.movePPUps[index])) set.movePPUps[index] = defaultPPUps;
+			}
+			i = j + 1;
+		} else {
+			set.movePPUps = [];
+			for (var index = 0; index < set.moves.length; index++) {
+				set.movePPUps[index] = toID(set.moves[index]) === 'trumpcard' ? 0 : 3;
+			}
+		}
+
 		// nature
 		j = buf.indexOf('|', i);
 		set.nature = buf.substring(i, j);
@@ -1343,7 +1395,16 @@ Storage.importTeam = function (buffer, teams) {
 			if (line === 'Frustration' && curSet.happiness === undefined) {
 				curSet.happiness = 0;
 			}
-			curSet.moves.push(line);
+			var moveAndPPUps = line.split(' (PP Ups: ', 2);
+			curSet.moves.push(moveAndPPUps[0]);
+			if (!curSet.movePPUps) curSet.movePPUps = [];
+			if (moveAndPPUps[1]) moveAndPPUps[1] = moveAndPPUps[1].charAt(0);
+			var defaultPPUps = toID(moveAndPPUps[0]) === 'trumpcard' ? 0 : 3;
+			if (isNaN(moveAndPPUps[1])) {
+				curSet.movePPUps.push(defaultPPUps);
+			} else {
+				curSet.movePPUps.push(parseInt(moveAndPPUps[1], 10));
+			}
 		}
 	}
 	if (teams && teams.length && typeof teams[teams.length - 1].team !== 'string') {
@@ -1492,7 +1553,12 @@ Storage.exportTeam = function (team, gen, hidestats) {
 				move = move.substr(0, 13) + '[' + move.substr(13) + ']';
 			}
 			if (move) {
-				text += '- ' + move + "  \n";
+				text += '- ' + move;
+				var defaultPPUps = toID(move) === 'trumpcard' ? 0 : 3;
+				if (curSet.movePPUps && !isNaN(curSet.movePPUps[j]) && curSet.movePPUps[j] !== defaultPPUps) {
+					text += " (PP Ups: " + curSet.movePPUps[j] + ")";
+				}
+				text += "  \n";
 			}
 		}
 		text += "\n";

play.pokemonshowdown.com/src/battle-dex.ts

@@ -60,6 +60,8 @@ export declare namespace Dex {
 		/** Defaults to no ability (error in Gen 3+) */
 		ability?: string;
 		moves: string[];
+		/** Defaults to 3 */
+		movePPUps?: number[];
 		/** Defaults to no nature (error in Gen 3+) */
 		nature?: NatureName;
 		/** Defaults to random legal gender, NOT subject to gender ratios */

play.pokemonshowdown.com/src/panel-teamdropdown.tsx

@@ -33,18 +33,21 @@ export class PSTeambuilder {
 			id = toID(set.ability);
 			buf += `|${id || '-'}`;
 
-			// moves
-			buf += '|';
-			if (set.moves) {
-				for (let j = 0; j < set.moves.length; j++) {
-					let moveid = toID(set.moves[j]);
-					if (j && !moveid) continue;
-					buf += `${j ? ',' : ''}${moveid}`;
-					if (moveid.substr(0, 11) === 'hiddenpower' && moveid.length > 11) {
-						hasHP = moveid.slice(11);
-					}
+			// moves and PP Ups
+			let moves = '|';
+			let PPUps = '';
+			if (set.moves) for (let j = 0; j < set.moves.length; j++) {
+				const moveid = toID(set.moves[j]);
+				if (j && !moveid) continue;
+				moves += (j ? ',' : '') + moveid;
+				PPUps += (j ? ',' : ';');
+				const defaultPPUps = toID(set.moves[j]) === 'trumpcard' ? 0 : 3;
+				if (set.movePPUps && (set.movePPUps[j] ?? defaultPPUps) !== defaultPPUps) {
+					PPUps += set.movePPUps[j].toString();
 				}
 			}
+			if (PPUps.length === set.moves.length) PPUps = '';
+			buf += moves + PPUps;
 
 			// nature
 			buf += `|${set.nature || ''}`;
@@ -133,11 +136,21 @@ export class PSTeambuilder {
 					species.abilities[parts[3] as '0' || '0'] || (parts[3] === '' ? '' : '!!!ERROR!!!') :
 					Dex.abilities.get(parts[3]).name;
 
-			// moves
-			set.moves = parts[4].split(',').map(moveid =>
+			// moves and PP ups
+			const [moves, PPUps] = parts[4].split(';', 2);
+			set.moves = moves.split(',').map(moveid =>
 				Dex.moves.get(moveid).name
 			);
 
+			if (PPUps) {
+				const movePPUps = PPUps.split(',');
+				for (let i = 0; i < set.moves.length; i++) {
+					const defaultPPUps = toID(set.moves[i]) === 'trumpcard' ? 0 : 3;
+					if (!set.movePPUps) set.movePPUps = [];
+					set.movePPUps.push(movePPUps[i] ? parseInt(movePPUps[i]) : defaultPPUps);
+				}
+			}
+
 			// nature
 			set.nature = parts[5] as Dex.NatureName;
 			if (set.nature as any === 'undefined') set.nature = undefined;
@@ -217,14 +230,20 @@ export class PSTeambuilder {
 			text += `Ability: ${set.ability}  \n`;
 		}
 		if (set.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.substr(0, 13) === 'Hidden Power ') {
 					const hpType = move.slice(13);
 					move = move.slice(0, 13);
 					move = `${move}[${hpType}]`;
 				}
+				const defaultPPUps = toID(move) === 'trumpcard' ? 0 : 3;
+				if ((set.movePPUps?.[i] ?? defaultPPUps) !== defaultPPUps) {
+					PPUps = ` (PP Ups: ${set.movePPUps![i]})`;
+				}
 				if (move) {
-					text += `- ${move}  \n`;
+					text += `- ${move}${PPUps}  \n`;
 				}
 			}
 		}
@@ -388,9 +407,10 @@ export class PSTeambuilder {
 			if (line !== 'undefined') set.nature = line as Dex.NatureName;
 		} 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) as Dex.TypeName;
-				line = 'Hidden Power ' + hpType;
+			let [move, PPUps] = line.split(' (PP Ups: ');
+			if (move.startsWith('Hidden Power [')) {
+				const hpType = move.slice(14, -1) as Dex.TypeName;
+				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 || {};
@@ -399,6 +419,9 @@ export class PSTeambuilder {
 					}
 				}
 			}
+			if (!set.movePPUps) set.movePPUps = [];
+			const defaultPPUps = toID(move) === 'trumpcard' ? 0 : 3;
+			set.movePPUps.push(parseInt(PPUps?.charAt(0)) ?? defaultPPUps);
 			if (line === 'Frustration' && set.happiness === undefined) {
 				set.happiness = 0;
 			}

play.pokemonshowdown.com/style/client.css

@@ -2859,12 +2859,12 @@ a.ilink.yours {
 }
 
 .detailsform .formrow {
-	padding-left: 100px;
+	padding-left: 150px;
 }
 .detailsform .formrow .formlabel {
 	float: left;
-	margin-left: -100px;
-	width: 110px;
+	margin-left: -150px;
+	width: 165px;
 	text-align: right;
 }
 .changeform i {