diff --git a/config/formats.ts b/config/formats.ts index 6a3e86614a..9ed5940fb7 100644 --- a/config/formats.ts +++ b/config/formats.ts @@ -1318,9 +1318,10 @@ export const Formats: FormatList = [ ], mod: 'agoldenexperience', ruleset: ['Standard NatDex', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Dynamax Clause', 'Sleep Clause Mod', 'Data Mod', 'Mega Data Mod'], - banlist: ['Uber', 'Power Construct', 'Arceus', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darkrai', 'Deoxys-Attack', 'Deoxys-Speed', 'Dialga', 'Dialga-Origin', 'Eternatus', 'Flutter Mane', 'Gengarite', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', /*'Iron Bundle',*/ 'Koraidon', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Mewtwo-Mega-X', 'Mewtwo-Mega-Y', 'Miraidon', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Palkia-Origin', 'Parafgufa', 'Rayquaza', 'Reshiram', 'Salamencite', 'Solgaleo', 'Xerneas', 'Yveltal', 'Zacian', 'Zamazenta', 'Zekrom', 'Zygarde-Base', 'Berserk Gene', 'Eevee-Starter', 'Pikachu-Starter', 'Moody', + banlist: ['Uber', 'Power Construct', 'Berserk Gene', 'Eevee-Starter', 'Pikachu-Starter', 'Moody', 'Normalium Z', 'Fairium Z', 'Fightinium Z', 'Firium Z', 'Flyinium Z', 'Darkinium Z', 'Dragonium Z', 'Buginium Z', 'Waterium Z', 'Electrium Z', 'Ghostium Z', 'Grassium Z', 'Groundium Z', 'Icium Z', 'Poisonium Z', 'Psychium Z', 'Rockium Z', 'Steelium Z', 'Pikanium Z', 'Aloraichium Z', 'Eevium Z', 'Snorlium Z', 'Mewnium Z', 'Ultranecrozium Z', 'Pikashunium Z', 'Decidium Z', 'Incinium Z', 'Primarium Z', 'Lycanium Z', 'Mimikium Z', 'Kommonium Z', 'Tapunium Z', 'Solganium Z', 'Lunalium Z', 'Marshadium Z', - 'Bright Powder', 'Lax Incense', 'King\'s Rock', 'Razor Fang'], + 'Bright Powder', 'Lax Incense', 'King\'s Rock', 'Razor Fang', + 'Rusted Sword', 'Rusted Shield'], teambuilderFormat: 'National Dex', onChangeSet(set) { const item = this.toID(set.item); @@ -1416,10 +1417,11 @@ export const Formats: FormatList = [ ], mod: 'agoldenexperience', ruleset: ['Standard NatDex', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Dynamax Clause', 'Sleep Clause Mod', 'Data Mod', 'Mega Data Mod'], - banlist: ['Uber', 'OU', 'UUBL', 'Battle Bond', 'Power Construct', 'Arceus', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darkrai', 'Deoxys-Attack', 'Deoxys-Speed', 'Dialga', 'Dialga-Origin', 'Eternatus', 'Flutter Mane', 'Gengarite', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', /*'Iron Bundle',*/ 'Koraidon', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Mewtwo-Mega-X', 'Mewtwo-Mega-Y', 'Miraidon', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Palkia-Origin', 'Parafgufa', 'Rayquaza', 'Reshiram', 'Salamencite', 'Solgaleo', 'Xerneas', 'Yveltal', 'Zacian', 'Zamazenta', 'Zekrom', 'Zygarde-Base', 'Berserk Gene', 'Eevee-Starter', 'Pikachu-Starter', 'Moody', + banlist: ['Uber', 'OU', 'UUBL', 'Battle Bond', 'Power Construct', 'Berserk Gene', 'Eevee-Starter', 'Pikachu-Starter', 'Moody', 'Normalium Z', 'Fairium Z', 'Fightinium Z', 'Firium Z', 'Flyinium Z', 'Darkinium Z', 'Dragonium Z', 'Buginium Z', 'Waterium Z', 'Electrium Z', 'Ghostium Z', 'Grassium Z', 'Groundium Z', 'Icium Z', 'Poisonium Z', 'Psychium Z', 'Rockium Z', 'Steelium Z', 'Pikanium Z', 'Aloraichium Z', 'Eevium Z', 'Snorlium Z', 'Mewnium Z', 'Ultranecrozium Z', 'Pikashunium Z', 'Decidium Z', 'Incinium Z', 'Primarium Z', 'Lycanium Z', 'Mimikium Z', 'Kommonium Z', 'Tapunium Z', 'Solganium Z', 'Lunalium Z', 'Marshadium Z', 'Bright Powder', 'Lax Incense', 'King\'s Rock', 'Razor Fang', - 'Drizzle', 'Drought'], + 'Drizzle', 'Drought', 'Aerodactylite', 'Alakazite', 'Ampharosite', 'Audinite', 'Arbokinite', 'Baskironite', 'Blazikenite', 'Butterfrite', 'Cacturnite X', 'Centiskorchite X', 'Centiskorchite Y', 'Charizardite X', 'Charizardite Y', 'Dhelmite', 'Diancite', 'Flygonite', 'Froslassite', 'Galladite', 'Gardevoirite', 'Gengarite', 'Glalitite', 'Golisopodite', 'Gyaradosite', 'Houndoominite', 'Infarmatemite', 'Krookodite', 'Latiasite', 'Lopunnite', 'Lucarionite', 'Mawilite', 'Medichamite', 'Metagrossite', 'Ribombinite', 'Salamencite', 'Sceptilite', 'Scizorite', 'Swampertite', 'Terreptilite', 'Whiscashite', + 'Latiosite', 'Pidgeotite', 'Pinsirite', 'Sablenite', 'Darmanitan-Galar + Zen Mode'], teambuilderFormat: 'National Dex UU', onChangeSet(set) { const item = this.toID(set.item); @@ -1469,8 +1471,8 @@ export const Formats: FormatList = [ banlist: [ 'Calyrex-Shadow', 'Eternatus-Eternamax', 'Groudon-Primal', 'Rayquaza-Mega', 'Shedinja', 'Cramorant-Gorging', 'Arcane Mastery', 'Water Bubble', 'Huge Power', 'Illusion', 'Innards Out', 'Magnet Pull', 'Moody', 'Never Gonna Give You Up', 'Explosive', - 'Stakeout', 'Wonder Guard', 'Gengarite', 'Belly Drum', 'Chatter', 'Double Iron Bash', 'Electrify', 'Fishious Rend', 'Sappy Seed', - /*'Last Respects',*/ 'Octolock', /*'Revival Blessing', 'Shed Tail',*/ 'Shell Smash', 'Comatose + Sleep Talk', 'Imprison + Transform', + 'Protean', 'Stakeout', 'Wonder Guard', 'Belly Drum', 'Chatter', 'Double Iron Bash', 'Electrify', 'Fishious Rend', 'Sappy Seed', + 'Octolock', 'Shell Smash', 'Comatose + Sleep Talk', 'Imprison + Transform', 'Berserk Gene', 'Normalium Z', 'Fairium Z', 'Fightinium Z', 'Firium Z', 'Flyinium Z', 'Darkinium Z', 'Dragonium Z', 'Buginium Z', 'Waterium Z', 'Electrium Z', 'Ghostium Z', 'Grassium Z', 'Groundium Z', 'Icium Z', 'Poisonium Z', 'Psychium Z', 'Rockium Z', 'Steelium Z', 'Pikanium Z', 'Aloraichium Z', 'Eevium Z', 'Snorlium Z', 'Mewnium Z', 'Ultranecrozium Z', 'Pikashunium Z', 'Decidium Z', 'Incinium Z', 'Primarium Z', 'Lycanium Z', 'Mimikium Z', 'Kommonium Z', 'Tapunium Z', 'Solganium Z', 'Lunalium Z', 'Marshadium Z', 'Bright Powder', 'Lax Incense', 'King\'s Rock', 'Razor Fang' ], diff --git a/data/mods/agoldenexperience/abilities.ts b/data/mods/agoldenexperience/abilities.ts index 01a4e68cc4..5b53c45b30 100644 --- a/data/mods/agoldenexperience/abilities.ts +++ b/data/mods/agoldenexperience/abilities.ts @@ -1,9 +1,7 @@ import { consoleips } from "../../../config/config-example"; -// const bladeMoves = ['aerialace', 'airslash', 'aircutter', 'behemothblade', 'crosspoison', 'cut', 'falseswipe', 'furycutter', 'leafblade', 'nightslash', 'psychocut', 'razorshell', 'razorwind', 'sacredsword', 'secretsword', 'slash', 'xscissor', 'solarblade', 'ceaselessedge', 'sneakyassault', 'braveblade', 'bitterblade']; const kickMoves = ['jumpkick', 'highjumpkick', 'megakick', 'doublekick', 'blazekick', 'tropkick', 'lowkick', 'lowsweep', 'rollingkick', 'triplekick', 'stomp', 'highhorsepower', 'tripleaxel', 'stompingtantrum', 'thunderouskick', 'axekick']; const tailMoves = ['firelash', 'powerwhip', 'tailslap', 'wrap', 'constrict', 'irontail', 'dragontail', 'poisontail', 'aquatail', 'vinewhip', 'wringout',]; -// const windMoves = ['aircutter', 'blizzard', 'fairywind', 'gust', 'heatwave', 'hurricane', 'icywind', 'petalblizzard', 'sandstorm', 'tailwind', 'twister', 'whirlwind']; export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { poisonousradula: { @@ -160,24 +158,24 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { rating: 4.5, num: -7, }, - reflex: { - onFoeTryMove(target, source, move) { - const targetAllExceptions = ['perishsong', 'flowershield', 'rototiller']; - if (move.target === 'foeSide' || (move.target === 'all' && !targetAllExceptions.includes(move.id))) { - return; - } + // reflex: { //removed + // onFoeTryMove(target, source, move) { + // const targetAllExceptions = ['perishsong', 'flowershield', 'rototiller']; + // if (move.target === 'foeSide' || (move.target === 'all' && !targetAllExceptions.includes(move.id))) { + // return; + // } - const dazzlingHolder = this.effectData.target; - if ((source.side === dazzlingHolder.side || move.target === 'all') && move.priority > 0.1) { - this.attrLastMove('[still]'); - this.add('cant', dazzlingHolder, 'ability: Reflex', move, '[of] ' + target); - return false; - } - }, - name: "Reflex", - rating: 2.5, - num: -8, - }, + // const dazzlingHolder = this.effectData.target; + // if ((source.side === dazzlingHolder.side || move.target === 'all') && move.priority > 0.1) { + // this.attrLastMove('[still]'); + // this.add('cant', dazzlingHolder, 'ability: Reflex', move, '[of] ' + target); + // return false; + // } + // }, + // name: "Reflex", + // rating: 2.5, + // num: -8, + // }, perforating: { onModifyMovePriority: -5, onModifyMove(move) { @@ -316,7 +314,7 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { rating: 4, num: -16, },*/ - mistymountain: { + mistymountain: { onModifyTypePriority: -1, onModifyType(move, pokemon) { const noModifyType = [ @@ -362,7 +360,7 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { onSourceHit(target, source, move) { if (!move || !target) return; if (move.flags['dancer']) { - this.boost({spe: 1}, source); + this.boost({ spe: 1 }, source); } }, name: "Mad Dancer", @@ -983,7 +981,7 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { }, explosive: { desc: "This Pokémon does not suffer the drawbacks of recoil moves and sacrificial moves.", - shortDesc: "Ignores recoil and self-KO effects of that move.", + shortDesc: "Ignores recoil and self-KO effects of its moves.", onModifyMove(move) { if (move.recoil || move.mindBlownRecoil || (move.selfdestruct && move.selfdestruct === 'always')) { this.effectData.target.addVolatile('implode'); @@ -1361,6 +1359,19 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { rating: 2.5, num: -1160, }, + sleightofhand: { + desc: "This Pokémon's contact moves become special attacks and do not make contact with the target.", + shortDesc: "This Pokémon's contact moves become special and non-contact.", + onModifyMove(move) { + if (move.flags['contact']) { + if (move.category !== 'Special') move.category = 'Special'; + delete move.flags['contact']; + } + }, + name: "Sleight of Hand", + rating: 3, + num: -52, + }, newtonslaw: { onModifySpe(spe, pokemon) { if (this.field.getPseudoWeather('gravity')) { @@ -1552,7 +1563,7 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { onModifyDamage(damage, source, target, move) { if (target.getMoveHitData(move).crit) { this.debug('Old School boost'); - return this.chainModify(2/1.5); + return this.chainModify(2 / 1.5); } }, rating: 3.5, @@ -1760,8 +1771,8 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { num: 23, }, sandveil: { - desc: "If Sandstorm is active, this Pokemon's defence is multiplied by 1.3. This Pokemon takes no damage from Sandstorm.", - shortDesc: "If Sandstorm is active, this Pokemon's defence is 1.3x; immunity to Sandstorm.", + desc: "If Sandstorm is active, this Pokemon's defense is multiplied by 1.3. This Pokemon takes no damage from Sandstorm.", + shortDesc: "If Sandstorm is active, this Pokemon's defense is 1.3x; immunity to Sandstorm.", onImmunity(type, pokemon) { if (type === 'sandstorm') return false; }, @@ -1775,8 +1786,8 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { num: 146, }, snowcloak: { - desc: "If Hail is active, this Pokemon's defence is multiplied by 1.3. This Pokemon takes no damage from Hail.", - shortDesc: "If Hail is active, this Pokemon's defence is 1.3x; immunity to Hail.", + desc: "If Hail is active, this Pokemon's defense is multiplied by 1.3. This Pokemon takes no damage from Hail.", + shortDesc: "If Hail is active, this Pokemon's defense is 1.3x; immunity to Hail.", onImmunity(type, pokemon) { if (type === 'hail') return false; }, @@ -1907,41 +1918,36 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { pokemon.formeChange(forme, this.effect, false, '[msg]'); } }, - onModifyTypePriority: -1, - onModifyType(move, pokemon) { - const noModifyType = [ - 'judgment', 'multiattack', 'naturalgift', 'revelationdance', 'technoblast', 'terrainpulse', 'weatherball', - ]; - if (move.type === 'Normal' && !noModifyType.includes(move.id) && !(move.isZ && move.category !== 'Status')) { - switch (pokemon.effectiveWeather()) { - case 'sunnyday': - case 'desolateland': - move.type = 'Fire'; - move.forecastBoosted = true; - break; - case 'raindance': - case 'primordialsea': - move.type = 'Water'; - move.forecastBoosted = true; + onPrepareHit(source, target, move) { + if (move.hasBounced) return; + const type = move.type; + if (type) { + switch (type) { + case "Water": + this.field.setWeather('raindance'); + if (!source.setType(type)) return; + this.add('-start', source, 'typechange', type, '[from] ability: Forecast'); break; - case 'hail': - move.type = 'Ice'; - move.forecastBoosted = true; + case "Fire": + this.field.setWeather('sunnyday'); + if (!source.setType(type)) return; + this.add('-start', source, 'typechange', type, '[from] ability: Forecast'); break; - default: + case "Ice": + this.field.setWeather('hail'); + if (!source.setType(type)) return; + this.add('-start', source, 'typechange', type, '[from] ability: Forecast'); break; + } } }, - onBasePowerPriority: 23, - onBasePower(basePower, pokemon, target, move) { - if (move.forecastBoosted) return this.chainModify([0x1333, 0x1000]); - }, name: "Forecast", - shortDesc: "Castform's type and Normal type moves change to the current weather condition's type, except Sandstorm.", - rating: 2, + desc: "Castform's type changes to the current weather condition's type, except Sandstorm. Upon using a Water, Fire, or Ice move, this Pokemon changes to that type and sets the corresponding weather.", + shortDesc: "Changes type, form and weather when using Water/Fire/Ice moves.", + rating: 4, num: 59, - }, + }, mimicry: { onStart(pokemon) { if (this.field.terrain) { @@ -2554,6 +2560,76 @@ export const Abilities: { [abilityid: string]: ModdedAbilityData; } = { rating: 3, num: -46, }, + icescales: { + onSourceModifyDamage(damage, source, target, move) { + if (move.category === 'Special' || move.typeMod > 0) { + return this.chainModify(0.5); + } + }, + name: "Ice Scales", + shortDesc: "This Pokemon receives 1/2 damage from special attacks, as well as super effective attacks.", + desc: "This Pokemon receives 1/2 damage from special attacks, as well as super effective attacks.", + rating: 4, + num: 246, + }, + strongwill: { + onSourceModifyDamage(damage, source, target, move) { + if (move.category === 'Special') { + return this.chainModify(0.5); + } + }, + name: "Strong Will", + shortDesc: "This Pokemon receives 1/2 damage from special attacks.", + desc: "This Pokemon receives 1/2 damage from special attacks.", + rating: 4, + num: -1246, + }, + smartguard: { + desc: "On switch-in, this Pokémon's Defense or Special Defense is raised by 1 stage based on the weaker combined attacking stat of all opposing Pokémon. Special Defense is raised if their Special Attack is higher, and Defense is raised if their Attack is the same or higher.", + shortDesc: "On switch-in, Defense or Sp. Def is raised 1 stage based on the foes' weaker Attack.", + onStart(pokemon) { + let totalatk = 0; + let totalspa = 0; + for (const target of pokemon.side.foe.active) { + if (!target || target.fainted) continue; + totalatk += target.getStat('atk', false, true); + totalspa += target.getStat('spa', false, true); + } + if (totalatk && totalatk >= totalspa) { + this.boost({def: 1}); + } else if (totalspa) { + this.boost({spd: 1}); + } + }, + name: "Smart Guard", + rating: 4, + num: -35, + }, + dodge: { //tmp + shortDesc: "This Pokemon uses its Speed in damage calculation.", + name: "Dodge", + onFoeBeforeMovePriority: 6, + onFoeBeforeMove(attacker, defender, move) { + if (target === this.effectState.target && move.category !== "Status") { + move.overrideDefensiveStat = 'spe'; + } + }, + rating: 3.5, + num: -9148, + }, + wonderskin: { + onTryHit(target, source, move) { + if (move.category === 'Status' && target !== source) { + this.add('-immune', target, '[from] ability: Wonder Skin'); + return null; + } + }, + isBreakable: true, + name: "Wonder Skin", + shortDesc: "This Pokemon is immune to Status moves.", + rating: 5, + num: 147, + }, //Gen 9 additions sharpness: { shortDesc: "Boosts the power of sword, cut, slash, and blade moves by 1.3x", diff --git a/data/mods/agoldenexperience/formats-data.ts b/data/mods/agoldenexperience/formats-data.ts index dde4afa15d..6f2f8dba00 100644 --- a/data/mods/agoldenexperience/formats-data.ts +++ b/data/mods/agoldenexperience/formats-data.ts @@ -377,7 +377,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, golduck: { - tier: "(PU)", + tier: "RU", doublesTier: "(DUU)", }, mankey: { @@ -409,11 +409,11 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "NFE", }, poliwrath: { - tier: "(PU)", + tier: "NU", doublesTier: "(DUU)", }, politoed: { - tier: "UU", + tier: "(PU)", doublesTier: "DUU", }, abra: { @@ -423,7 +423,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "NFE", }, alakazam: { - tier: "UUBL", + tier: "UU", doublesTier: "(DUU)", }, alakazammega: { @@ -514,7 +514,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, slowbrogalar: { - tier: "RUBL", + tier: "RU", doublesTier: "(DUU)", }, slowking: { @@ -593,8 +593,8 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, gengarmega: { - tier: "Uber", - doublesTier: "DUber", + tier: "OU", + doublesTier: "DOU", }, gengargmax: { isNonstandard: "Past", @@ -604,11 +604,11 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, steelix: { - tier: "RU", + tier: "NU", doublesTier: "(DUU)", }, steelixmega: { - tier: "RU", + tier: "UU", doublesTier: "DUU", }, drowzee: { @@ -944,7 +944,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, aerodactylmega: { - tier: "OU", + tier: "UUBL", doublesTier: "DOU", }, munchlax: { @@ -1052,7 +1052,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DUU", }, feraligatrmega: { - tier: "RU", + tier: "UU", doublesTier: "DOU", }, sentret: { @@ -1209,6 +1209,10 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { girafarig: { tier: "LC", }, + farigiraf: { + tier: "NU", + doublesTier: "(DUU)", + }, pineco: { tier: "LC", }, @@ -1229,8 +1233,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, granbull: { - tier: "(PU)", - doublesTier: "(DUU)", + tier: "RU", }, qwilfish: { tier: "(PU)", @@ -1277,7 +1280,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, magcargomega: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, swinub: { @@ -1287,7 +1290,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "NFE", }, mamoswine: { - tier: "OU", + tier: "UUBL", doublesTier: "(DUU)", }, corsola: { @@ -1410,7 +1413,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "NFE", }, blaziken: { - tier: "UU", + tier: "RU", doublesTier: "(DUU)", }, blazikenmega: { @@ -1452,7 +1455,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "NFE", }, obstagoon: { - tier: "OU", + tier: "UU", doublesTier: "(DUU)", }, wurmple: { @@ -1539,7 +1542,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, breloom: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, slakoth: { @@ -1556,7 +1559,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, ninjask: { - tier: "PU", + tier: "RU", doublesTier: "(DUU)", }, shedinja: { @@ -1577,7 +1580,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, hariyama: { - tier: "NU", + tier: "UU", doublesTier: "(DUU)", }, nosepass: { @@ -1720,7 +1723,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, torkoal: { - tier: "UU", + tier: "OU", doublesTier: "DOU", }, spoink: { @@ -1756,7 +1759,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, cacturnemegax: { - tier: "OU", + tier: "UUBL", doublesTier: "DOU", }, cacturnemegayday: { @@ -1779,7 +1782,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DUU", }, zangoose: { - tier: "UU", + tier: "RU", doublesTier: "(DUU)", }, seviper: { @@ -1882,14 +1885,13 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, tropius: { - tier: "(PU)", - doublesTier: "(DUU)", + tier: "LC", }, chingling: { tier: "LC", }, chimecho: { - tier: "(PU)", + tier: "UU", doublesTier: "(DUU)", }, absol: { @@ -1908,7 +1910,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, glaliemega: { - tier: "OU", + tier: "UUBL", doublesTier: "DUU", }, froslass: { @@ -1959,7 +1961,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, salamencemega: { - tier: "Uber", + tier: "OU", doublesTier: "DOU", }, beldum: { @@ -2041,7 +2043,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DUber", }, deoxysdefense: { - tier: "UU", + tier: "RU", doublesTier: "DOU", }, deoxysspeed: { @@ -2123,7 +2125,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, bastiodon: { - tier: "UU", + tier: "RU", doublesTier: "(DUU)", }, burmy: { @@ -2167,11 +2169,11 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "NFE", }, cherrim: { - tier: "UU", + tier: "RU", doublesTier: "DUU", }, cherrimsunshine: { - tier: "UU", + tier: "RU", doublesTier: "DUU", }, shellos: { @@ -2217,7 +2219,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, bronzong: { - tier: "UU", + tier: "RU", doublesTier: "DUU", }, chatot: { @@ -2485,11 +2487,11 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "NFE", }, emboar: { - tier: "UU", + tier: "RU", doublesTier: "DUU", }, emboargalar: { - tier: "OU", + tier: "UU", doublesTier: "DUU", }, oshawott: { @@ -2508,7 +2510,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DUU", }, samurottgalar: { - tier: "UU", + tier: "RU", doublesTier: "DUU", }, patrat: { @@ -2716,7 +2718,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, darmanitan: { - tier: "UU", + tier: "RU", doublesTier: "(DUU)", }, darmanitanzen: { @@ -2724,7 +2726,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DUU", }, darmanitangalar: { - tier: "UU", + tier: "RU", doublesTier: "(DUU)", }, darmanitangalarzen: { @@ -2955,15 +2957,14 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "NFE", }, haxorus: { - tier: "RUBL", + tier: "RU", doublesTier: "(DUU)", }, cubchoo: { tier: "LC", }, beartic: { - tier: "(PU)", - doublesTier: "(DUU)", + tier: "PU", }, cryogonal: { tier: "(PU)", @@ -2999,8 +3000,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, golurk: { - tier: "NU", - doublesTier: "(DUU)", + tier: "RU", }, pawniard: { tier: "LC", @@ -3037,7 +3037,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, durant: { - tier: "RUBL", + tier: "RU", doublesTier: "(DUU)", }, deino: { @@ -3130,11 +3130,11 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "(DUU)", }, genesect: { - tier: "UU", + tier: "RUBL", doublesTier: "DOU", }, genesectburn: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, genesectchill: { @@ -3766,7 +3766,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, silvallyflying: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, silvallyghost: { @@ -3774,7 +3774,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, silvallygrass: { - tier: "UU", + tier: "RU", doublesTier: "DOU", }, silvallyground: { @@ -3794,7 +3794,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, silvallyrock: { - tier: "UU", + tier: "RU", doublesTier: "DOU", }, silvallysteel: { @@ -3930,7 +3930,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DUU", }, necrozma: { - tier: "RUBL", + tier: "RU", doublesTier: "DOU", }, necrozmaduskmane: { @@ -4155,7 +4155,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, barraskewda: { - tier: "UU", + tier: "RU", doublesTier: "(DUU)", }, toxel: { @@ -4261,13 +4261,13 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, frosmoth: { - tier: "PU", - doublesTier: "(DUU)", - }, - frosmothmega: { tier: "NU", doublesTier: "(DUU)", }, + // frosmothmega: { + // tier: "NU", + // doublesTier: "(DUU)", + // }, stonjourner: { tier: "(PU)", doublesTier: "DUU", @@ -4334,16 +4334,16 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, zacian: { - tier: "Uber", - doublesTier: "DUber", + tier: "OU", + doublesTier: "DOU", }, zaciancrowned: { tier: "Uber", doublesTier: "DUber", }, zamazenta: { - tier: "Uber", - doublesTier: "DUber", + tier: "OU", + doublesTier: "DOU", }, zamazentacrowned: { tier: "Uber", @@ -4444,7 +4444,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { }, overqwil: { gen: 8, - tier: "OU", + tier: "UU", doublesTier: "DOU", }, enamorus: { @@ -4511,7 +4511,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, maushold: { - tier: "UU", + tier: "RU", doublesTier: "DOU", //natDexTier: "UU", }, @@ -4581,7 +4581,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { //natDexTier: "RU", }, ironjugulis: { - tier: "OU", + tier: "UU", doublesTier: "DUU", //natDexTier: "RU", }, @@ -4732,24 +4732,24 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "LC", }, snobberaven: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, fiyounfly: { tier: "LC", }, ledixy: { - tier: "UU", + tier: "RU", doublesTier: "DOU", }, terados: { tier: "UU", doublesTier: "DOU", }, - jaboraishi: { - tier: "RU", - doublesTier: "DOU", - }, + // jaboraishi: { + // tier: "RU", + // doublesTier: "DOU", + // }, mosquitox: { tier: "RU", doublesTier: "DOU", @@ -4776,14 +4776,14 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, sharkutkie: { - tier: "OU", + tier: "RU", doublesTier: "DOU", }, mercurino: { tier: "LC", }, dauvifar: { - tier: "UU", + tier: "RU", doublesTier: "DOU", }, girafatak: { @@ -4831,11 +4831,11 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, mystao: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, hopkineye: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, harvesking: { @@ -4880,11 +4880,11 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, ameba: { - tier: "UU", + tier: "RU", doublesTier: "DOU", }, solens: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, snolbom: { @@ -4894,10 +4894,10 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { tier: "RU", doublesTier: "DOU", }, - snobawcus: { - tier: "RU", - doublesTier: "DOU", - }, + // snobawcus: { + // tier: "RU", + // doublesTier: "DOU", + // }, noibatsinnoh: { tier: "LC", }, @@ -4916,7 +4916,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DOU", }, delistmas: { - tier: "UU", + tier: "RU", doublesTier: "DOU", }, jhex: { @@ -4947,7 +4947,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { // doublesTier: "DOU", // }, nopainnogain: { - tier: "UU", + tier: "RU", doublesTier: "DOU", }, bubblure: { @@ -5001,13 +5001,29 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = { doublesTier: "DUU", }, annoyog: { - tier: "OU", + tier: "UU", doublesTier: "DOU", }, raticket: { tier: "UU", doublesTier: "DOU", }, + golrobot: { + tier: "OU", + doublesTier: "DOU", + }, + sautropius: { + tier: "NU", + doublesTier: "DUU", + }, + meltic: { + tier: "OU", + doublesTier: "DOU", + }, + sithbull: { + tier: "OU", + doublesTier: "DOU", + }, //unavailable missingno: { isNonstandard: "Custom", diff --git a/data/mods/agoldenexperience/items.ts b/data/mods/agoldenexperience/items.ts index dda70468e7..6e474952ad 100644 --- a/data/mods/agoldenexperience/items.ts +++ b/data/mods/agoldenexperience/items.ts @@ -484,20 +484,20 @@ export const Items: {[itemid: string]: ModdedItemData} = { gen: 8, desc: "If held by a Centiskorch, this item allows it to Mega Evolve in battle.", }, - frosmite: { - name: "Frosmite", - spritenum: 578, - megaStone: "Frosmoth-Mega", - megaEvolves: "Frosmoth", - itemUser: ["Frosmoth"], - onTakeItem(item, source) { - if (item.megaEvolves === source.baseSpecies.baseSpecies) return false; - return true; - }, - num: -36, - gen: 8, - desc: "If held by a Frosmoth, this item allows it to Mega Evolve in battle.", - }, + // frosmite: { //removed + // name: "Frosmite", + // spritenum: 578, + // megaStone: "Frosmoth-Mega", + // megaEvolves: "Frosmoth", + // itemUser: ["Frosmoth"], + // onTakeItem(item, source) { + // if (item.megaEvolves === source.baseSpecies.baseSpecies) return false; + // return true; + // }, + // num: -36, + // gen: 8, + // desc: "If held by a Frosmoth, this item allows it to Mega Evolve in battle.", + // }, baskironite: { name: "Baskironite", spritenum: 578, diff --git a/data/mods/agoldenexperience/learnsets.ts b/data/mods/agoldenexperience/learnsets.ts index 27d6b62139..e1c3e694ec 100644 --- a/data/mods/agoldenexperience/learnsets.ts +++ b/data/mods/agoldenexperience/learnsets.ts @@ -2232,6 +2232,7 @@ export const Learnsets: { [speciesid: string]: LearnsetData; } = { xscissor: ["8M"], return: ["8M"], frustration: ["8M"], + highjumpkick: ["8M"], }, }, capsakid: { @@ -4505,6 +4506,8 @@ export const Learnsets: { [speciesid: string]: LearnsetData; } = { zenheadbutt: ["8M", "8L30"], return: ["8M"], frustration: ["8M"], + stealthrock: ["8M"], + whirlwind: ["8M"], }, }, taurospaldeablaze: { @@ -4561,6 +4564,8 @@ export const Learnsets: { [speciesid: string]: LearnsetData; } = { zenheadbutt: ["8M", "8L30"], return: ["8M"], frustration: ["8M"], + stealthrock: ["8M"], + whirlwind: ["8M"], }, }, taurospaldeaaqua: { @@ -4615,6 +4620,8 @@ export const Learnsets: { [speciesid: string]: LearnsetData; } = { zenheadbutt: ["8M", "8L30"], return: ["8M"], frustration: ["8M"], + stealthrock: ["8M"], + whirlwind: ["8M"], }, }, walkingwake: { @@ -5028,25 +5035,25 @@ export const Learnsets: { [speciesid: string]: LearnsetData; } = { poisonfang: ["8L48"], }, }, - jaboraishi: { - learnset: { - bulkup: ["8L1"], - brickbreak: ["8L1"], - closecombat: ["8L1"], - highjumpkick: ["8L1"], - blazekick: ["8L1"], - voltswitch: ["8L1"], - nuzzle: ["8L1"], - thunderwave: ["8L1"], - uturn: ["8L1"], - rapidspin: ["8L1"], - fakeout: ["8L1"], - seedbomb: ["8L1"], - zenheadbutt: ["8L1"], - taunt: ["8L1"], - knockoff: ["8L1"], - }, - }, + // jaboraishi: { //removed + // learnset: { + // bulkup: ["8L1"], + // brickbreak: ["8L1"], + // closecombat: ["8L1"], + // highjumpkick: ["8L1"], + // blazekick: ["8L1"], + // voltswitch: ["8L1"], + // nuzzle: ["8L1"], + // thunderwave: ["8L1"], + // uturn: ["8L1"], + // rapidspin: ["8L1"], + // fakeout: ["8L1"], + // seedbomb: ["8L1"], + // zenheadbutt: ["8L1"], + // taunt: ["8L1"], + // knockoff: ["8L1"], + // }, + // }, mosquitox: { learnset: { rest: ["8L1"], @@ -6790,27 +6797,27 @@ export const Learnsets: { [speciesid: string]: LearnsetData; } = { freezedry: ["8L1"], }, }, - snobawcus: { - learnset: { - bulkup: ["8L1"], - toxic: ["8L1"], - taunt: ["8L1"], - spikes: ["8L1"], - toxicspikes: ["8L1"], - rest: ["8L1"], - protect: ["8L1"], - megahorn: ["8L1"], - rolledballed: ["8L1"], - rockblast: ["8L1"], - gunkshot: ["8L1"], - superpower: ["8L1"], - headcharge: ["8L1"], - iceshard: ["8L1"], - focusblast: ["8L1"], - sludgebomb: ["8L1"], - earthpower: ["8L1"], - }, - }, + // snobawcus: { + // learnset: { + // bulkup: ["8L1"], + // toxic: ["8L1"], + // taunt: ["8L1"], + // spikes: ["8L1"], + // toxicspikes: ["8L1"], + // rest: ["8L1"], + // protect: ["8L1"], + // megahorn: ["8L1"], + // rolledballed: ["8L1"], + // rockblast: ["8L1"], + // gunkshot: ["8L1"], + // superpower: ["8L1"], + // headcharge: ["8L1"], + // iceshard: ["8L1"], + // focusblast: ["8L1"], + // sludgebomb: ["8L1"], + // earthpower: ["8L1"], + // }, + // }, noibatsinnoh: { learnset: { screech: ["8L1"], @@ -6916,7 +6923,7 @@ export const Learnsets: { [speciesid: string]: LearnsetData; } = { dracometeor: ["8L1"], }, }, - slugmasinnoh: { + slugmasinnoh: { learnset: { acidarmor: ["7E", "7V", "6E", "5E", "4E", "3E"], afteryou: ["7T", "6T", "5T"], @@ -8477,4 +8484,36 @@ export const Learnsets: { [speciesid: string]: LearnsetData; } = { nightslash: ["8L1"], }, }, + golrobot: { + learnset: { + heatcrash: ["8L1"], + heavyslam: ["8L1"], + bulletpunch: ["8L1"], + machpunch: ["8L1"], + }, + }, + sautropius: { + learnset: { + acrobatics: ["8L1"], + }, + }, + meltic: { + learnset: { + flipturn: ["8L1"], + wavecrash: ["8L1"], + freezedry: ["8L1"], + }, + }, + sithbull: { + learnset: { + howl: ["8L1"], + willowisp: ["8L1"], + painsplit: ["8L1"], + pursuit: ["8L1"], + houndshowl: ["8L1"], + stealthrocks: ["8L1"], + nightmare: ["8L1"], + spiritbreak: ["8L1"], + }, + }, }; \ No newline at end of file diff --git a/data/mods/agoldenexperience/moves.ts b/data/mods/agoldenexperience/moves.ts index 661f18f300..45d745d32d 100644 --- a/data/mods/agoldenexperience/moves.ts +++ b/data/mods/agoldenexperience/moves.ts @@ -64,6 +64,7 @@ export const Moves: {[k: string]: ModdedMoveData} = { } }, secondary: null, + shortDesc: "1.5x damage if foe holds an item. Removes item. Heals 1/10 of max HP.", target: "normal", type: "Flying", contestType: "Tough", @@ -443,27 +444,27 @@ export const Moves: {[k: string]: ModdedMoveData} = { zMove: {boost: {def: 1}}, contestType: "Tough", },*/ - rolledballed: { - num: -13, - accuracy: 90, - basePower: 35, - category: "Physical", - shortDesc: "Hits twice. Has a 10% chance to lower the target's Def after each hit.", - name: "Rolled Balled", - pp: 10, - priority: 0, - flags: {protect: 1, mirror: 1}, - multihit: 2, - secondary: { - chance: 10, - boosts: { - def: -1, - }, - }, - target: "normal", - type: "Ice", - contestType: "Cool", - }, + // rolledballed: { //removed + // num: -13, + // accuracy: 90, + // basePower: 35, + // category: "Physical", + // shortDesc: "Hits twice. Has a 10% chance to lower the target's Def after each hit.", + // name: "Rolled Balled", + // pp: 10, + // priority: 0, + // flags: {protect: 1, mirror: 1}, + // multihit: 2, + // secondary: { + // chance: 10, + // boosts: { + // def: -1, + // }, + // }, + // target: "normal", + // type: "Ice", + // contestType: "Cool", + // }, goldenexperience: { num: -14, accuracy: 100, @@ -705,6 +706,29 @@ export const Moves: {[k: string]: ModdedMoveData} = { zMove: {effect: 'clearnegativeboost'}, contestType: "Beautiful", }, + seajaws: { + num: -1706, + accuracy: 100, + basePower: 85, + category: "Physical", + name: "Sea Jaws", + pp: 10, + priority: 0, + flags: {bite: 1, contact: 1, protect: 1, mirror: 1}, + onTryHit(pokemon) { + // will shatter screens through sub, before you hit + if (pokemon.runImmunity('Water')) { + pokemon.side.removeSideCondition('reflect'); + pokemon.side.removeSideCondition('lightscreen'); + pokemon.side.removeSideCondition('auroraveil'); + } + }, + secondary: null, + shortDesc: "Destroys screens, unless the target is immune to Water.", + target: "normal", + type: "Water", + contestType: "Clever", + }, parallelcircuit: { num: -2242, accuracy: 95, @@ -837,6 +861,24 @@ export const Moves: {[k: string]: ModdedMoveData} = { target: "normal", type: "Fighting", }, + musclecare: { + num: -1105, + accuracy: true, + basePower: 0, + category: "Status", + name: "Muscle Care", + pp: 10, + priority: 0, + flags: {snatch: 1, heal: 1}, + heal: [1, 2], + secondary: null, + target: "self", + type: "Fighting", + zMove: {effect: 'clearnegativeboost'}, + shortDesc: "Heals the user by 50% of its max HP.", + desc: "Heals the user by 50% of its max HP.", + contestType: "Clever", + }, dissolution: { num: -28, accuracy: 100, @@ -1749,7 +1791,7 @@ export const Moves: {[k: string]: ModdedMoveData} = { category: "Special", shortDesc: "-1 SpA/SpD to target.", name: "Glitzy Glow", - pp: 24, + pp: 15, priority: 0, flags: {protect: 1}, boosts: { @@ -1768,7 +1810,7 @@ export const Moves: {[k: string]: ModdedMoveData} = { category: "Special", shortDesc: "-1 Atk/Def to target.", name: "Baddy Bad", - pp: 24, + pp: 15, priority: 0, flags: {protect: 1}, boosts: { @@ -1838,28 +1880,64 @@ export const Moves: {[k: string]: ModdedMoveData} = { type: "Fairy", contestType: "Clever", }, + // ragingfury: { + // num: -1200, + // accuracy: 100, + // basePower: 120, + // category: "Physical", + // name: "Raging Fury", + // shortDesc: "Lasts 2-3 turns. Confuses the user afterwards.", + // pp: 10, + // priority: 0, + // flags: {contact: 1, protect: 1, mirror: 1}, + // self: { + // volatileStatus: 'lockedmove', + // }, + // onAfterMove(pokemon) { + // if (pokemon.volatiles['lockedmove'] && pokemon.volatiles['lockedmove'].duration === 1) { + // pokemon.removeVolatile('lockedmove'); + // } + // }, + // secondary: null, + // target: "randomNormal", + // type: "Fire", + // contestType: "Cool", + // }, ragingfury: { num: -1200, accuracy: 100, - basePower: 120, + basePower: 130, category: "Physical", name: "Raging Fury", - shortDesc: "Lasts 2-3 turns. Confuses the user afterwards.", pp: 10, priority: 0, flags: {contact: 1, protect: 1, mirror: 1}, - self: { - volatileStatus: 'lockedmove', - }, - onAfterMove(pokemon) { - if (pokemon.volatiles['lockedmove'] && pokemon.volatiles['lockedmove'].duration === 1) { - pokemon.removeVolatile('lockedmove'); + basePowerCallback(pokemon, target, move) { + let bp = move.basePower; + if (pokemon.volatiles['ragingfury'] && pokemon.volatiles['ragingfury'].hitCount) { + bp -= 30*pokemon.volatiles['ragingfury'].hitCount; } + if (pokemon.status !== 'slp') pokemon.addVolatile('ragingfury'); + this.debug("Rollout bp: " + bp); + return bp; + }, + condition: { + duration: 2, + onStart() { + this.effectData.hitCount = 1; + }, + onRestart() { + this.effectData.hitCount++; + if (this.effectData.hitCount < 5) { + this.effectData.duration = 2; + } + }, }, secondary: null, target: "randomNormal", type: "Fire", contestType: "Cool", + shortDesc: "This move lowers in power after each use (5 turns max).", }, chloroblast: { desc: "This move has 50% recoil. Hits target for at least neutral damages.", @@ -3109,8 +3187,10 @@ export const Moves: {[k: string]: ModdedMoveData} = { pp: 5, priority: 0, flags: {snatch: 1, dance: 1}, - boosts: { - spa: 1, + self: { + boosts: { + spa: 1, + }, }, weather: 'RainDance', secondary: null, @@ -3471,7 +3551,7 @@ export const Moves: {[k: string]: ModdedMoveData} = { ragingbull: { num: 873, accuracy: 100, - basePower: 90, + basePower: 120, category: "Physical", name: "Raging Bull", shortDesc: "Destroys screens. Type depends on user's form.", diff --git a/data/mods/agoldenexperience/pokedex.ts b/data/mods/agoldenexperience/pokedex.ts index 6e9a79c406..64e14c8b99 100644 --- a/data/mods/agoldenexperience/pokedex.ts +++ b/data/mods/agoldenexperience/pokedex.ts @@ -5,10 +5,6 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { //Vanilla mons (+ custom megas and regional forms) : //gen 1 : - blastoisemega: { - inherit: true, - abilities: {0: "Battle Armor"}, - }, butterfree: { inherit: true, baseStats: {hp: 60, atk: 40, def: 50, spa: 90, spd: 80, spe: 75}, @@ -164,17 +160,16 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { baseStats: {hp: 80, atk: 62, def: 78, spa: 105, spd: 80, spe: 95}, abilities: {0: "Neuroforce", 1: "Cloud Nine", H: "Swift Swim"}, }, - primeape: {//to remove when gen 9 + primeape: { inherit: true, - //abilities: {0: "Gorilla Tactics", 1: "Anger Point", H: "Defiant"}, evos: ["Annihilape"], }, - growlithe: {//to remove when gen 9 + growlithe: { inherit: true, otherFormes: ["Growlithe-Hisui"], formeOrder: ["Growlithe", "Growlithe-Hisui"], }, - growlithehisui: {//to remove when gen 9 + growlithehisui: { num: 58, name: "Growlithe-Hisui", baseSpecies: "Growlithe", @@ -192,10 +187,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { arcanine: { inherit: true, baseStats: {hp: 90, atk: 115, def: 90, spa: 75, spd: 90, spe: 95}, - otherFormes: ["Arcanine-Hisui"],//to remove when gen 9 - formeOrder: ["Arcanine", "Arcanine-Hisui"],//to remove when gen 9 + otherFormes: ["Arcanine-Hisui"], + formeOrder: ["Arcanine", "Arcanine-Hisui"], }, - arcaninehisui: {//to remove when gen 9 + arcaninehisui: { num: 59, name: "Arcanine-Hisui", baseSpecies: "Arcanine", @@ -212,10 +207,6 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evoItem: "Fire Stone", eggGroups: ["Field"], }, - /*arcaninehisui: { - inherit: true, - baseStats: {hp: 95, atk: 115, def: 80, spa: 85, spd: 80, spe: 100}, - },*/ poliwrath: { inherit: true, baseStats: {hp: 90, atk: 100, def: 100, spa: 60, spd: 100, spe: 70}, @@ -232,8 +223,8 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { forme: "Mega", types: ["Fighting"], genderRatio: {M: 0.75, F: 0.25}, - baseStats: {hp: 90, atk: 180, def: 110, spa: 65, spd: 95, spe: 65}, - abilities: {0: "Limber"}, + baseStats: {hp: 90, atk: 180, def: 110, spa: 65, spd: 105, spe: 55}, + abilities: {0: "Invincible"}, heightm: 1.6, weightkg: 130, color: "Gray", @@ -312,6 +303,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, abilities: {0: "Levitate", H: "Neutralizing Gas"}, }, + gengarmega: { + inherit: true, + baseStats: {hp: 60, atk: 85, def: 100, spa: 140, spd: 115, spe: 100}, + }, kingler: { inherit: true, baseStats: {hp: 55, atk: 150, def: 115, spa: 50, spd: 50, spe: 75}, @@ -324,10 +319,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { voltorb: { inherit: true, abilities: {0: "Soundproof", 1: "Explosive", H: "Aftermath"}, - otherFormes: ["Voltorb-Hisui"],//to remove when gen 9 - formeOrder: ["Voltorb", "Voltorb-Hisui"],//to remove when gen 9 + otherFormes: ["Voltorb-Hisui"], + formeOrder: ["Voltorb", "Voltorb-Hisui"], }, - voltorbhisui: {//to remove when gen 9 + voltorbhisui: { num: 100, name: "Voltorb-Hisui", baseSpecies: "Voltorb", @@ -346,10 +341,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, baseStats: {hp: 60, atk: 80, def: 70, spa: 50, spd: 80, spe: 150}, abilities: {0: "Soundproof", 1: "Explosive", H: "Aftermath"}, - otherFormes: ["Electrode-Hisui"],//to remove when gen 9 - formeOrder: ["Electrode", "Electrode-Hisui"],//to remove when gen 9 + otherFormes: ["Electrode-Hisui"], + formeOrder: ["Electrode", "Electrode-Hisui"], }, - electrodehisui: {//to remove when gen 9 + electrodehisui: { num: 101, name: "Electrode-Hisui", baseSpecies: "Electrode", @@ -366,17 +361,19 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evoItem: "Leaf Stone", eggGroups: ["Mineral"], }, - /*electrodehisui: { + exeggcute: { inherit: true, - abilities: {0: "Soundproof", 1: "Deadly Blasts", H: "Aftermath"}, - },*/ + abilities: {0: "Chlorophyll", 1: "Strong Will", H: "Harvest"}, + }, exeggutor: { inherit: true, baseStats: {hp: 95, atk: 85, def: 85, spa: 125, spd: 75, spe: 65}, + abilities: {0: "Chlorophyll", 1: "Strong Will", H: "Harvest"}, }, exeggutoralola: { inherit: true, baseStats: {hp: 95, atk: 125, def: 85, spa: 125, spd: 75, spe: 25}, + abilities: {0: "Frisk", 1: "Strong Will", H: "Harvest"}, }, hitmonlee: { inherit: true, @@ -405,7 +402,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { }, starmie: { inherit: true, - abilities: {0: "Illuminate", 1: "Regenerator", H: "Analytic"}, + abilities: {0: "Illuminate", 1: "Regenerator", H: "Smart Guard"}, }, mrmime: { inherit: true, @@ -440,7 +437,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { forme: "Paldea-Combat", types: ["Fighting"], gender: "M", - baseStats: {hp: 75, atk: 110, def: 105, spa: 30, spd: 70, spe: 100}, + baseStats: {hp: 75, atk: 120, def: 115, spa: 30, spd: 70, spe: 100}, abilities: {0: "Intimidate", 1: "Anger Point", H: "Cud Chew"}, heightm: 1.4, weightkg: 88.4, @@ -454,7 +451,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { forme: "Paldea-Blaze", types: ["Fighting", "Fire"], gender: "M", - baseStats: {hp: 75, atk: 110, def: 105, spa: 30, spd: 70, spe: 100}, + baseStats: {hp: 75, atk: 120, def: 115, spa: 30, spd: 70, spe: 100}, abilities: {0: "Intimidate", 1: "Anger Point", H: "Cud Chew"}, heightm: 1.4, weightkg: 88.4, @@ -468,7 +465,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { forme: "Paldea-Aqua", types: ["Fighting", "Water"], gender: "M", - baseStats: {hp: 75, atk: 110, def: 105, spa: 30, spd: 70, spe: 100}, + baseStats: {hp: 75, atk: 120, def: 115, spa: 30, spd: 70, spe: 100}, abilities: {0: "Intimidate", 1: "Anger Point", H: "Cud Chew"}, heightm: 1.4, weightkg: 88.4, @@ -571,7 +568,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { otherFormes: ["Typhlosion-Hisui", "Typhlosion-Mega"], formeOrder: ["Typhlosion", "Typhlosion-Hisui", "Typhlosion-Mega"], }, - typhlosionhisui: {//to remove when gen 9 + typhlosionhisui: { num: 157, name: "Typhlosion-Hisui", baseSpecies: "Typhlosion", @@ -614,7 +611,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { forme: "Mega", types: ["Water", "Dark"], genderRatio: {M: 0.875, F: 0.125}, - baseStats: {hp: 85, atk: 120, def: 120, spa: 119, spd: 118, spe: 68}, + baseStats: {hp: 85, atk: 130, def: 120, spa: 99, spd: 118, spe: 78}, abilities: {0: "Stakeout"}, heightm: 2.3, weightkg: 88.8, @@ -744,18 +741,21 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evos: ["Farigiraf", "Girafatak"], abilities: {0: "Inner Focus", 1: "Early Bird", H: "Neuroforce"}, }, + steelixmega: { + inherit: true, + abilities: {0: "Earth Eater"}, + }, granbull: { inherit: true, - types: ["Fairy", "Dark"], - baseStats: {hp: 90, atk: 130, def: 75, spa: 60, spd: 60, spe: 45}, + evos: ["Sithbull"], }, qwilfish: { inherit: true, baseStats: {hp: 85, atk: 95, def: 85, spa: 55, spd: 85, spe: 85}, - otherFormes: ["Qwilfish-Hisui"],//to remove when gen 9 - formeOrder: ["Qwilfish", "Qwilfish-Hisui"],//to remove when gen 9 + otherFormes: ["Qwilfish-Hisui"], + formeOrder: ["Qwilfish", "Qwilfish-Hisui"], }, - qwilfishhisui: {//to remove when gen 9 + qwilfishhisui: { num: 211, name: "Qwilfish-Hisui", baseSpecies: "Qwilfish", @@ -801,12 +801,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { battleOnly: "Scizor-Galar", requiredItem: "Scizorite", }, - sneasel: {//to remove when gen 9 + sneasel: { inherit: true, otherFormes: ["Sneasel-Hisui"], formeOrder: ["Sneasel", "Sneasel-Hisui"], }, - sneaselhisui: {//to remove when gen 9 + sneaselhisui: { num: 215, name: "Sneasel-Hisui", baseSpecies: "Sneasel", @@ -824,7 +824,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, baseStats: {hp: 90, atk: 130, def: 75, spa: 55, spd: 75, spe: 75}, abilities: {0: "Guts", 1: "Quick Feet", H: "Honey Gather"}, - evos: ["Ursaluna"],//to remove when gen 9 + evos: ["Ursaluna"], }, slugma: { inherit: true, @@ -849,6 +849,8 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, otherFormes: ["Magcargo-Mega", "Magcargo-Sinnoh"], formeOrder: ["Magcargo", "Magcargo-Mega", "Magcargo-Sinnoh"], + // otherFormes: ["Magcargo-Mega"], + // formeOrder: ["Magcargo", "Magcargo-Mega"], }, magcargomega: { num: 219, @@ -1015,6 +1017,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, baseStats: {hp: 75, atk: 60, def: 62, spa: 100, spd: 82, spe: 96}, }, + ninjask: { + inherit: true, + abilities: {0: "Speed Boost", H: "Dodge"}, + }, exploud: { inherit: true, baseStats: {hp: 104, atk: 70, def: 63, spa: 112, spd: 73, spe: 68}, @@ -1027,7 +1033,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { delcatty: { inherit: true, baseStats: {hp: 70, atk: 55, def: 95, spa: 85, spd: 95, spe: 90}, - abilities: {0: "Unaware", 1: "Normalize", H: "Unimpressed"}, + abilities: {0: "Unimpressed", 1: "Normalize", H: "Wonder Skin"}, }, sableye: { inherit: true, @@ -1048,6 +1054,14 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { eggGroups: ["Human-Like"], evos: ["Hopkineye"], }, + meditite: { + inherit: true, + abilities: {0: "Pure Power", 1: "Telepathy", H: "Strong Will"}, + }, + medicham: { + inherit: true, + abilities: {0: "Pure Power", 1: "Telepathy", H: "Strong Will"}, + }, manectric: { inherit: true, baseStats: {hp: 70, atk: 75, def: 70, spa: 110, spd: 60, spe: 105}, @@ -1068,7 +1082,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { name: "Volbeat-Mega", baseSpecies: "Volbeat", forme: "Mega", - types: ["Bug", "Psychic"], + types: ["Bug", "Electric"], gender: "M", baseStats: {hp: 65, atk: 130, def: 50, spa: 130, spd: 50, spe: 105}, abilities: {0: "Infiltrator"}, @@ -1117,9 +1131,13 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, baseStats: {hp: 80, atk: 45, def: 90, spa: 90, spd: 110, spe: 65}, }, + vibrava: { + inherit: true, + abilities: {0: "Levitate", 1:"Arena Trap", H: "Sand Stream"}, + }, flygon: { inherit: true, - abilities: {0: "Levitate", H:"Sand Stream"}, + abilities: {0: "Levitate", 1:"Arena Trap", H: "Sand Stream"}, otherFormes: ["Flygon-Mega"], formeOrder: ["Flygon", "Flygon-Mega"], }, @@ -1137,8 +1155,13 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { eggGroups: ["Bug", "Dragon"], requiredItem: "Flygonite", }, + cacnea: { + inherit: true, + abilities: {0: "Sand Veil", 1:"Arena Trap", H: "Water Absorb"}, + }, cacturne: { inherit: true, + abilities: {0: "Sand Veil", 1:"Arena Trap", H: "Water Absorb"}, otherFormes: ["Cacturne-Mega-X", "Cacturne-Mega-Y-Day", "Cacturne-Mega-Y-Night"], formeOrder: ["Cacturne", "Cacturne-Mega-X", "Cacturne-Mega-Y-Day", "Cacturne-Mega-Y-Night"], }, @@ -1218,9 +1241,14 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { eggGroups: ["Water 2"], requiredItem: "Whiscashite", }, + baltoy: { + inherit: true, + abilities: {0: "Levitate", H: "Smart Guard"}, + }, claydol: { inherit: true, baseStats: {hp: 80, atk: 50, def: 105, spa: 70, spd: 120, spe: 75}, + abilities: {0: "Levitate", H: "Smart Guard"}, }, cradily: { inherit: true, @@ -1263,6 +1291,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, abilities: {0: "Shadow Tag", 1: "Frisk", H: "Cursed Body"}, }, + banettemega: { + inherit: true, + baseStats: {hp: 64, atk: 145, def: 75, spa: 123, spd: 83, spe: 65}, + }, duskull: { inherit: true, abilities: {0: "Levitate", 1: "Shadow Tag", H: "Frisk"}, @@ -1275,6 +1307,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, baseStats: {hp: 95, atk: 70, def: 105, spa: 135, spd: 120, spe: 75}, }, + tropius: { + inherit: true, + evos: ["Sautropius"], + }, absol: { inherit: true, abilities: {0: "Pressure", 1: "Sharpness", H: "Justified"}, @@ -1297,6 +1333,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, abilities: {0: "Hard Rock", 1: "Rock Head", H: "Sturdy"}, }, + salamencemega: { + inherit: true, + abilities: {0: "Anger Point"}, + }, beldum: { inherit: true, abilities: {0: "Clear Body", 1: "Neuroforce", H: "Light Metal"}, @@ -1459,7 +1499,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { }, lucario: { inherit: true, - abilities: {0: "Chakra Surge", 1: "Pride", H: "Justified"}, + abilities: {0: "Chakra Surge", 1: "Pride", H: "Strong Will"}, }, lucariomega: { inherit: true, @@ -1503,6 +1543,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { baseStats: {hp: 100, atk: 142, def: 115, spa: 142, spd: 115, spe: 40}, abilities: {0: "Everlasting Winter"}, }, + magnezone: { + inherit: true, + abilities: {0: "Magnet Pull", 1: "Smart Guard", H: "Analytic"}, + }, lickilicky: { inherit: true, types: ["Normal", "Poison"], @@ -1547,6 +1591,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { probopass: { inherit: true, baseStats: {hp: 60, atk: 50, def: 145, spa: 90, spd: 150, spe: 30}, + abilities: {0: "Sturdy", 1: "Magnet Pull", H: "Smart Guard"}, }, dusknoir: { inherit: true, @@ -1749,9 +1794,14 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, baseStats: {hp: 60, atk: 85, def: 69, spa: 80, spd: 69, spe: 87}, }, + purrloin: { + inherit: true, + abilities: {0: "Racketeering", 1: "Unburden", H: "Prankster"}, + }, liepard: { inherit: true, baseStats: {hp: 74, atk: 108, def: 60, spa: 58, spd: 60, spe: 120}, + abilities: {0: "Racketeering", 1: "Unburden", H: "Prankster"}, }, simisage: { inherit: true, @@ -1834,10 +1884,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { throh: { inherit: true, baseStats: {hp: 120, atk: 100, def: 95, spa: 30, spd: 95, spe: 45}, + abilities: {0: "Guts", 1: "Stamina", H: "Mold Breaker"}, }, sawk: { inherit: true, baseStats: {hp: 75, atk: 125, def: 75, spa: 30, spd: 75, spe: 105}, + abilities: {0: "Sturdy", 1: "Strong Will", H: "Mold Breaker"}, }, leavanny: { inherit: true, @@ -1859,10 +1911,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { lilligant: { inherit: true, baseStats: {hp: 70, atk: 60, def: 75, spa: 110, spd: 75, spe: 100}, - otherFormes: ["Lilligant-Hisui"],//to remove when gen 9 - formeOrder: ["Lilligant", "Lilligant-Hisui"],//to remove when gen 9 + otherFormes: ["Lilligant-Hisui"], + formeOrder: ["Lilligant", "Lilligant-Hisui"], }, - lilliganthisui: {//to remove when gen 9 + lilliganthisui: { num: 549, name: "Lilligant-Hisui", baseSpecies: "Lilligant", @@ -1882,14 +1934,14 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { basculin: { inherit: true, types: ["Water", "Fighting"], - otherFormes: ["Basculin-Blue-Striped", "Basculin-White-Striped"],//to remove when gen 9 - formeOrder: ["Basculin", "Basculin-Blue-Striped", "Basculin-White-Striped"],//to remove when gen 9 + otherFormes: ["Basculin-Blue-Striped", "Basculin-White-Striped"], + formeOrder: ["Basculin", "Basculin-Blue-Striped", "Basculin-White-Striped"], }, basculinbluestriped: { inherit: true, types: ["Water", "Fighting"], }, - basculinwhitestriped: {//to remove when gen 9 + basculinwhitestriped: { num: 550, name: "Basculin-White-Striped", baseSpecies: "Basculin", @@ -1928,6 +1980,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { }, darmanitanzen: { inherit: true, + baseStats: {hp: 105, atk: 30, def: 105, spa: 140, spd: 105, spe: 55}, }, darmanitangalar: { inherit: true, @@ -1987,12 +2040,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { baseStats: {hp: 80, atk: 60, def: 82, spa: 95, spd: 82, spe: 75}, abilities: {0: "Stench", 1: "Weak Armor", H: "Huge Power"}, }, - zorua: {//to remove when gen 9 + zorua: { inherit: true, otherFormes: ["Zorua-Hisui"], formeOrder: ["Zorua", "Zorua-Hisui"], }, - zoruahisui: {//to remove when gen 9 + zoruahisui: { num: 570, name: "Zorua-Hisui", baseSpecies: "Zorua", @@ -2013,7 +2066,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { otherFormes: ["Zoroark-Hisui", "Zoroark-Mega"], formeOrder: ["Zoroark", "Zoroark-Hisui", "Zoroark-Mega"], }, - zoroarkhisui: {//to remove when gen 9 + zoroarkhisui: { num: 571, name: "Zoroark-Hisui", baseSpecies: "Zoroark", @@ -2117,6 +2170,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, baseStats: {hp: 95, atk: 130, def: 80, spa: 50, spd: 80, spe: 70}, abilities: {0: "Icebreaker", 1: "Slush Rush", H: "Swift Swim"}, + evos: ["Meltic"], }, cryogonal: { inherit: true, @@ -2141,6 +2195,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { golurk: { inherit: true, abilities: {0: "Iron Fist", 1: "Klutz", H: "Invincible"}, + evos: ["Golrobot"], }, bouffalant: { inherit: true, @@ -2154,10 +2209,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { braviary: { inherit: true, types: ["Fighting", "Flying"], - otherFormes: ["Braviary-Hisui"],//to remove when gen 9 - formeOrder: ["Braviary", "Braviary-Hisui"],//to remove when gen 9 + otherFormes: ["Braviary-Hisui"], + formeOrder: ["Braviary", "Braviary-Hisui"], }, - braviaryhisui: {//to remove when gen 9 + braviaryhisui: { num: 628, name: "Braviary-Hisui", baseSpecies: "Braviary", @@ -2373,7 +2428,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { tyrantrum: { inherit: true, baseStats: {hp: 82, atk: 121, def: 119, spa: 59, spd: 59, spe: 81}, - abilities: {0: "Strong Jaw", 1: "Solid Rock", H: "Sturdy"}, + abilities: {0: "Strong Jaw", 1: "Solid Rock", H: "Rock Head"}, }, amaura: { inherit: true, @@ -2392,7 +2447,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { }, carbink: { inherit: true, - abilities: {0: "Clear Body", 1: "Night Light", H: "Huge Power"}, + abilities: {0: "Clear Body", 1: "Night Light", H: "Sturdy"}, }, goomy: { inherit: true, @@ -2401,10 +2456,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { sliggoo: { inherit: true, types: ["Dragon", "Poison"], - otherFormes: ["Sliggoo-Hisui"],//to remove when gen 9 - formeOrder: ["Sliggoo", "Sliggoo-Hisui"],//to remove when gen 9 + otherFormes: ["Sliggoo-Hisui"], + formeOrder: ["Sliggoo", "Sliggoo-Hisui"], }, - sliggoohisui: {//to remove when gen 9 + sliggoohisui: { num: 705, name: "Sliggoo-Hisui", baseSpecies: "Sliggoo", @@ -2423,10 +2478,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { goodra: { inherit: true, types: ["Dragon", "Poison"], - otherFormes: ["Goodra-Hisui"],//to remove when gen 9 - formeOrder: ["Goodra", "Goodra-Hisui"],//to remove when gen 9 + otherFormes: ["Goodra-Hisui"], + formeOrder: ["Goodra", "Goodra-Hisui"], }, - goodrahisui: {//to remove when gen 9 + goodrahisui: { num: 706, name: "Goodra-Hisui", baseSpecies: "Goodra", @@ -2447,39 +2502,39 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { }, pumpkaboo: { inherit: true, - abilities: {0: "Pickup", 1: "Frisk", H: "Flash Fire"}, + abilities: {0: "Night Light", 1: "Frisk", H: "Flash Fire"}, }, pumpkaboosmall: { inherit: true, - abilities: {0: "Pickup", 1: "Frisk", H: "Flash Fire"}, + abilities: {0: "Night Light", 1: "Frisk", H: "Flash Fire"}, }, pumpkaboolarge: { inherit: true, - abilities: {0: "Pickup", 1: "Frisk", H: "Flash Fire"}, + abilities: {0: "Night Light", 1: "Frisk", H: "Flash Fire"}, }, pumpkaboosuper: { inherit: true, - abilities: {0: "Pickup", 1: "Frisk", H: "Flash Fire"}, + abilities: {0: "Night Light", 1: "Frisk", H: "Flash Fire"}, }, gourgeist: { inherit: true, baseStats: {hp: 65, atk: 90, def: 122, spa: 45, spd: 88, spe: 84}, - abilities: {0: "Pickup", 1: "Frisk", H: "Flash Fire"}, + abilities: {0: "Night Light", 1: "Frisk", H: "Flash Fire"}, }, gourgeistsmall: { inherit: true, baseStats: {hp: 55, atk: 85, def: 122, spa: 45, spd: 88, spe: 99}, - abilities: {0: "Pickup", 1: "Frisk", H: "Flash Fire"}, + abilities: {0: "Night Light", 1: "Frisk", H: "Flash Fire"}, }, gourgeistlarge: { inherit: true, baseStats: {hp: 75, atk: 95, def: 122, spa: 45, spd: 88, spe: 69}, - abilities: {0: "Pickup", 1: "Frisk", H: "Flash Fire"}, + abilities: {0: "Night Light", 1: "Frisk", H: "Flash Fire"}, }, gourgeistsuper: { inherit: true, baseStats: {hp: 85, atk: 100, def: 122, spa: 45, spd: 88, spe: 54}, - abilities: {0: "Pickup", 1: "Frisk", H: "Flash Fire"}, + abilities: {0: "Night Light", 1: "Frisk", H: "Flash Fire"}, }, bergmite: { inherit: true, @@ -2489,10 +2544,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, types: ["Ice", "Water"], abilities: {0: "Refrigerate", 1: "Ice Body", H: "Sturdy"}, - otherFormes: ["Avalugg-Hisui"],//to remove when gen 9 - formeOrder: ["Avalugg", "Avalugg-Hisui"],//to remove when gen 9 + otherFormes: ["Avalugg-Hisui"], + formeOrder: ["Avalugg", "Avalugg-Hisui"], }, - avalugghisui: {//to remove when gen 9 + avalugghisui: { num: 713, name: "Avalugg-Hisui", baseSpecies: "Avalugg", @@ -2557,17 +2612,17 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { }, //gen 7 : - dartrix: {//to remove when gen 9 + dartrix: { inherit: true, evos: ["Decidueye", "Decidueye-Hisui"], }, decidueye: { inherit: true, baseStats: {hp: 78, atk: 107, def: 85, spa: 70, spd: 100, spe: 90}, - otherFormes: ["Decidueye-Hisui"],//to remove when gen 9 - formeOrder: ["Decidueye", "Decidueye-Hisui"],//to remove when gen 9 + otherFormes: ["Decidueye-Hisui"], + formeOrder: ["Decidueye", "Decidueye-Hisui"], }, - decidueyehisui: {//to remove when gen 9 + decidueyehisui: { num: 724, name: "Decidueye-Hisui", baseSpecies: "Decidueye", @@ -2701,7 +2756,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { oranguru: { inherit: true, baseStats: {hp: 100, atk: 50, def: 90, spa: 90, spd: 110, spe: 50}, - abilities: {0: "Inner Focus", 1: "Neuroforce", H: "Divination"}, + abilities: {0: "Inner Focus", 1: "Smart Guard", H: "Divination"}, }, passimian: { inherit: true, @@ -2918,7 +2973,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { types: ["Ice"], gender: "N", baseStats: {hp: 95, atk: 95, def: 95, spa: 95, spd: 95, spe: 95}, - abilities: {0: "Ice Scales"}, + abilities: {0: "Refrigerate"}, heightm: 2.3, weightkg: 100.5, color: "Gray", @@ -3115,9 +3170,14 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, abilities: {0: "Neuroforce", 1: "Regenerator", H: "Psychic Surge"}, }, + nickit: { + inherit: true, + abilities: {0: "Racketeering", 1: "Unburden", H: "Stakeout"}, + }, thievul: { inherit: true, baseStats: {hp: 70, atk: 58, def: 58, spa: 102, spd: 92, spe: 100}, + abilities: {0: "Sleight of Hand", 1: "Unburden", H: "Stakeout"}, }, eldegoss: { inherit: true, @@ -3211,13 +3271,18 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { eggGroups: ["Bug"], requiredItem: "Centiskorchite Y", }, + grapploct: { + inherit: true, + types: ["Fighting", "Water"], + }, hatterene: { inherit: true, baseStats: {hp: 77, atk: 70, def: 95, spa: 136, spd: 103, spe: 29}, }, - grimmsnarl: {//to remove when gen 9 + grimmsnarl: { inherit: true, baseStats: {hp: 95, atk: 120, def: 75, spa: 75, spd: 85, spe: 60}, + abilities: {0: "Prankster", 1: "Frisk", H: "Fur Coat"}, }, obstagoon: { inherit: true, @@ -3242,27 +3307,32 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { falinks: { inherit: true, baseStats: {hp: 65, atk: 100, def: 100, spa: 60, spd: 60, spe: 85}, + abilities: {0: "Battle Armor", 1: "Defiant", H: "Strong Will"}, }, frosmoth: { inherit: true, - otherFormes: ["Frosmoth-Mega"], - formeOrder: ["Frosmoth", "Frosmoth-Mega"], - }, - frosmothmega: { - num: 873, - name: "Frosmoth-Mega", - baseSpecies: "Frosmoth", - forme: "Mega", - types: ["Ice", "Bug"], - baseStats: {hp: 70, atk: 65, def: 100, spa: 140, spd: 110, spe: 90}, - abilities: {0: "Snow Cloak"}, - heightm: 1.3, - weightkg: 42, - color: "White", - prevo: "Snom", - eggGroups: ["Bug"], - requiredItem: "Frosmite", + baseStats: {hp: 70, atk: 50, def: 60, spa: 125, spd: 90, spe: 80}, }, + // frosmoth: { + // inherit: true, + // otherFormes: ["Frosmoth-Mega"], + // formeOrder: ["Frosmoth", "Frosmoth-Mega"], + // }, + // frosmothmega: { //removed + // num: 873, + // name: "Frosmoth-Mega", + // baseSpecies: "Frosmoth", + // forme: "Mega", + // types: ["Ice", "Bug"], + // baseStats: {hp: 70, atk: 65, def: 100, spa: 140, spd: 110, spe: 90}, + // abilities: {0: "Snow Cloak"}, + // heightm: 1.3, + // weightkg: 42, + // color: "White", + // prevo: "Snom", + // eggGroups: ["Bug"], + // requiredItem: "Frosmite", + // }, morpeko: { inherit: true, baseStats: {hp: 58, atk: 115, def: 58, spa: 60, spd: 58, spe: 97}, @@ -3290,26 +3360,32 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { baseStats: {hp: 80, atk: 45, def: 125, spa: 130, spd: 60, spe: 95}, abilities: {0: "Light Metal", 1: "Clear Body", H: "Stalwart"}, }, - /*zacian: {//to remove when gen 9 + /*zacian: { inherit: true, baseStats: {hp: 92, atk: 115, def: 115, spa: 115, spd: 115, spe: 118}, }, - zaciancrowned: {//to remove when gen 9 + zaciancrowned: { inherit: true, baseStats: {hp: 92, atk: 145, def: 100, spa: 145, spd: 100, spe: 138}, }, - zamazenta: {//to remove when gen 9 + zamazenta: { inherit: true, baseStats: {hp: 92, atk: 115, def: 115, spa: 115, spd: 115, spe: 118}, },*/ zacian: { inherit: true, - baseStats: {hp: 92, atk: 120, def: 115, spa: 80, spd: 115, spe: 138}, + abilities: {0: "Justified"}, + baseStats: {hp: 92, atk: 120, def: 115, spa: 80, spd: 115, spe: 128}, }, zaciancrowned: { inherit: true, baseStats: {hp: 92, atk: 150, def: 115, spa: 100, spd: 115, spe: 148}, }, + zamazenta: { + inherit: true, + abilities: {0: "Justified"}, + baseStats: {hp: 92, atk: 120, def: 115, spa: 80, spd: 115, spe: 128}, + }, zamazentacrowned: { inherit: true, baseStats: {hp: 92, atk: 130, def: 145, spa: 80, spd: 145, spe: 128}, @@ -3326,11 +3402,15 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { inherit: true, baseStats: {hp: 100, atk: 65, def: 65, spa: 145, spd: 80, spe: 125}, }, + calyrexice: { + inherit: true, + types: ["Grass", "Ice"], + }, calyrexshadow: { inherit: true, baseStats: {hp: 100, atk: 85, def: 85, spa: 165, spd: 100, spe: 145}, }, - wyrdeer: {//to remove when gen 9 + wyrdeer: { num: 899, name: "Wyrdeer", types: ["Normal", "Psychic"], @@ -3344,11 +3424,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evoCondition: "Use Agile style Psyshield Bash 20 times", eggGroups: ["Field"], }, - /*wyrdeer: { - inherit: true, - abilities: {0: "Intimidate", 1: "Fur Coat", H: "Sap Sipper"}, - },*/ - kleavor: {//to remove when gen 9 + kleavor: { num: 900, name: "Kleavor", types: ["Bug", "Rock"], @@ -3362,7 +3438,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evoCondition: "Black Augurite", eggGroups: ["Bug"], }, - ursaluna: {//to remove when gen 9 + ursaluna: { num: 901, name: "Ursaluna", types: ["Normal", "Ground"], @@ -3376,7 +3452,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evoCondition: "Peat Block when there's a full moon", eggGroups: ["Field"], }, - basculegion: {//to remove when gen 9 + basculegion: { num: 902, name: "Basculegion", baseForme: "M", @@ -3394,7 +3470,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { otherFormes: ["Basculegion-F"], formeOrder: ["Basculegion", "Basculegion-F"], }, - basculegionf: {//to remove when gen 9 + basculegionf: { num: 902, name: "Basculegion-F", baseSpecies: "Basculegion", @@ -3411,7 +3487,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evoCondition: "Receive 294+ recoil without fainting", eggGroups: ["Water 2"], }, - sneasler: {//to remove when gen 9 + sneasler: { num: 903, name: "Sneasler", types: ["Fighting", "Poison"], @@ -3426,7 +3502,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evoCondition: "during the day", eggGroups: ["Field"], }, - overqwil: {//to remove when gen 9 + overqwil: { num: 904, name: "Overqwil", types: ["Dark", "Poison"], @@ -3440,7 +3516,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { evoCondition: "Use Strong style Barb Barrage 20 times", eggGroups: ["Water 2"], }, - enamorus: {//to remove when gen 9 + enamorus: { num: 905, name: "Enamorus", baseForme: "Incarnate", @@ -3455,7 +3531,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { otherFormes: ["Enamorus-Therian"], formeOrder: ["Enamorus", "Enamorus-Therian"], }, - enamorustherian: {//to remove when gen 9 + enamorustherian: { num: 905, name: "Enamorus-Therian", baseSpecies: "Enamorus", @@ -4181,7 +4257,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { types: ["Dragon", "Dark"], gender: "N", baseStats: {hp: 105, atk: 139, def: 71, spa: 55, spd: 101, spe: 119}, - abilities: {0: "Protosynthesis", H: "Aerilate"}, + abilities: {0: "Protosynthesis", H: "Anger Point"}, heightm: 2, weightkg: 380, color: "Green", @@ -4389,7 +4465,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { name: "Magthief", types: ["Flying", "Dark"], baseStats: {hp: 60, atk: 75, def: 70, spa: 45, spd: 70, spe: 95}, - abilities: {0: "Racketeering", 1: "Racketeering", H: "Keen Eye"}, + abilities: {0: "Racketeering", H: "Keen Eye"}, heightm: 0.7, weightkg: 14, evos: ["Snobberaven"], @@ -4399,7 +4475,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { name: "Snobberaven", types: ["Flying", "Dark"], baseStats: {hp: 90, atk: 50, def: 95, spa: 120, spd: 95, spe: 80}, - abilities: {0: "Snobbery", 1: "Snobbery", H: "Wonder Skin"}, + abilities: {0: "Snobbery", H: "Wonder Skin"}, heightm: 2.3, weightkg: 70, prevo: "Magthief", @@ -4876,15 +4952,15 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { weightkg: 60, prevo: "Snolbom", }, - snobawcus: { - num: 2052, - name: "Snobawcus", - types: ["Bug", "Ice"], - baseStats: {hp: 70, atk: 75, def: 130, spa: 40, spd: 85, spe: 60}, - abilities: {0: "Thick Fat", 1: "Shell Armor", H: "Pure Power"}, - heightm: 1.2, - weightkg: 60, - }, + // snobawcus: { + // num: 2052, + // name: "Snobawcus", + // types: ["Bug", "Ice"], + // baseStats: {hp: 70, atk: 75, def: 130, spa: 40, spd: 85, spe: 60}, + // abilities: {0: "Thick Fat", 1: "Shell Armor", H: "Pure Power"}, + // heightm: 1.2, + // weightkg: 60, + // }, leechuption: { num: 2057, name: "Leechuption", @@ -4958,8 +5034,8 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { num: 2063, name: "Slendawful", types: ["Ghost", "Dark"], - baseStats: {hp: 50, atk: 110, def: 80, spa: 100, spd: 80, spe: 90}, - abilities: {0: "Pressure", H: "Infiltrator"}, + baseStats: {hp: 70, atk: 130, def: 90, spa: 110, spd: 90, spe: 110}, + abilities: {0: "Pressure"}, heightm: 3, weightkg: 50, color: "Black", @@ -5188,4 +5264,48 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = { prevo: "Raticate", eggGroups: ["Field"], }, + golrobot: { + num: 3003, + name: "Golrobot", + types: ["Ground", "Ghost"], + baseStats: {hp: 119, atk: 134, def: 90, spa: 45, spd: 80, spe: 75}, + abilities: {0: "Iron Fist", 1: "Smart Guard", H: "Invincible"}, + heightm: 3, + weightkg: 999.9, + prevo: "Golurk", + eggGroups: ["Mineral"], + }, + sautropius: { + num: 3004, + name: "Sautropius", + types: ["Grass", "Flying"], + baseStats: {hp: 109, atk: 102, def: 93, spa: 68, spd: 87, spe: 81}, + abilities: {0: "Chlorophyll", 1: "Ripen", H: "Unburden"}, + heightm: 3, + weightkg: 400, + prevo: "Tropius", + eggGroups: ["Monster", "Grass"], + }, + meltic: { + num: 3005, + name: "Meltic", + types: ["Ice", "Water"], + baseStats: {hp: 100, atk: 135, def: 80, spa: 85, spd: 80, spe: 75}, + abilities: {0: "Icebreaker", 1: "Slush Rush", H: "Swift Swim"}, + heightm: 2.8, + weightkg: 200, + prevo: "Beartic", + eggGroups: ["Field"], + }, + sithbull: { + num: 3006, + name: "Sithbull", + types: ["Fairy", "Dark"], + baseStats: {hp: 120, atk: 140, def: 90, spa: 60, spd: 75, spe: 45}, + abilities: {0: "Intimidate", 1: "Shadow Tag", H: "Cursed Body"}, + heightm: 1.71, + weightkg: 123, + prevo: "Granbull", + eggGroups: ["Field", "Fairy"], + }, } \ No newline at end of file diff --git a/data/mods/agoldenexperience/scripts.ts b/data/mods/agoldenexperience/scripts.ts index 5f3ee9f400..4057389999 100644 --- a/data/mods/agoldenexperience/scripts.ts +++ b/data/mods/agoldenexperience/scripts.ts @@ -1,6 +1,4 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { - /*inherit: 'gen9', - gen: 9,*/ canMegaEvo(pokemon) { const altForme = pokemon.baseSpecies.otherFormes && this.dex.getSpecies(pokemon.baseSpecies.otherFormes[0]); const item = pokemon.getItem(); @@ -16,9 +14,6 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { else if (item.name === "Zoroarkite" && pokemon.baseSpecies.name === "Zoroark-Hisui") { return null; } - else if (item.name === "Magcargonite" && pokemon.baseSpecies.name === "Magcargo-Sinnoh") { - return null; - } else if (item.name === "Scizorite" && pokemon.baseSpecies.name === "Scizor") { return "Scizor-Mega"; } @@ -28,6 +23,9 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { else if (item.name === "Typhlosionite" && pokemon.baseSpecies.name === "Typhlosion-Hisui") { return null; } + else if (item.name === "Magcargonite" && pokemon.baseSpecies.name === "Magcargo-Sinnoh") { + return null; + } else if (item.name === "Meteor Fragment" && pokemon.baseSpecies.name === "Rayquaza") { return "Rayquaza-Mega"; } @@ -40,10 +38,6 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { return item.megaStone; }, - //inherit: 'gen8', - //gen: 8, - //init: function() { - init() { //stolen from optimons x const addNewMoves = (pokemonid: string, moveids: string[]) => { @@ -75,8 +69,6 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { addNewMoves('weavile',['trailblaze']); addNewMoves('wigglytuff',['trailblaze']); - - //addNewMoves('wigglytuff', ['nastyplot']); addNewMoves('dugtrio', ['swordsdance']); addNewMoves('dugtrioalola', ['swordsdance']); addNewMoves('golduck', ['nastyplot', "powergem"]); @@ -241,7 +233,6 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'abomasnow').learnset.mountaingale = ['8L1']; this.modData('Learnsets', 'crabominable').learnset.mountaingale = ['8L1']; this.modData('Learnsets', 'beartic').learnset.mountaingale = ['8L1']; - this.modData('Learnsets', 'snobawcus').learnset.mountaingale = ['8L1']; this.modData('Learnsets', 'glastrier').learnset.mountaingale = ['8L1']; this.modData('Learnsets', 'mamoswine').learnset.mountaingale = ['8L1']; @@ -346,6 +337,9 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'rapidash').learnset.backfire = ['8L1']; // highwater + this.modData('Learnsets', 'squirtle').learnset.highwater = ['8T']; + this.modData('Learnsets', 'wartortle').learnset.highwater = ['8T']; + this.modData('Learnsets', 'blastoise').learnset.highwater = ['8T']; this.modData('Learnsets', 'poliwrath').learnset.highwater = ['8T']; this.modData('Learnsets', 'dewgong').learnset.highwater = ['8T']; this.modData('Learnsets', 'vaporeon').learnset.highwater = ['8T']; @@ -361,6 +355,24 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'dragalge').learnset.highwater = ['8T']; this.modData('Learnsets', 'araquanid').learnset.highwater = ['8T']; this.modData('Learnsets', 'grapploct').learnset.highwater = ['8T']; + this.modData('Learnsets', 'medidragon').learnset.highwater = ['8T']; + + // seajaws + this.modData('Learnsets', 'dracovish').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'gyarados').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'samurott').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'barraskewda').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'sharpedo').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'bruxish').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'drednaw').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'feraligatr').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'basculin').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'basculegion').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'basculegionf').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'carracosta').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'arctovish').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'huntail').learnset.seajaws = ['8L1']; + this.modData('Learnsets', 'relicanth').learnset.seajaws = ['8L1']; // parallelcircuit this.modData('Learnsets', 'ironhands').learnset.parallelcircuit = ['8L1']; @@ -370,12 +382,29 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'thundurus').learnset.parallelcircuit = ['8L1']; this.modData('Learnsets', 'morpeko').learnset.parallelcircuit = ['8L1']; this.modData('Learnsets', 'zeraora').learnset.parallelcircuit = ['8L1']; - this.modData('Learnsets', 'jaboraishi').learnset.parallelcircuit = ['8L1']; this.modData('Learnsets', 'pincurchin').learnset.parallelcircuit = ['8L1']; this.modData('Learnsets', 'zebstrika').learnset.parallelcircuit = ['8L1']; this.modData('Learnsets', 'pikachu').learnset.parallelcircuit = ['8L1']; this.modData('Learnsets', 'pawmi').learnset.parallelcircuit = ['8L1']; + // musclecare + this.modData('Learnsets', 'poliwrath').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'machop').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'tyrogue').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'makuhita').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'meditite').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'riolu').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'sawk').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'throh').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'hawlucha').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'passimian').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'buzzwole').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'cinderace').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'kubfu').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'quaquaval').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'mystao').learnset.musclecare = ['8L1']; + this.modData('Learnsets', 'tapuwala').learnset.musclecare = ['8L1']; + // dissolution this.modData('Learnsets', 'arbok').learnset.dissolution = ['8T']; this.modData('Learnsets', 'grimer').learnset.dissolution = ['8T']; @@ -562,8 +591,10 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'dhelmise').learnset.punishingblow = ['8L1']; this.modData('Learnsets', 'golurk').learnset.punishingblow = ['8L1']; this.modData('Learnsets', 'mimikyu').learnset.punishingblow = ['8L1']; - this.modData('Learnsets', 'paranormear').learnset.punishingblow = ['8L1']; + this.modData('Learnsets', 'annihilape').learnset.punishingblow = ['8L1']; this.modData('Learnsets', 'slendawful').learnset.punishingblow = ['8L1']; + this.modData('Learnsets', 'paranormear').learnset.punishingblow = ['8L1']; + this.modData('Learnsets', 'baskiron').learnset.punishingblow = ['8L1']; // condensate this.modData('Learnsets', 'ninetalesalola').learnset.condensate = ['8L1']; @@ -636,9 +667,9 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'arctozolt').learnset.chillblain = ['8L1']; // indomitablespirit + this.modData('Learnsets', 'gastly').learnset.indomitablespirit = ['8T']; this.modData('Learnsets', 'croagunk').learnset.indomitablespirit = ['8T']; this.modData('Learnsets', 'snorunt').learnset.indomitablespirit = ['8T']; - this.modData('Learnsets', 'gastly').learnset.indomitablespirit = ['8T']; this.modData('Learnsets', 'marowakalola').learnset.indomitablespirit = ['8T']; this.modData('Learnsets', 'sandygast').learnset.indomitablespirit = ['8T']; this.modData('Learnsets', 'hawlucha').learnset.indomitablespirit = ['8T']; @@ -652,8 +683,8 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { // monkeypunch this.modData('Learnsets', 'primeape').learnset.monkeypunch = ['8L1']; - this.modData('Learnsets', 'oranguru').learnset.monkeypunch = ['8L1']; this.modData('Learnsets', 'infernape').learnset.monkeypunch = ['8L1']; + this.modData('Learnsets', 'oranguru').learnset.monkeypunch = ['8L1']; this.modData('Learnsets', 'zarude').learnset.monkeypunch = ['8L1']; // cosmicpunch @@ -673,43 +704,43 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'giratina').learnset.draconiccurse = ['8L1']; // draconicfury - this.modData('Learnsets', 'rayquaza').learnset.draconicfury = ['8L1']; - this.modData('Learnsets', 'zekrom').learnset.draconicfury = ['8L1']; - this.modData('Learnsets', 'kommoo').learnset.draconicfury = ['8L1']; - this.modData('Learnsets', 'salamence').learnset.draconicfury = ['8L1']; this.modData('Learnsets', 'dragonite').learnset.draconicfury = ['8L1']; - this.modData('Learnsets', 'hydreigon').learnset.draconicfury = ['8L1']; + this.modData('Learnsets', 'salamence').learnset.draconicfury = ['8L1']; + this.modData('Learnsets', 'rayquaza').learnset.draconicfury = ['8L1']; this.modData('Learnsets', 'haxorus').learnset.draconicfury = ['8L1']; this.modData('Learnsets', 'druddigon').learnset.draconicfury = ['8L1']; + this.modData('Learnsets', 'hydreigon').learnset.draconicfury = ['8L1']; + this.modData('Learnsets', 'zekrom').learnset.draconicfury = ['8L1']; this.modData('Learnsets', 'tyrantrum').learnset.draconicfury = ['8L1']; + this.modData('Learnsets', 'kommoo').learnset.draconicfury = ['8L1']; this.modData('Learnsets', 'guzzlord').learnset.draconicfury = ['8L1']; this.modData('Learnsets', 'regidrago').learnset.draconicfury = ['8L1']; // contrariety + this.modData('Learnsets', 'houndour').learnset.contrariety = ['8T']; + this.modData('Learnsets', 'larvitar').learnset.contrariety = ['8T']; + this.modData('Learnsets', 'carvanha').learnset.contrariety = ['8T']; this.modData('Learnsets', 'pawniard').learnset.contrariety = ['8T']; this.modData('Learnsets', 'sandile').learnset.contrariety = ['8T']; - this.modData('Learnsets', 'carvanha').learnset.contrariety = ['8T']; - this.modData('Learnsets', 'larvitar').learnset.contrariety = ['8T']; this.modData('Learnsets', 'zorua').learnset.contrariety = ['8T']; + this.modData('Learnsets', 'tyrunt').learnset.contrariety = ['8T']; this.modData('Learnsets', 'inkay').learnset.contrariety = ['8T']; - this.modData('Learnsets', 'guzzlord').learnset.contrariety = ['8T']; this.modData('Learnsets', 'rowlet').learnset.contrariety = ['8T']; - this.modData('Learnsets', 'tyrunt').learnset.contrariety = ['8T']; - this.modData('Learnsets', 'houndour').learnset.contrariety = ['8T']; + this.modData('Learnsets', 'guzzlord').learnset.contrariety = ['8T']; // hypnotichorror - this.modData('Learnsets', 'darkrai').learnset.hypnotichorror = ['8T']; - this.modData('Learnsets', 'malamar').learnset.hypnotichorror = ['8T']; - this.modData('Learnsets', 'spiritomb').learnset.hypnotichorror = ['8T']; this.modData('Learnsets', 'gengar').learnset.hypnotichorror = ['8T']; - this.modData('Learnsets', 'chandelure').learnset.hypnotichorror = ['8T']; this.modData('Learnsets', 'hypno').learnset.hypnotichorror = ['8T']; + this.modData('Learnsets', 'spiritomb').learnset.hypnotichorror = ['8T']; + this.modData('Learnsets', 'darkrai').learnset.hypnotichorror = ['8T']; this.modData('Learnsets', 'zorua').learnset.hypnotichorror = ['8T']; this.modData('Learnsets', 'zoruahisui').learnset.hypnotichorror = ['8T']; this.modData('Learnsets', 'zoroark').learnset.hypnotichorror = ['8T']; this.modData('Learnsets', 'zoroarkhisui').learnset.hypnotichorror = ['8T']; - this.modData('Learnsets', 'slendawful').learnset.hypnotichorror = ['8T']; + this.modData('Learnsets', 'chandelure').learnset.hypnotichorror = ['8T']; + this.modData('Learnsets', 'malamar').learnset.hypnotichorror = ['8T']; this.modData('Learnsets', 'paranormear').learnset.hypnotichorror = ['8T']; + this.modData('Learnsets', 'slendawful').learnset.hypnotichorror = ['8T']; // sneakyassault this.modData('Learnsets', 'rattataalola').learnset.sneakyassault = ['8L1']; @@ -804,36 +835,42 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'rockster').learnset.mercuryshot = ['8T']; // chakraterrain - this.modData('Learnsets', 'riolu').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'lucario').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'infernape').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'meditite').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'medicham').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'throh').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'sawk').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'kubfu').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'urshifurapidstrike').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'urshifu').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'mienfoo').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'mienshao').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'tyrogue').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'hitmonchan').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'hitmonlee').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'mew').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'tyrogue').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'hitmontop').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'ralts').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'kirlia').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'gardevoir').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'gallade').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'meditite').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'medicham').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'infernape').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'riolu').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'lucario').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'throh').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'sawk').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'mienfoo').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'mienshao').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'cobalion').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'terrakion').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'virizion').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'keldeo').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'kubfu').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'urshifurapidstrike').learnset.chakraterrain = ['8L1']; + this.modData('Learnsets', 'urshifu').learnset.chakraterrain = ['8L1']; this.modData('Learnsets', 'mystao').learnset.chakraterrain = ['8L1']; - this.modData('Learnsets', 'mew').learnset.chakraterrain = ['8L1']; //New movepool changes : //gen 1: + delete this.modData('Learnsets', 'squirtle').learnset.shellsmash; + delete this.modData('Learnsets', 'wartortle').learnset.shellsmash; + delete this.modData('Learnsets', 'blastoise').learnset.shellsmash; + this.modData('Learnsets', 'squirtle').learnset.calmmind = ['8L1']; + this.modData('Learnsets', 'wartortle').learnset.calmmind = ['8L1']; + this.modData('Learnsets', 'blastoise').learnset.calmmind = ['8L1']; this.modData('Learnsets', 'pidgeot').learnset.focusblast = ['8L1']; this.modData('Learnsets', 'spearow').learnset.bravebird = ['8L1']; this.modData('Learnsets', 'arbok').learnset.meanlook = ['8L1']; @@ -889,6 +926,7 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'dewgong').learnset.flipturn = ['8L1']; this.modData('Learnsets', 'muk').learnset.toxicspikes = ['8L1']; this.modData('Learnsets', 'mukalola').learnset.toxicspikes = ['8L1']; + this.modData('Learnsets', 'electrode').learnset.wildcharge = ['8L1']; this.modData('Learnsets', 'exeggutor').learnset.focusblast = ['8L1']; this.modData('Learnsets', 'exeggutor').learnset.aurasphere = ['8L1']; this.modData('Learnsets', 'marowak').learnset.rockpolish = ['8L1']; @@ -896,6 +934,7 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'seaking').learnset.dragondance = ['8L1']; this.modData('Learnsets', 'starmie').learnset.calmmind = ['8L1']; this.modData('Learnsets', 'starmie').learnset.futuresight = ['8L1']; + this.modData('Learnsets', 'starmie').learnset.storedpower = ['8L1']; this.modData('Learnsets', 'pinsir').learnset.megahorn = ['8L1']; this.modData('Learnsets', 'vaporeon').learnset.bouncybubble = ['8L1']; this.modData('Learnsets', 'jolteon').learnset.buzzybuzz = ['8L1']; @@ -968,6 +1007,7 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'whismur').learnset.sonicboom = ['8L1']; this.modData('Learnsets', 'makuhita').learnset.drainpunch = ['8L1']; this.modData('Learnsets', 'hariyama').learnset.machpunch = ['8L1']; + this.modData('Learnsets', 'hariyama').learnset.courtchange = ['8L1']; this.modData('Learnsets', 'delcatty').learnset.slackoff = ['8L1']; this.modData('Learnsets', 'wailord').learnset.flipturn = ['8L1']; this.modData('Learnsets', 'wailord').learnset.slackoff = ['8L1']; @@ -989,6 +1029,10 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'castform').learnset.moonlight = ['8L1']; this.modData('Learnsets', 'castform').learnset.triattack = ['8L1']; this.modData('Learnsets', 'banette').learnset.poltergeist = ['8L1']; + this.modData('Learnsets', 'banette').learnset.mefirst = ['8L1']; + this.modData('Learnsets', 'banette').learnset.copycat = ['8L1']; + this.modData('Learnsets', 'banette').learnset.focuspunch = ['8L1']; + this.modData('Learnsets', 'banette').learnset.encore = ['8L1']; this.modData('Learnsets', 'chimecho').learnset.mysticalfire = ['8L1']; this.modData('Learnsets', 'chimecho').learnset.teleport = ['8L1']; this.modData('Learnsets', 'chimecho').learnset.detectmagic = ['8L1']; @@ -998,6 +1042,7 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'glalie').learnset.recover = ['8L1']; this.modData('Learnsets', 'walrein').learnset.slackoff = ['8L1']; this.modData('Learnsets', 'walrein').learnset.iciclecrash = ['8L1']; + this.modData('Learnsets', 'walrein').learnset.iceshard = ['8L1']; this.modData('Learnsets', 'relicanth').learnset.flipturn = ['8L1']; this.modData('Learnsets', 'regirock').learnset.shoreup = ['8L1']; this.modData('Learnsets', 'metagross').learnset.skullbash = ['8L1']; @@ -1105,6 +1150,22 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'giratina').learnset.teleport = ['8L1']; this.modData('Learnsets', 'phione').learnset.takeheart = ['8L1']; this.modData('Learnsets', 'manaphy').learnset.takeheart = ['8L1']; + this.modData("Learnsets", "arceus").learnset.healingwish = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.hydropump = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.taunt = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.imprison = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.bulkup = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.dragondance = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.flareblitz = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.powergem = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.gunkshot = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.heavyslam = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.foulplay = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.storedpower = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.hex = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.hurricane = ["8L1"]; + this.modData("Learnsets", "arceus").learnset.bodypress = ["8L1"]; + //gen 5: this.modData('Learnsets', 'serperior').learnset.mudshot = ['8L1']; @@ -1144,6 +1205,7 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'zebstrika').learnset.jumpkick = ['8L1']; this.modData('Learnsets', 'zebstrika').learnset.highhorsepower = ['8L1']; this.modData('Learnsets', 'seismitoad').learnset.gunkshot = ['8L1']; + this.modData('Learnsets', 'throh').learnset.bodypress = ['8L1']; this.modData('Learnsets', 'krookodile').learnset.partingshot = ['8L1']; this.modData('Learnsets', 'darmanitan').learnset.recover = ['8L1']; this.modData('Learnsets', 'darmanitan').learnset.psyshock = ['8L1']; @@ -1157,6 +1219,7 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'maractus').learnset.sandattack = ['8L1']; this.modData('Learnsets', 'crustle').learnset.crabhammer = ['8L1']; this.modData('Learnsets', 'crustle').learnset.brickbreak = ['8L1']; + this.modData('Learnsets', 'crustle').learnset.painsplit = ['8L1']; this.modData('Learnsets', 'scrafty').learnset.gunkshot = ['8L1']; this.modData('Learnsets', 'sigilyph').learnset.hurricane = ['8L1']; this.modData('Learnsets', 'sigilyph').learnset.focusblast = ['8L1']; @@ -1307,6 +1370,7 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'hatterene').learnset.moonblast = ['8L1']; this.modData('Learnsets', 'hatterene').learnset.teleport = ['8L1']; this.modData('Learnsets', 'hatterene').learnset.moonlight = ['8L1']; + this.modData('Learnsets', 'grimmsnarl').learnset.partingshot = ['8L1']; this.modData('Learnsets', 'obstagoon').learnset.pursuit = ['8L1']; this.modData('Learnsets', 'perrserker').learnset.bulletpunch = ['8L1']; this.modData('Learnsets', 'cursola').learnset.trickroom = ['8L1']; @@ -1314,6 +1378,8 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'alcremie').learnset.moonblast = ['8L1']; this.modData('Learnsets', 'falinks').learnset.sacredsword = ['8L1']; this.modData('Learnsets', 'falinks').learnset.stompingtantrum = ['8L1']; + this.modData('Learnsets', 'frosmoth').learnset.roost = ['8L1']; + this.modData('Learnsets', 'frosmoth').learnset.freezedry = ['8L1']; this.modData('Learnsets', 'pincurchin').learnset.voltswitch = ['8L1']; this.modData('Learnsets', 'duraludon').learnset.focusblast = ['8L1']; this.modData('Learnsets', 'duraludon').learnset.signalbeam = ['8L1']; @@ -1321,6 +1387,7 @@ export const Scripts: {[k: string]: ModdedBattleScriptsData} = { this.modData('Learnsets', 'duraludon').learnset.fireblast = ['8L1']; this.modData('Learnsets', 'duraludon').learnset.icebeam = ['8L1']; this.modData('Learnsets', 'duraludon').learnset.flamethrower = ['8L1']; + this.modData('Learnsets', 'zacian').learnset.poisonjab = ['8L1']; this.modData('Learnsets', 'zamazenta').learnset.bodypress = ['8L1']; this.modData('Learnsets', 'zamazenta').learnset.moonlight = ['8L1']; this.modData('Learnsets', 'zamazenta').learnset.bulkup = ['8L1'];