Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-09 04:23:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when using Gen 1 Amnesia Psyduck/Golduck

Browse Source
This commit is contained in:
Guangcong Luo 2013-05-01 16:37:13 -07:00
parent f64226138e
commit 7ec8044b9c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/gen1/learnsets.js
View File

@ -53,7 +53,7 @@ exports.BattleLearnsets = {
dugtrio:{learnset:{bide:["1M"],bodyslam:["1M"],cut:["1M"],dig:["1L1","1L19","1M"],doubleedge:["1M"],doubleteam:["1M"],earthquake:["1L47","1M"],fissure:["1M"],growl:["1L1","1L15"],hyperbeam:["1M"],mimic:["1M"],rage:["1M"],rest:["1M"],rockslide:["1M"],sandattack:["1L19","1M"],scratch:["1L1"],substitute:["1M"],takedown:["1M"],toxic:["1M"]}},
meowth:{learnset:{bide:["1M"],bite:["1L12"],bodyslam:["1M"],bubblebeam:["1M"],doubleedge:["1M"],doubleteam:["1M"],furyswipes:["1L33"],growl:["1L1"],mimic:["1M"],payday:["1L17","1M"],rage:["1M"],rest:["1M"],scratch:["1L1"],screech:["1L24"],skullbash:["1M"],slash:["1L44"],substitute:["1M"],swift:["1M"],takedown:["1M"],thunder:["1M"],thunderbolt:["1M"],watergun:["1M"],toxic:["1M"]}},
persian:{learnset:{bide:["1M"],bite:["1L1","1L12"],bodyslam:["1M"],bubblebeam:["1M"],doubleedge:["1M"],doubleteam:["1M"],furyswipes:["1L37"],growl:["1L1"],hyperbeam:["1L24"],mimic:["1M"],payday:["1L17","1M"],rage:["1M"],rest:["1M"],scratch:["1L1"],screech:["1L1","1L24"],skullbash:["1M"],slash:["1L51"],substitute:["1M"],swift:["1M"],takedown:["1L17","1M"],thunder:["1M"],toxic:["1L1"],watergun:["1L1"],thunderbolt:["1L44"]}},
psyduck:{learnset:{amnesia:["1E"],bide:["1M"],blizzard:["1M"],bodyslam:["1M"],bubblebeam:["1M"],confusion:["1L36"],counter:["1M"],disable:["1L31"],doubleedge:["1M"],doubleteam:["1M"],furyswipes:["1L43"],hydropump:["1L52"],icebeam:["1M"],megakick:["1M"],megapunch:["1M"],mimic:["1M"],payday:["1M"],rage:["1M"],rest:["1M"],scratch:["1L1"],seismictoss:["1M"],strength:["1M"],submission:["1M"],substitute:["1M"],surf:["1M"],swift:["1M"],tailwhip:["1L28"],takedown:["1M"],skullbash:["1M"]}},
psyduck:{learnset:{amnesia:["1S"],bide:["1M"],blizzard:["1M"],bodyslam:["1M"],bubblebeam:["1M"],confusion:["1L36"],counter:["1M"],disable:["1L31"],doubleedge:["1M"],doubleteam:["1M"],furyswipes:["1L43"],hydropump:["1L52"],icebeam:["1M"],megakick:["1M"],megapunch:["1M"],mimic:["1M"],payday:["1M"],rage:["1M"],rest:["1M"],scratch:["1L1"],seismictoss:["1M"],strength:["1M"],submission:["1M"],substitute:["1M"],surf:["1M"],swift:["1M"],tailwhip:["1L28"],takedown:["1M"],skullbash:["1M"]}},
golduck:{learnset:{bide:["1M"],blizzard:["1M"],bodyslam:["1M"],bubblebeam:["1M"],confusion:["1L39"],counter:["1M"],dig:["1M"],disable:["1L1","1L31"],doubleedge:["1M"],doubleteam:["1M"],furyswipes:["1L48"],hydropump:["1L59"],hyperbeam:["1M"],icebeam:["1M"],megakick:["1M"],megapunch:["1M"],mimic:["1M"],payday:["1M"],rage:["1M"],rest:["1M"],scratch:["1L1"],skullbash:["1M"],strength:["1M"],submission:["1M"],substitute:["1M"],surf:["1M"],swift:["1M"],tailwhip:["1L1","1L28"],seismictoss:["1M"]}},
mankey:{learnset:{bide:["1M"],bodyslam:["1M"],counter:["1M"],dig:["1M"],doubleedge:["1M"],doubleteam:["1M"],focusenergy:["1L27"],furyswipes:["1L21"],karatechop:["1L15"],leer:["1L1","1L31"],lowkick:["1L9"],megakick:["1M"],megapunch:["1M"],metronome:["1M"],mimic:["1M"],payday:["1M"],rage:["1M"],rest:["1M"],rockslide:["1M"],scratch:["1L1","1L31"],screech:["1L45"],skullbash:["1M"],strength:["1M"],submission:["1M"],substitute:["1M"],swift:["1M"],takedown:["1M"],thrash:["1L39"],seismictoss:["1L33","1M"],thunder:["1M"],thunderbolt:["1M"],toxic:["1M"]}},
primeape:{learnset:{scratch:["1L1"],leer:["1L1"],lowkick:["1L1","1L9"],karatechop:["1L1","1L15"],furyswipes:["1L21"],focusenergy:["1L27"],rage:["1L28","1M"],seismictoss:["1L37","1M"],screech:["1L45"],thrash:["1L46"],megapunch:["1M"],megakick:["1M"],toxic:["1M"],bodyslam:["1M"],takedown:["1M"],doubleedge:["1M"],hyperbeam:["1M"],payday:["1M"],submission:["1M"],counter:["1M"],thunderbolt:["1M"],dig:["1M"],mimic:["1M"],doubleteam:["1M"],bide:["1M"],metronome:["1M"],swift:["1M"],skullbash:["1M"],thunder:["1M"],rest:["1M"],rockslide:["1M"],substitute:["1M"],strength:["1M"]}},

1
tools.js
View File

@ -490,6 +490,7 @@ module.exports = (function () {
if (learned.substr(1,1) === 'E') {
// it's an egg move, so we add each pokemon that can be bred with to its sources
var eggGroups = template.eggGroups;
if (!eggGroups) continue;
if (eggGroups[0] === 'No Eggs') eggGroups = this.getTemplate(template.evos[0]).eggGroups;
var atLeastOne = false;
var fromSelf = (learned.substr(1) === 'Eany');