diff --git a/data/formats-data.js b/data/formats-data.js index d8f7ef297b..7995bc4f17 100644 --- a/data/formats-data.js +++ b/data/formats-data.js @@ -177,7 +177,7 @@ let BattleFormatsData = { tier: "NFE", }, pidgeot: { - randomBattleMoves: ["roost", "bravebird", "heatwave", "return", "doubleedge", "uturn", "hurricane"], + randomBattleMoves: ["roost", "bravebird", "heatwave", "return", "uturn", "defog"], randomDoubleBattleMoves: ["bravebird", "heatwave", "return", "doubleedge", "uturn", "tailwind", "protect"], eventPokemon: [ {"generation": 5, "level": 61, "gender": "M", "nature": "Naughty", "ivs": {"hp": 30, "atk": 30, "def": 30, "spa": 30, "spd": 30, "spe": 30}, "isHidden": false, "abilities": ["keeneye"], "moves": ["whirlwind", "wingattack", "skyattack", "mirrormove"], "pokeball": "cherishball"}, @@ -1821,8 +1821,8 @@ let BattleFormatsData = { doublesTier: "DOU", }, moltres: { - randomBattleMoves: ["fireblast", "hiddenpowergrass", "roost", "substitute", "toxic", "willowisp", "hurricane"], - randomDoubleBattleMoves: ["fireblast", "hiddenpowergrass", "airslash", "roost", "substitute", "protect", "uturn", "willowisp", "hurricane", "heatwave", "tailwind"], + randomBattleMoves: ["fireblast", "roost", "substitute", "toxic", "willowisp", "hurricane"], + randomDoubleBattleMoves: ["fireblast", "airslash", "roost", "substitute", "protect", "uturn", "willowisp", "hurricane", "heatwave", "tailwind"], eventPokemon: [ {"generation": 3, "level": 50, "shiny": 1, "moves": ["firespin", "agility", "endure", "flamethrower"]}, {"generation": 3, "level": 70, "moves": ["agility", "endure", "flamethrower", "safeguard"], "pokeball": "pokeball"}, @@ -2011,7 +2011,7 @@ let BattleFormatsData = { tier: "LC", }, noctowl: { - randomBattleMoves: ["roost", "whirlwind", "airslash", "nightshade", "toxic", "defog", "hurricane", "heatwave"], + randomBattleMoves: ["roost", "whirlwind", "nightshade", "toxic", "defog", "hurricane", "heatwave"], randomDoubleBattleMoves: ["roost", "tailwind", "airslash", "hypervoice", "heatwave", "protect", "hypnosis"], tier: "(PU)", doublesTier: "Untiered", @@ -5356,7 +5356,7 @@ let BattleFormatsData = { tier: "LC", }, swanna: { - randomBattleMoves: ["airslash", "roost", "hurricane", "icebeam", "raindance", "defog", "scald"], + randomBattleMoves: ["bravebird", "roost", "hurricane", "icebeam", "raindance", "defog", "scald"], randomDoubleBattleMoves: ["airslash", "roost", "hurricane", "surf", "icebeam", "raindance", "tailwind", "scald", "protect"], tier: "(PU)", doublesTier: "Untiered", @@ -5744,7 +5744,7 @@ let BattleFormatsData = { doublesTier: "Untiered", }, tornadus: { - randomBattleMoves: ["bulkup", "acrobatics", "knockoff", "substitute", "hurricane", "heatwave", "superpower", "uturn", "taunt", "tailwind"], + randomBattleMoves: ["bulkup", "acrobatics", "hurricane", "heatwave", "superpower", "uturn", "defog", "tailwind"], randomDoubleBattleMoves: ["hurricane", "airslash", "uturn", "superpower", "focusblast", "taunt", "substitute", "heatwave", "tailwind", "protect", "skydrop"], eventPokemon: [ {"generation": 5, "level": 40, "shiny": 1, "isHidden": false, "moves": ["revenge", "aircutter", "extrasensory", "agility"]}, @@ -5760,7 +5760,7 @@ let BattleFormatsData = { doublesTier: "Untiered", }, tornadustherian: { - randomBattleMoves: ["hurricane", "airslash", "heatwave", "knockoff", "superpower", "uturn", "taunt"], + randomBattleMoves: ["hurricane", "heatwave", "knockoff", "superpower", "uturn", "taunt"], randomDoubleBattleMoves: ["hurricane", "airslash", "focusblast", "uturn", "heatwave", "skydrop", "tailwind", "taunt", "protect"], eventOnly: true, tier: "OU", @@ -6401,7 +6401,7 @@ let BattleFormatsData = { tier: "LC", }, noivern: { - randomBattleMoves: ["dracometeor", "hurricane", "airslash", "flamethrower", "boomburst", "switcheroo", "uturn", "roost", "taunt"], + randomBattleMoves: ["dracometeor", "hurricane", "flamethrower", "boomburst", "switcheroo", "uturn", "roost", "taunt"], randomDoubleBattleMoves: ["airslash", "hurricane", "dragonpulse", "dracometeor", "focusblast", "flamethrower", "uturn", "roost", "boomburst", "switcheroo", "tailwind", "taunt", "protect"], tier: "RU", doublesTier: "Untiered", diff --git a/data/mods/gen6/formats-data.js b/data/mods/gen6/formats-data.js index ee2bf52800..f49371c3e6 100644 --- a/data/mods/gen6/formats-data.js +++ b/data/mods/gen6/formats-data.js @@ -134,7 +134,7 @@ let BattleFormatsData = { }, pidgeot: { inherit: true, - randomBattleMoves: ["roost", "bravebird", "heatwave", "return", "doubleedge", "uturn", "hurricane"], + randomBattleMoves: ["roost", "bravebird", "heatwave", "return", "uturn", "defog"], randomDoubleBattleMoves: ["bravebird", "heatwave", "return", "doubleedge", "uturn", "tailwind", "protect"], tier: "PU", doublesTier: "Untiered", @@ -4215,13 +4215,13 @@ let BattleFormatsData = { }, tornadus: { inherit: true, - randomBattleMoves: ["bulkup", "acrobatics", "knockoff", "substitute", "hurricane", "heatwave", "superpower", "uturn", "taunt", "tailwind"], + randomBattleMoves: ["bulkup", "acrobatics", "knockoff", "substitute", "hurricane", "heatwave", "superpower", "uturn", "tailwind"], randomDoubleBattleMoves: ["hurricane", "airslash", "uturn", "superpower", "focusblast", "taunt", "substitute", "heatwave", "tailwind", "protect", "skydrop"], tier: "UU", doublesTier: "DUU", }, tornadustherian: { - randomBattleMoves: ["hurricane", "airslash", "heatwave", "knockoff", "superpower", "uturn", "taunt"], + randomBattleMoves: ["hurricane", "heatwave", "knockoff", "superpower", "uturn", "taunt"], randomDoubleBattleMoves: ["hurricane", "airslash", "focusblast", "uturn", "heatwave", "skydrop", "tailwind", "taunt", "protect"], eventOnly: true, tier: "OU", @@ -4722,7 +4722,7 @@ let BattleFormatsData = { tier: "LC", }, noivern: { - randomBattleMoves: ["dracometeor", "hurricane", "airslash", "flamethrower", "boomburst", "switcheroo", "uturn", "roost", "taunt"], + randomBattleMoves: ["dracometeor", "hurricane", "flamethrower", "boomburst", "switcheroo", "uturn", "roost", "taunt"], randomDoubleBattleMoves: ["airslash", "hurricane", "dragonpulse", "dracometeor", "focusblast", "flamethrower", "uturn", "roost", "boomburst", "switcheroo", "tailwind", "taunt", "protect"], tier: "RUBL", doublesTier: "Untiered", diff --git a/data/mods/gen6/random-teams.js b/data/mods/gen6/random-teams.js index 9efad2db9d..548d0fb0a8 100644 --- a/data/mods/gen6/random-teams.js +++ b/data/mods/gen6/random-teams.js @@ -330,11 +330,8 @@ class RandomGen6Teams extends RandomTeams { case 'overheat': if (hasMove['lavaplume'] || counter.setupType === 'Special') rejected = true; break; - case 'acrobatics': - if (hasMove['hurricane'] && counter.setupType !== 'Physical') rejected = true; - break; - case 'airslash': - if (hasMove['acrobatics'] || hasMove['bravebird'] || hasMove['hurricane']) rejected = true; + case 'airslash': case 'hurricane': + if (hasMove['acrobatics'] || hasMove['bravebird']) rejected = true; break; case 'shadowclaw': if (hasMove['phantomforce'] || hasMove['shadowforce'] || hasMove['shadowsneak']) rejected = true; @@ -526,6 +523,7 @@ class RandomGen6Teams extends RandomTeams { (hasType['Fighting'] && !counter['Fighting'] && (counter.setupType || !counter['Status'])) || (hasType['Fire'] && !counter['Fire']) || (hasType['Ghost'] && !hasType['Dark'] && !counter['Ghost']) || + (hasType['Grass'] && !hasType['Fairy'] && !hasType['Poison'] && !hasType['Steel'] && !counter['Grass']) || (hasType['Ground'] && !counter['Ground'] && !hasMove['rest'] && !hasMove['sleeptalk']) || (hasType['Ice'] && !counter['Ice'] && !hasAbility['Refrigerate']) || (hasType['Psychic'] && !!counter['Psychic'] && !hasType['Flying'] && !hasAbility['Pixilate'] && template.types.length > 1 && counter.stab < 2) || diff --git a/data/random-teams.js b/data/random-teams.js index 2662fb6886..63f4c74f41 100644 --- a/data/random-teams.js +++ b/data/random-teams.js @@ -936,11 +936,8 @@ class RandomTeams extends Dex.ModdedDex { case 'overheat': if (hasMove['fireblast'] || hasMove['lavaplume'] || counter.setupType === 'Special') rejected = true; break; - case 'acrobatics': - if (hasMove['hurricane'] && counter.setupType !== 'Physical') rejected = true; - break; - case 'airslash': - if (hasMove['acrobatics'] || hasMove['bravebird'] || hasMove['hurricane']) rejected = true; + case 'airslash': case 'hurricane': + if (hasMove['acrobatics'] || hasMove['bravebird']) rejected = true; break; case 'hex': if (!hasMove['willowisp']) rejected = true; @@ -1152,6 +1149,7 @@ class RandomTeams extends Dex.ModdedDex { (hasType['Fighting'] && !counter['Fighting'] && (counter.setupType || !counter['Status'])) || (hasType['Fire'] && !counter['Fire']) || (hasType['Ghost'] && !hasType['Dark'] && !counter['Ghost'] && !hasAbility['Steelworker']) || + (hasType['Grass'] && !hasType['Fairy'] && !hasType['Poison'] && !hasType['Steel'] && !counter['Grass']) || (hasType['Ground'] && !counter['Ground'] && !hasMove['rest'] && !hasMove['sleeptalk']) || (hasType['Ice'] && !counter['Ice'] && !hasAbility['Refrigerate']) || (hasType['Psychic'] && !!counter['Psychic'] && !hasType['Flying'] && !hasAbility['Pixilate'] && template.types.length > 1 && counter.stab < 2) || @@ -1163,7 +1161,6 @@ class RandomTeams extends Dex.ModdedDex { (hasAbility['Contrary'] && !counter['contrary'] && template.species !== 'Shuckle') || (hasAbility['Dark Aura'] && !counter['Dark']) || (hasAbility['Gale Wings'] && !counter['Flying']) || - (hasAbility['Grassy Surge'] && !counter['Grass']) || (hasAbility['Guts'] && hasType['Normal'] && movePool.includes('facade')) || (hasAbility['Psychic Surge'] && !counter['Psychic']) || (hasAbility['Slow Start'] && movePool.includes('substitute')) || @@ -1445,7 +1442,7 @@ class RandomTeams extends Dex.ModdedDex { item = 'Groundium Z'; } else if (hasMove['mindblown'] && !!counter['Status'] && !teamDetails.zMove) { item = 'Firium Z'; - } else if (!teamDetails.zMove && (hasMove['fly'] || ((hasMove['bounce'] || (hasAbility['Gale Wings'] && hasMove['bravebird'])) && counter.setupType))) { + } else if (!teamDetails.zMove && (hasMove['fly'] || (hasMove['hurricane'] && template.baseStats.spa >= 125) || ((hasMove['bounce'] || (hasAbility['Gale Wings'] && hasMove['bravebird'])) && counter.setupType))) { item = 'Flyinium Z'; } else if (hasMove['solarbeam'] && !hasAbility['Drought'] && !hasMove['sunnyday'] && !teamDetails['sun']) { item = !teamDetails.zMove ? 'Grassium Z' : 'Power Herb';