Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-14 08:20:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix Protean activation timing

Browse Source 
- The message for the move usage is now sent before Protean's activation.
- Protean is affected by Electrify and Ion Deluge.
- Protean activates after the move target is resolved.
This commit is contained in:
Slayer95 2014-07-10 15:02:19 -05:00
parent 4c8df32744
commit 6539521adc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/abilities.js
View File

@ -1988,12 +1988,11 @@ exports.BattleAbilities = {
"protean": {
desc: "Right before this Pokemon uses a move, it changes its type to match that move. Hidden Power is interpreted as its Hidden Power type, rather than Normal.",
shortDesc: "Right before this Pokemon uses a move, it changes its type to match that move.",
onBeforeMove: function (pokemon, target, move) {
if (!move || pokemon.volatiles.mustrecharge) return;
var moveType = (move.id === 'hiddenpower' ? pokemon.hpType : move.type);
if (pokemon.getTypes().join() !== moveType) {
if (!pokemon.setType(moveType)) return;
this.add('-start', pokemon, 'typechange', moveType, '[from] Protean');
onSourceTryPrimaryHit: function (target, source, move) {
if (!move || source.volatiles.mustrecharge) return;
if (source.getTypes().join() !== move.type) {
if (!source.setType(move.type)) return;
this.add('-start', source, 'typechange', move.type, '[from] Protean');
}
},
id: "protean",