Fix interaction of Me First and Assault Vest

smogon · Jan 10, 2024 · 4e15b26 · 4e15b26 · DaWoblefet · Jan 10, 2024
1 parent 1439452
commit 4e15b26
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/data/items.ts b/data/items.ts
@@ -324,7 +324,8 @@ export const Items: {[itemid: string]: ItemData} = {
 		},
 		onDisableMove(pokemon) {
 			for (const moveSlot of pokemon.moveSlots) {
-				if (this.dex.moves.get(moveSlot.move).category === 'Status') {
+				const move = this.dex.moves.get(moveSlot.id);
+				if (move.category === 'Status' && move.id !== 'mefirst') {
 					pokemon.disableMove(moveSlot.id);
 				}
 			}

diff --git a/test/sim/moves/mefirst.js b/test/sim/moves/mefirst.js
@@ -10,7 +10,19 @@ describe(`Me First`, function () {
 		battle.destroy();
 	});
 
-	it(`Me First should fail to copy recharge turns from moves like Hyper Beam`, function () {
+	it(`should be selectable even if the user is Taunted or holds Assault Vest`, function () {
+		battle = common.gen(7).createBattle([[
+			{species: 'corphish', moves: ['sleeptalk']},
+			{species: 'aerodactyl', item: 'assaultvest', moves: ['mefirst']},
+		], [
+			{species: 'wynaut', moves: ['taunt', 'watergun']},
+		]]);
+		battle.makeChoices('switch 2', 'move taunt');
+		battle.makeChoices('move mefirst', 'move watergun');
+		assert.false.fullHP(battle.p2.active[0]);
+	});
+
+	it(`should not copy recharge turns from moves like Hyper Beam`, function () {
 		battle = common.gen(7).createBattle([[
 			{species: 'aerodactyl', moves: ['sleeptalk', 'mefirst']},
 		], [