instead of move make it its own action

HisuianZoroark · HisuianZoroark · commit 523159002d75 · 2025-03-06T20:57:52.000-05:00
diff --git a/play.pokemonshowdown.com/js/client-battle.js b/play.pokemonshowdown.com/js/client-battle.js
@@ -1064,6 +1064,9 @@
 					case 'shift':
 						buf += myPokemon[i].speciesForme + ' will shift position.<br />';
 						break;
+					case 'fight':
+						buf += myPokemon[i].speciesForme + ' is locked into a move.<br />';
+						break;
 					}
 				}
 			}
@@ -1305,7 +1308,7 @@
 			this.tooltips.hideTooltip();
 
 			// TODO?: change this action
-			this.choice.choices.push('move fight');
+			this.choice.choices.push('fight');
 			this.endChoice();
 		},
 		chooseShift: function () {

Original file line number	Diff line number	Diff line change
`@@ -1064,6 +1064,9 @@`
`1064`	`1064`	`case 'shift':`
`1065`	`1065`	`buf += myPokemon[i].speciesForme + ' will shift position.<br />';`
`1066`	`1066`	`break;`
	`1067`	`+ case 'fight':`
	`1068`	`+ buf += myPokemon[i].speciesForme + ' is locked into a move.<br />';`
	`1069`	`+ break;`
`1067`	`1070`	`}`
`1068`	`1071`	`}`
`1069`	`1072`	`}`
`@@ -1305,7 +1308,7 @@`
`1305`	`1308`	`this.tooltips.hideTooltip();`
`1306`	`1309`
`1307`	`1310`	`// TODO?: change this action`
`1308`		`- this.choice.choices.push('move fight');`
	`1311`	`+ this.choice.choices.push('fight');`
`1309`	`1312`	`this.endChoice();`
`1310`	`1313`	`},`
`1311`	`1314`	`chooseShift: function () {`