From 9b4c9617bb80deb7294300ea63c8aff927f225d9 Mon Sep 17 00:00:00 2001 From: Rhythms Date: Sat, 25 Apr 2015 13:15:40 -0600 Subject: [PATCH] Seasonal: Rank Changes - Promoted Acedia and Audiosurfer. - Fixed one of Diatom's ranks. - Moved shaymin's and MattL's moves to the correct areas, as well as Acedia's and Audiosurfer's. --- config/formats.js | 148 +++++++++++++++++++++++----------------------- data/scripts.js | 24 ++++---- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/config/formats.js b/config/formats.js index 00875842eb..c81c124cb3 100644 --- a/config/formats.js +++ b/config/formats.js @@ -1108,6 +1108,9 @@ exports.Formats = [ } // Mods. + if (name === 'acedia') { + this.add('c|@Acedia|Time for a true display of skill ( ͡° ͜ʖ ͡°)'); + } if (name === 'am') { this.add('c|@AM|Lucky and Bad'); } @@ -1121,6 +1124,17 @@ exports.Formats = [ sentences = ["Steel waters run deep, they say!", "I will insteell fear in your heart!", "Man the harpuns!"].randomize(); this.add('c|@asgdf|' + sentences[0]); } + if (name === 'audiosurfer') { + pokemon.phraseIndex = this.random(3); + if (pokemon.phraseIndex === 2) { + var singers = ['Waxahatchee', 'Speedy Ortiz', 'Sufjan Stevens', 'Kendrick Lamar']; + this.add('c|@Audiosurfer|Have you heard the new ' + singers[this.random(4)] + ' song?'); + } else if (pokemon.phraseIndex === 1) { + this.add('c|@Audiosurfer|If you were worth playing you wouldn\'t be on the ladder.'); + } else { + this.add('c|@Audiosurfer| Just came back from surfing. Don\'t believe me? Here\'s a pic: http://fc02.deviantart.net/fs70/i/2011/352/d/3/surf_all_the_oceans_by_dawn_shade-d4jga6b.png'); + } + } if (name === 'barton') { this.add('c|@barton|free passion'); } @@ -1406,9 +1420,6 @@ exports.Formats = [ } // Drivers. - if (name === 'acedia') { - this.add('c|%Acedia|Time for a true display of skill ( ͡° ͜ʖ ͡°)'); - } if (name === 'aelita') { this.add('c|%Aelita|Transfer: Aelita. Scanner: Aelita. Virtualization!'); } @@ -1426,17 +1437,6 @@ exports.Formats = [ if (name === 'astyanax') { this.add('c|%Astyanax|:^) Top kek'); } - if (name === 'audiosurfer') { - pokemon.phraseIndex = this.random(3); - if (pokemon.phraseIndex === 2) { - var singers = ['Waxahatchee', 'Speedy Ortiz', 'Sufjan Stevens', 'Kendrick Lamar']; - this.add('c|%Audiosurfer|Have you heard the new ' + singers[this.random(4)] + ' song?'); - } else if (pokemon.phraseIndex === 1) { - this.add('c|%Audiosurfer|If you were worth playing you wouldn\'t be on the ladder.'); - } else { - this.add('c|%Audiosurfer| Just came back from surfing. Don\'t believe me? Here\'s a pic: http://fc02.deviantart.net/fs70/i/2011/352/d/3/surf_all_the_oceans_by_dawn_shade-d4jga6b.png'); - } - } if (name === 'birkal') { this.add('c|%Birkal|caw'); } @@ -1691,6 +1691,9 @@ exports.Formats = [ } // Mods. + if (name === 'acedia') { + this.add('c|@Acedia|My dad smoked his whole life. One day my mom told him "If you want to see your children graduate, you have to stop". 3 years later he died of lung cancer. My mom told me "Dont smoke; dont put your family through this". At 24, I have never touched a cigarette. I must say, I feel a sense of regret, because watching you play Pokemon gave me cancer anyway ( ͝° ͜ʖ͡°)'); + } if (name === 'am') { this.add('c|@AM|RIP'); } @@ -1703,6 +1706,15 @@ exports.Formats = [ if (name === 'asgdf') { this.add('c|@asgdf|' + ['Looks like I spoke too hasteely', 'You only won because I couldn\'t think of a penguin pun!'][this.random(2)]); } + if (name === 'audiosurfer') { + if (pokemon.phraseIndex === 2) { + this.add('c|@Audiosurfer|No? Well you should check it out.'); + } else if (pokemon.phraseIndex === 1) { + this.add('c|@Audiosurfer|You should consider Battling 101 friend.'); + } else { + this.add('c|@Audiosurfer|Back to catching waves.'); + } + } if (name === 'barton') { this.add('c|@barton|' + ['ok', 'haha?'][this.random(2)]); } @@ -1969,9 +1981,6 @@ exports.Formats = [ } // Drivers. - if (name === 'acedia') { - this.add('c|%Acedia|My dad smoked his whole life. One day my mom told him "If you want to see your children graduate, you have to stop". 3 years later he died of lung cancer. My mom told me "Dont smoke; dont put your family through this". At 24, I have never touched a cigarette. I must say, I feel a sense of regret, because watching you play Pokemon gave me cancer anyway ( ͝° ͜ʖ͡°)'); - } if (name === 'aelita') { sentences = ['Oh no, the Scyphozoa\'s here!', 'Devirtualized...', 'Stones. Aelita Stones. Like the rock group. I\'m Odd\'s cousin from Canada.']; this.add('c|%Aelita|' + sentences[this.random(3)]); @@ -1991,15 +2000,6 @@ exports.Formats = [ if (name === 'astyanax') { this.add('c|%Astyanax|:^( Bottom kek'); } - if (name === 'audiosurfer') { - if (pokemon.phraseIndex === 2) { - this.add('c|%Audiosurfer|No? Well you should check it out.'); - } else if (pokemon.phraseIndex === 1) { - this.add('c|%Audiosurfer|You should consider Battling 101 friend.'); - } else { - this.add('c|%Audiosurfer|Back to catching waves.'); - } - } if (name === 'birkal') { this.add('c|%Birkal|//birkal'); } @@ -2465,6 +2465,18 @@ exports.Formats = [ } // Mod signature moves. + if (move.id === 'worryseed' && name === 'acedia') { + move.name = 'Procrastination'; + move.onHit = function (pokemon, source) { + var oldAbility = pokemon.setAbility('slowstart'); + if (oldAbility) { + this.add('-ability', pokemon, 'Slow Start', '[from] move: Procrastination'); + if (this.random(100) < 10) source.faint(); + return; + } + return false; + }; + } if (move.id === 'pursuit' && name === 'am') { move.name = 'Predator'; move.basePowerCallback = function (pokemon, target) { @@ -2522,6 +2534,23 @@ exports.Formats = [ } }; } + if (move.id === 'detect' && name === 'audiosurfer') { + move.name = 'Audioshield'; + move.secondary = {chance: 50, self: {boosts: {accuracy:-1}}}; + move.onTryHit = function (target) { + this.add('-anim', target, "Boomburst", target); + return !!this.willAct() && this.runEvent('StallMove', target); + }; + move.onHit = function (pokemon) { + var foe = pokemon.side.foe.active[0]; + if (foe.ability !== 'soundproof') { + this.add('-message', 'The Audioshield is making a deafening noise!'); + this.damage(foe.maxhp / 12, foe, pokemon); + if (this.random(2) === 1) this.boost({atk:-1, spa:-1}, foe, foe, 'noise damage'); + } + pokemon.addVolatile('stall'); + }; + } if (move.id === 'bulkup' && name === 'barton') { move.name = 'MDMA Huff'; move.boosts = {atk:2, spe:1, accuracy:-1}; @@ -2906,10 +2935,6 @@ exports.Formats = [ this.add('-anim', source, "Flamethrower", target); }; } - if (move.id === 'toxic' && name === 'mattl') { - move.name = 'Topology'; - move.self = {status: 'tox'}; - } if (move.id === 'spikes' && name === 'morfent') { move.name = 'Used Needles'; move.self = {boosts: {evasion: -1}}; @@ -3086,20 +3111,6 @@ exports.Formats = [ if (move.id === 'healingwish' && name === 'shamethat') { move.name = 'Extreme Compromise'; } - if (move.id === 'detect' && name === 'shaymin') { - move.name = 'Flower Garden'; - move.type = 'Grass'; - move.self = {boosts: {def:1, spa:1, spd:1}}; - move.onTryHit = function (target, source) { - if (source.volatiles['flowergarden']) return false; - this.attrLastMove('[still]'); - this.add('-anim', source, "Amnesia", source); - }; - move.onHit = function (target, source) { - source.addVolatile('stall'); - source.addVolatile('flowergarden'); - }; - } if (move.id === 'judgment' && name === 'shrang') { move.name = 'Pixilate'; } @@ -3337,18 +3348,6 @@ exports.Formats = [ } // Driver signature moves. - if (move.id === 'worryseed' && name === 'acedia') { - move.name = 'Procrastination'; - move.onHit = function (pokemon, source) { - var oldAbility = pokemon.setAbility('slowstart'); - if (oldAbility) { - this.add('-ability', pokemon, 'Slow Start', '[from] move: Procrastination'); - if (this.random(100) < 10) source.faint(); - return; - } - return false; - }; - } if (move.id === 'thunder' && name === 'aelita') { move.name = 'Energy Field'; move.accuracy = 100; @@ -3412,23 +3411,6 @@ exports.Formats = [ this.boost(boosts, source, source); }; } - if (move.id === 'detect' && name === 'audiosurfer') { - move.name = 'Audioshield'; - move.secondary = {chance: 50, self: {boosts: {accuracy:-1}}}; - move.onTryHit = function (target) { - this.add('-anim', target, "Boomburst", target); - return !!this.willAct() && this.runEvent('StallMove', target); - }; - move.onHit = function (pokemon) { - var foe = pokemon.side.foe.active[0]; - if (foe.ability !== 'soundproof') { - this.add('-message', 'The Audioshield is making a deafening noise!'); - this.damage(foe.maxhp / 12, foe, pokemon); - if (this.random(2) === 1) this.boost({atk:-1, spa:-1}, foe, foe, 'noise damage'); - } - pokemon.addVolatile('stall'); - }; - } if (move.id === 'spikecannon' && name === 'bloobblob') { // I fear that having two moves with id 'bulletseed' would mess with PP. move.name = 'Lava Whip'; @@ -3725,7 +3707,7 @@ exports.Formats = [ if (move.id === 'psywave') { move.accuracy = 80; move.onMoveFail = function () { - this.add('c|@Diatom|you should be thankful my psywave doesn\'t always hit'); + this.add('c|+Diatom|you should be thankful my psywave doesn\'t always hit'); }; } } @@ -3742,6 +3724,10 @@ exports.Formats = [ source.addVolatile('aquaring'); }; } + if (move.id === 'toxic' && name === 'mattl') { + move.name = 'Topology'; + move.self = {status: 'tox'}; + } if (move.id === 'swagger' && name === 'mikel') { move.accuracy = true; move.name = 'Trolling Lobby'; @@ -3775,6 +3761,20 @@ exports.Formats = [ } }; } + if (move.id === 'detect' && name === 'shaymin') { + move.name = 'Flower Garden'; + move.type = 'Grass'; + move.self = {boosts: {def:1, spa:1, spd:1}}; + move.onTryHit = function (target, source) { + if (source.volatiles['flowergarden']) return false; + this.attrLastMove('[still]'); + this.add('-anim', source, "Amnesia", source); + }; + move.onHit = function (target, source) { + source.addVolatile('stall'); + source.addVolatile('flowergarden'); + }; + } if (move.id === 'energyball' && name === 'somalia') { move.name = 'Ban Everyone'; move.basePower = 0; diff --git a/data/scripts.js b/data/scripts.js index c738d52c07..9c8c6ff445 100644 --- a/data/scripts.js +++ b/data/scripts.js @@ -3171,6 +3171,12 @@ exports.BattleScripts = { evs: {hp:4, atk:252, spe:252}, nature: 'Jolly' }, // Mods. + '@Acedia': { + species: 'Slakoth', ability: 'Magic Bounce', item: 'Quick Claw', gender: 'F', + moves: ['metronome', 'sketch', 'assist', 'swagger', 'foulplay'], + baseSignatureMove: 'worryseed', signatureMove: "Procrastination", + evs: {hp:252, atk:252, def:4}, nature: 'Serious' + }, '@AM': { species: 'Tyranitar', ability: 'Adaptability', item: (variant === 1 ? 'Lum Berry' : 'Choice Scarf'), gender: 'M', moves: (variant === 1 ? ['earthquake', 'diamondstorm', 'swordsdance', 'meanlook'] : ['knockoff', 'diamondstorm', 'earthquake']), @@ -3195,6 +3201,12 @@ exports.BattleScripts = { baseSignatureMove: 'futuresight', signatureMove: "Obscure Pun", evs: {hp:252, spa:252, def:4}, nature: 'Modest' }, + '@Audiosurfer': { + species: 'Audino', ability: 'Prankster', item: 'Audinite', gender: 'M', + moves: ['boomburst', 'slackoff', 'glare'], + baseSignatureMove: 'detect', signatureMove: "Audioshield", + evs: {hp:252, spa:252, spe:4}, nature: 'Modest' + }, '@barton': { species: 'Piloswine', ability: 'Parental Bond', item: 'Eviolite', gender: 'M', moves: ['earthquake', 'iciclecrash', 'taunt'], @@ -3549,12 +3561,6 @@ exports.BattleScripts = { evs: {atk:4, spa:252, spe:252}, nature: 'Hasty' }, // Drivers. - '%Acedia': { - species: 'Slakoth', ability: 'Magic Bounce', item: 'Quick Claw', gender: 'F', - moves: ['metronome', 'sketch', 'assist', 'swagger', 'foulplay'], - baseSignatureMove: 'worryseed', signatureMove: "Procrastination", - evs: {hp:252, atk:252, def:4}, nature: 'Serious' - }, '%Aelita': { species: 'Porygon-Z', ability: 'Protean', item: 'Life Orb', gender: 'F', moves: ['boomburst', 'quiverdance', 'chatter', 'blizzard', 'moonblast'], @@ -3589,12 +3595,6 @@ exports.BattleScripts = { baseSignatureMove: 'toxic', signatureMove: "Amphibian Toxin", evs: {atk:252, spd:252, spe:4}, nature: 'Adamant' }, - '%Audiosurfer': { - species: 'Audino', ability: 'Prankster', item: 'Audinite', gender: 'M', - moves: ['boomburst', 'slackoff', 'glare'], - baseSignatureMove: 'detect', signatureMove: "Audioshield", - evs: {hp:252, spa:252, spe:4}, nature: 'Modest' - }, '%Birkal': { species: 'Rotom-Fan', ability: 'Magic Guard', item: 'Choice Scarf', gender: 'M', moves: ['trick', 'aeroblast', ['discharge', 'partingshot', 'recover', 'tailglow'][this.random(4)]],