From dfd0eb99330db59ecb145e6a6fda977f87b9e969 Mon Sep 17 00:00:00 2001 From: Slayer95 Date: Thu, 26 Jun 2014 12:58:54 -0500 Subject: [PATCH] NEXT: Fix Genesect --- mods/gennext/abilities.js | 2 +- mods/gennext/items.js | 32 -------------------------------- mods/gennext/pokedex.js | 8 ++++---- 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/mods/gennext/abilities.js b/mods/gennext/abilities.js index 6336c0c186..6bb806c103 100644 --- a/mods/gennext/abilities.js +++ b/mods/gennext/abilities.js @@ -288,7 +288,7 @@ exports.BattleAbilities = { "download": { inherit: true, onStart: function (pokemon) { - if (pokemon.template.id === 'genesect') { + if (pokemon.template.baseSpecies === 'Genesect') { if (!pokemon.getItem().onDrive) return; } var foeactive = pokemon.side.foe.active; diff --git a/mods/gennext/items.js b/mods/gennext/items.js index 0c1a294bb6..da81ed12fb 100644 --- a/mods/gennext/items.js +++ b/mods/gennext/items.js @@ -6,14 +6,6 @@ exports.BattleItems = { fling: { basePower: 70 }, - onStart: function (pokemon) { - if (pokemon.species === 'Genesect') { - this.add('-item', pokemon, 'Burn Drive'); - if (pokemon.formeChange('Genesect-Burn')) { - this.add('-formechange', pokemon, 'Genesect-Burn'); - } - } - }, onBasePower: function (basePower, user, target, move) { }, onDrive: 'Fire', @@ -26,14 +18,6 @@ exports.BattleItems = { fling: { basePower: 70 }, - onStart: function (pokemon) { - if (pokemon.species === 'Genesect') { - this.add('-item', pokemon, 'Chill Drive'); - if (pokemon.formeChange('Genesect-Chill')) { - this.add('-formechange', pokemon, 'Genesect-Chill'); - } - } - }, onBasePower: function (basePower, user, target, move) { }, onDrive: 'Ice', @@ -46,14 +30,6 @@ exports.BattleItems = { fling: { basePower: 70 }, - onStart: function (pokemon) { - if (pokemon.species === 'Genesect') { - this.add('-item', pokemon, 'Douse Drive'); - if (pokemon.formeChange('Genesect-Douse')) { - this.add('-formechange', pokemon, 'Genesect-Douse'); - } - } - }, onBasePower: function (basePower, user, target, move) { }, onDrive: 'Water', @@ -66,14 +42,6 @@ exports.BattleItems = { fling: { basePower: 70 }, - onStart: function (pokemon) { - if (pokemon.species === 'Genesect') { - this.add('-item', pokemon, 'Shock Drive'); - if (pokemon.formeChange('Genesect-Shock')) { - this.add('-formechange', pokemon, 'Genesect-Shock'); - } - } - }, onBasePower: function (basePower, user, target, move) { }, onDrive: 'Electric', diff --git a/mods/gennext/pokedex.js b/mods/gennext/pokedex.js index 001d70fc7f..50fe91dd1f 100644 --- a/mods/gennext/pokedex.js +++ b/mods/gennext/pokedex.js @@ -1,6 +1,6 @@ exports.BattlePokedex = { -genesectdouse:{num:649,species:"Genesect-Douse",basespecies:"Genesect",forme:"Douse",formeletter:"D",types:["Bug","Water"],gender:"N",baseStats:{hp:71,atk:120,def:95,spa:120,spd:95,spe:99},abilities:{0:"Download"},heightm:1.5,weightkg:82.5,color:"Purple",eggGroups:["No Eggs"]}, -genesectshock:{num:649,species:"Genesect-Shock",basespecies:"Genesect",forme:"Shock",formeletter:"D",types:["Bug","Electric"],gender:"N",baseStats:{hp:71,atk:120,def:95,spa:120,spd:95,spe:99},abilities:{0:"Download"},heightm:1.5,weightkg:82.5,color:"Purple",eggGroups:["No Eggs"]}, -genesectburn:{num:649,species:"Genesect-Burn",basespecies:"Genesect",forme:"Burn",formeletter:"D",types:["Bug","Fire"],gender:"N",baseStats:{hp:71,atk:120,def:95,spa:120,spd:95,spe:99},abilities:{0:"Download"},heightm:1.5,weightkg:82.5,color:"Purple",eggGroups:["No Eggs"]}, -genesectchill:{num:649,species:"Genesect-Chill",basespecies:"Genesect",forme:"Chill",formeletter:"D",types:["Bug","Ice"],gender:"N",baseStats:{hp:71,atk:120,def:95,spa:120,spd:95,spe:99},abilities:{0:"Download"},heightm:1.5,weightkg:82.5,color:"Purple",eggGroups:["No Eggs"]} +genesectdouse:{num:649,species:"Genesect-Douse",baseSpecies:"Genesect",forme:"Douse",formeLetter:"D",types:["Bug","Water"],gender:"N",baseStats:{hp:71,atk:120,def:95,spa:120,spd:95,spe:99},abilities:{0:"Download"},heightm:1.5,weightkg:82.5,color:"Purple",eggGroups:["No Eggs"]}, +genesectshock:{num:649,species:"Genesect-Shock",baseSpecies:"Genesect",forme:"Shock",formeLetter:"S",types:["Bug","Electric"],gender:"N",baseStats:{hp:71,atk:120,def:95,spa:120,spd:95,spe:99},abilities:{0:"Download"},heightm:1.5,weightkg:82.5,color:"Purple",eggGroups:["No Eggs"]}, +genesectburn:{num:649,species:"Genesect-Burn",baseSpecies:"Genesect",forme:"Burn",formeLetter:"B",types:["Bug","Fire"],gender:"N",baseStats:{hp:71,atk:120,def:95,spa:120,spd:95,spe:99},abilities:{0:"Download"},heightm:1.5,weightkg:82.5,color:"Purple",eggGroups:["No Eggs"]}, +genesectchill:{num:649,species:"Genesect-Chill",baseSpecies:"Genesect",forme:"Chill",formeLetter:"C",types:["Bug","Ice"],gender:"N",baseStats:{hp:71,atk:120,def:95,spa:120,spd:95,spe:99},abilities:{0:"Download"},heightm:1.5,weightkg:82.5,color:"Purple",eggGroups:["No Eggs"]} };