From 8f8c480931ed4e2f91920ac3bec0778bbf4e18e3 Mon Sep 17 00:00:00 2001 From: The Immortal Date: Wed, 8 Oct 2014 01:43:24 +0400 Subject: [PATCH] Prevent unobtainable shiny Pokemon --- data/formats-data.js | 11 +++++++++++ data/rulesets.js | 4 ++++ mods/gen2/formats-data.js | 1 + mods/gen3/formats-data.js | 1 + mods/gen4/formats-data.js | 2 ++ mods/gen5/formats-data.js | 7 +++++++ 6 files changed, 26 insertions(+) diff --git a/data/formats-data.js b/data/formats-data.js index 82b60893c7..89e09c8f58 100644 --- a/data/formats-data.js +++ b/data/formats-data.js @@ -2023,6 +2023,7 @@ exports.BattleFormatsData = { {"generation":4,"level":50,"moves":["leafstorm","recover","nastyplot","healingwish"],"pokeball":"cherishball"}, {"generation":6,"level":10,"moves":["recover","healbell","safeguard","holdback"],"pokeball":"luxuryball"} ], + unobtainableShiny: true, tier: "UU" }, treecko: { @@ -3643,6 +3644,7 @@ exports.BattleFormatsData = { {"generation":4,"level":100,"moves":["judgment","roaroftime","spacialrend","shadowforce"],"pokeball":"cherishball"}, {"generation":5,"level":100,"moves":["recover","hyperbeam","perishsong","judgment"]} ], + unobtainableShiny: true, tier: "Uber" }, arceusbug: { @@ -3739,6 +3741,7 @@ exports.BattleFormatsData = { {"generation":5,"level":50,"moves":["vcreate","fusionflare","fusionbolt","searingshot"],"pokeball":"cherishball"}, {"generation":5,"level":100,"moves":["vcreate","blueflare","boltstrike","glaciate"],"pokeball":"cherishball"} ], + unobtainableShiny: true, tier: "UU" }, snivy: { @@ -4562,6 +4565,7 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":5,"level":100,"moves":["blueflare","fusionflare","mist","dracometeor"],"pokeball":"cherishball"} ], + unobtainableShiny: true, tier: "Uber" }, zekrom: { @@ -4570,6 +4574,7 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":5,"level":100,"moves":["boltstrike","fusionbolt","haze","outrage"],"pokeball":"cherishball"} ], + unobtainableShiny: true, tier: "Uber" }, landorus: { @@ -4606,6 +4611,7 @@ exports.BattleFormatsData = { {"generation":5,"level":50,"moves":["sacredsword","hydropump","aquajet","swordsdance"],"pokeball":"cherishball"} ], dreamWorldPokeball: 'cherishball', + unobtainableShiny: true, tier: "OU" }, keldeoresolute: {}, @@ -4617,6 +4623,7 @@ exports.BattleFormatsData = { {"generation":5,"level":50,"moves":["round","teeterdance","psychic","closecombat"],"pokeball":"cherishball"} ], dreamWorldPokeball: 'cherishball', + unobtainableShiny: true, tier: "RU" }, genesect: { @@ -5017,16 +5024,19 @@ exports.BattleFormatsData = { xerneas: { randomBattleMoves: ["geomancy","moonblast","thunder","focusblast"], randomDoubleBattleMoves: ["geomancy","dazzlinggleam","thunder","focusblast","protect"], + unobtainableShiny: true, tier: "Uber" }, yveltal: { randomBattleMoves: ["darkpulse","oblivionwing","taunt","focusblast","hurricane","roost","suckerpunch"], randomDoubleBattleMoves: ["darkpulse","oblivionwing","taunt","focusblast","hurricane","roost","suckerpunch","snarl","skydrop","protect"], + unobtainableShiny: true, tier: "Uber" }, zygarde: { randomBattleMoves: ["dragondance","earthquake","extremespeed","outrage","coil","stoneedge"], randomDoubleBattleMoves: ["dragondance","landswrath","extremespeed","rockslide","coil","stoneedge","glare","protect"], + unobtainableShiny: true, tier: "BL" }, diancie: { @@ -5035,6 +5045,7 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":6,"level":50,"moves":["diamondstorm","moonblast","reflect","return"],"pokeball":"cherishball"} ], + unobtainableShiny: true, tier: "UU" }, hoopa: { diff --git a/data/rulesets.js b/data/rulesets.js index 437244ee0b..8051f95ace 100644 --- a/data/rulesets.js +++ b/data/rulesets.js @@ -223,6 +223,10 @@ exports.BattleFormats = { if (template.num === 681) { // Aegislash set.species = 'Aegislash'; } + + if (template.unobtainableShiny) { + set.shiny = false; + } return problems; } }, diff --git a/mods/gen2/formats-data.js b/mods/gen2/formats-data.js index cb7db3e3a3..0487201914 100644 --- a/mods/gen2/formats-data.js +++ b/mods/gen2/formats-data.js @@ -1122,6 +1122,7 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":2,"level":5,"moves":["leechseed","confusion","healbell","recover"]} ], + unobtainableShiny: true, tier: "Uber" } }; diff --git a/mods/gen3/formats-data.js b/mods/gen3/formats-data.js index b7df97f2e7..c1147edb22 100644 --- a/mods/gen3/formats-data.js +++ b/mods/gen3/formats-data.js @@ -1415,6 +1415,7 @@ exports.BattleFormatsData = { {"generation":3,"level":10,"abilities":["naturalcure"],"moves":["leechseed","recover","healbell","safeguard"]}, {"generation":3,"level":30,"abilities":["naturalcure"],"moves":["healbell","safeguard","ancientpower","futuresight"]} ], + unobtainableShiny: true, tier: "OU" }, treecko: { diff --git a/mods/gen4/formats-data.js b/mods/gen4/formats-data.js index 722f464f2e..7fb37a5b90 100644 --- a/mods/gen4/formats-data.js +++ b/mods/gen4/formats-data.js @@ -1577,6 +1577,7 @@ exports.BattleFormatsData = { {"generation":3,"level":30,"abilities":["naturalcure"],"moves":["healbell","safeguard","ancientpower","futuresight"]}, {"generation":4,"level":50,"abilities":["naturalcure"],"moves":["leafstorm","recover","nastyplot","healingwish"]} ], + unobtainableShiny: true, tier: "OU" }, treecko: { @@ -2855,6 +2856,7 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":4,"level":100,"abilities":["multitype"],"moves":["judgment","roaroftime","spacialrend","shadowforce"]} ], + unobtainableShiny: true, tier: "Uber" }, arceusbug: { diff --git a/mods/gen5/formats-data.js b/mods/gen5/formats-data.js index a5a4af367f..660af36eeb 100644 --- a/mods/gen5/formats-data.js +++ b/mods/gen5/formats-data.js @@ -1683,6 +1683,7 @@ exports.BattleFormatsData = { {"generation":3,"level":30,"moves":["healbell","safeguard","ancientpower","futuresight"]}, {"generation":4,"level":50,"moves":["leafstorm","recover","nastyplot","healingwish"],"pokeball":"cherishball"} ], + unobtainableShiny: true, tier: "OU" }, treecko: { @@ -3110,6 +3111,7 @@ exports.BattleFormatsData = { {"generation":4,"level":100,"moves":["judgment","roaroftime","spacialrend","shadowforce"],"pokeball":"cherishball"}, {"generation":5,"level":100,"moves":["recover","hyperbeam","perishsong","judgment"]} ], + unobtainableShiny: true, tier: "Uber" }, arceusbug: { @@ -3263,6 +3265,7 @@ exports.BattleFormatsData = { {"generation":5,"level":50,"moves":["vcreate","fusionflare","fusionbolt","searingshot"],"pokeball":"cherishball"}, {"generation":5,"level":100,"moves":["vcreate","blueflare","boltstrike","glaciate"],"pokeball":"cherishball"} ], + unobtainableShiny: true, tier: "UU" }, snivy: { @@ -4001,6 +4004,7 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":5,"level":100,"moves":["blueflare","fusionflare","mist","dracometeor"],"pokeball":"cherishball"} ], + unobtainableShiny: true, tier: "Uber" }, zekrom: { @@ -4008,6 +4012,7 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":5,"level":100,"moves":["boltstrike","fusionbolt","haze","outrage"],"pokeball":"cherishball"} ], + unobtainableShiny: true, tier: "Uber" }, landorus: { @@ -4038,6 +4043,7 @@ exports.BattleFormatsData = { {"generation":5,"level":50,"moves":["sacredsword","hydropump","aquajet","swordsdance"],"pokeball":"cherishball"} ], dreamWorldPokeball: 'cherishball', + unobtainableShiny: true, tier: "OU" }, meloetta: { @@ -4047,6 +4053,7 @@ exports.BattleFormatsData = { {"generation":5,"level":50,"moves":["round","teeterdance","psychic","closecombat"],"pokeball":"cherishball"} ], dreamWorldPokeball: 'cherishball', + unobtainableShiny: true, tier: "UU" }, genesect: {