Check sourceEffect instead of lastMove in Trump Card

This allows moving the .moveUsed() call after .useMove() when running moves Refs #4558
smogon · Apr 8, 2018 · cb6630e · cb6630e
1 parent 52746ac
commit cb6630e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/data/moves.js b/data/moves.js
@@ -18020,11 +18020,11 @@ let BattleMovedex = {
 		num: 376,
 		accuracy: true,
 		basePower: 0,
-		basePowerCallback: function (pokemon) {
-			// @ts-ignore
-			let move = pokemon.getMoveData(pokemon.lastMove.id); // Account for calling Trump Card via other moves
+		basePowerCallback: function (source, target, move) {
+			const callerMoveId = move.sourceEffect || move.id;
+			const moveSlot = source.getMoveData(callerMoveId);
 			// @ts-ignore
-			switch (move.pp) {
+			switch (moveSlot.pp) {
 			case 0:
 				return 200;
 			case 1:

diff --git a/mods/linked/moves.js b/mods/linked/moves.js
@@ -492,24 +492,6 @@ exports.BattleMovedex = {
 			},
 		},
 	},
-	trumpcard: {
-		inherit: true,
-		basePowerCallback: function (pokemon) {
-			let move = pokemon.getMoveData(pokemon.getLastMoveAbsolute()); // Account for calling Trump Card via other moves
-			switch (move.pp) {
-			case 0:
-				return 200;
-			case 1:
-				return 80;
-			case 2:
-				return 60;
-			case 3:
-				return 50;
-			default:
-				return 40;
-			}
-		},
-	},
 
 	/**
 	 * Moves that check `pokemon.moveThisTurn`