diff --git a/config/formats.js b/config/formats.js index 7fdb90d3ca..690cf8e84c 100644 --- a/config/formats.js +++ b/config/formats.js @@ -818,7 +818,7 @@ exports.Formats = [ this.boost({def: -1, spd: -1, atk: 1, spe: 1}, pokemon, pokemon, 'Weak Skin'); } if (name === 'snobalt') { - pokemon.addVolatile('whitemagic', pokemon); + pokemon.addVolatile('amityabsorb', pokemon); } if (name === 'spacebass') { pokemon.addVolatile('badtrip', pokemon); @@ -1141,7 +1141,7 @@ exports.Formats = [ } } if (name === 'juanma') { - this.add('c|+Juanma|I gaze into the abyss.'); + this.add("c|+Juanma|Okay, well, sometimes, science is more art than science, " + pokemon.side.name + ". A lot of people don't get that."); } if (name === 'kalalokki') { this.add('c|+Kalalokki|(•_•)'); @@ -1644,7 +1644,7 @@ exports.Formats = [ this.add('c|~Joim|' + sentences[this.random(4)]); } if (name === 'juanma') { - this.add('c|+Juanma|Your mom gazed back into me.'); + this.add("c|+Juanma|I guess you were right, now you must be the happiest person in the world, " + pokemon.side.name + "! You get to be major of 'I-told-you-so' town!"); } if (name === 'kalalokki') { this.add('c|+Kalalokki|(⌐■_■)'); diff --git a/mods/seasonal/README.md b/mods/seasonal/README.md index abcda9842e..c765bbf451 100644 --- a/mods/seasonal/README.md +++ b/mods/seasonal/README.md @@ -684,13 +684,13 @@ EVs: 252 Atk, 4 Def, 252 Spe, Nature: Adamant ### Gangnam Style Munchlax @ Eviolite -Ability: Run Away +Ability: Fur Coat -Innate Ability: Gonna Make You Sweat - Recovers 15% HP each turn. +Innate Ability: Gonna Make You Sweat - Recovers 33% HP each turn. EVs: 252 HP, 252 Atk, 4 Def, Nature: Adamant -- Geomancy +- Swords Dance - Drain Punch - Body Slam - Mother, Father, Gentleman - 15 PP Dark\Physical 70\100%. Hits 3 times. Makes contact. @@ -997,7 +997,7 @@ EVs: 4 HP, 252 SpA, 252 Spe, IVs: 0 Atk, Nature: Modest - Thunderbolt - Hurricane - Quiver Dance -- Gaster Blaster - Electric-type Hyper Beam. No recharge if this move knocks out an opponent. +- Gaster Blaster - Electric-type Hyper Beam, 165bp, 100% acc. No recharge if this move knocks out an opponent. ### Juanma Heatran @ Charcoal @@ -1518,8 +1518,8 @@ EVs: 4 Def, 252 SpA, 252 Spe, Nature: Timid - Paleo Wave - Dark Pulse -- Nasty Plot -- Cap Bust - 15 PP Fighting\Special 90\100%. Super effective against Fairy-types. +- Quiver Dance +- Cap Bust - 15 PP Fighting\Special 90\100%. Super effective against Fairy-types. Drains 50% of the damage done. ### Snowy Snover @ Focus Sash diff --git a/mods/seasonal/moves.js b/mods/seasonal/moves.js index b1fec1a778..3acaeff63a 100644 --- a/mods/seasonal/moves.js +++ b/mods/seasonal/moves.js @@ -1480,8 +1480,8 @@ exports.BattleMovedex = { }, // Joim gasterblaster: { - accuracy: 90, - basePower: 150, + accuracy: 100, + basePower: 165, category: "Special", id: "gasterblaster", isNonstandard: true, @@ -1499,6 +1499,8 @@ exports.BattleMovedex = { onAfterHit: function (target, source) { if (target.hp > 0) { source.addVolatile('mustrecharge'); + } else { + this.add("c|~Joim|You are wearing the expression of someone who's fainted a few times. Let's make it one more."); } }, secondary: false, @@ -2712,19 +2714,17 @@ exports.BattleMovedex = { this.add('-anim', source, "Grudge", source); this.add('-anim', source, "Explosion", source); }, - self: {sideCondition: 'ofcurse'}, effect: { - onSwitchIn: function (pokemon) { - pokemon.side.removeSideCondition('ofcurse'); + duration: 2, + onStart: function (pokemon) { + this.add('-start', pokemon, 'Of Curse'); + this.add('message', 'Of curse you cannot switch.'); }, - onResidual: function (side) { - if (side.active.length && side.active[0].hp) side.removeSideCondition('ofcurse'); + onEnd: function (pokemon) { + this.add('-end', pokemon, 'Of Curse'); }, - onEnd: function (side) { - const foes = side.foe.active; - if (side.active.length && side.active[0].hp && foes.length && foes[0].hp) { - foes[0].addVolatile('trapped', side.active[0], 'meanlook', 'trapper'); - } + onTrapPokemon: function (pokemon) { + pokemon.tryTrap(); }, }, boosts: { diff --git a/mods/seasonal/scripts.js b/mods/seasonal/scripts.js index b816bc3abb..375b45af9b 100644 --- a/mods/seasonal/scripts.js +++ b/mods/seasonal/scripts.js @@ -306,8 +306,8 @@ exports.BattleScripts = { evs: {atk:252, def:4, spe:252}, nature: 'Adamant', }, 'Gangnam Style': { - species: 'Munchlax', ability: 'Run Away', item: 'Eviolite', gender: 'M', - moves: ['geomancy', 'drainpunch', 'bodyslam'], + species: 'Munchlax', ability: 'Fur Coat', item: 'Eviolite', gender: 'M', + moves: ['swordsdance', 'drainpunch', 'bodyslam'], signatureMove: "Mother, Father, Gentleman", evs: {hp:252, atk:252, def:4}, nature: 'Adamant', }, @@ -691,7 +691,7 @@ exports.BattleScripts = { }, 'Snobalt': { species: 'Voodoom', ability: 'Mountaineer', item: 'Life Orb', gender: 'M', - moves: ['paleowave', 'darkpulse', 'nastyplot'], + moves: ['paleowave', 'darkpulse', 'quiverdance'], signatureMove: 'Cap Bust', evs: {def:4, spa:252, spe:252}, nature: 'Timid', }, diff --git a/mods/seasonal/statuses.js b/mods/seasonal/statuses.js index 98262fc5e1..e2e519962d 100644 --- a/mods/seasonal/statuses.js +++ b/mods/seasonal/statuses.js @@ -9,6 +9,19 @@ exports.BattleStatuses = { move.stab = 2; }, }, + // Snobalt + amityabsorb: { + effectType: 'Ability', + name: 'Amity Absorb', + onTryHit: function (target, source, move) { + if (target !== source && move.type === 'Fairy') { + if (!this.heal(target.maxhp / 4)) { + this.add('-immune', target, '[msg]', '[from] ability: Amity Absorb'); + } + return null; + } + }, + }, // manu 11 arachnophobia: { effectType: 'Ability', @@ -211,7 +224,7 @@ exports.BattleStatuses = { name: 'Gonna Make You Sweat', onResidual: function (pokemon) { if (!pokemon.hp) return; - this.heal(this.modify(pokemon.maxhp, 0.15)); + this.heal(this.modify(pokemon.maxhp, 0.33)); }, }, // Winry @@ -374,19 +387,6 @@ exports.BattleStatuses = { return this.chainModify(3); }, }, - // Snobalt - whitemagic: { - effectType: 'Ability', - name: 'White Magic', - onTryHit: function (target, source, move) { - if (target !== source && move.type === 'Fairy') { - if (!this.boost({spe:1})) { - this.add('-immune', target, '[msg]', '[from] ability: White Magic'); - } - return null; - } - }, - }, // Weathers hail: { inherit: true,