Skip to content

Commit

Permalink
Fix oversights from adding Crown Tundra DLC (#7559)
Browse files Browse the repository at this point in the history
  • Loading branch information
KrisXV committed Oct 23, 2020
1 parent e77304e commit 41ed000
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 146 deletions.
10 changes: 5 additions & 5 deletions config/formats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const Formats: FormatList = [

mod: 'gen8',
ruleset: ['Standard', 'Dynamax Clause'],
banlist: ['Uber', 'Arena Trap', 'Moody', 'Shadow Tag', 'Baton Pass'],
banlist: ['Uber', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass'],
},
{
name: "[Gen 8] OU (Blitz)",
Expand Down Expand Up @@ -149,9 +149,9 @@ export const Formats: FormatList = [
mod: 'gen8',
ruleset: ['Same Type Clause', 'Standard', 'Dynamax Clause'],
banlist: [
'Eternatus', 'Kyurem-Black', 'Kyurem-White', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Necrozma-Dawn-Wings',
'Necrozma-Dusk-Mane', 'Reshiram', 'Solgaleo', 'Urshifu-Rapid-Strike', 'Zacian', 'Zamazenta', 'Zekrom',
'Damp Rock', 'Smooth Rock', 'Moody', 'Shadow Tag', 'Baton Pass',
'Dialga', 'Eternatus', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Necrozma-Dawn-Wings',
'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Xerneas', 'Yveltal', 'Zacian', 'Zamazenta', 'Zekrom',
'Moody', 'Shadow Tag', 'Baton Pass',
],
},
{
Expand Down Expand Up @@ -267,7 +267,7 @@ export const Formats: FormatList = [
mod: 'gen8',
gameType: 'doubles',
ruleset: ['Standard Doubles', 'Dynamax Clause'],
banlist: ['DUber', 'Beat Up'],
banlist: ['DUber', 'Power Construct'],
},
{
name: "[Gen 8] Doubles Ubers",
Expand Down
22 changes: 12 additions & 10 deletions data/formats-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2592,6 +2592,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
},
kyogreprimal: {
isNonstandard: "Past",
tier: "Illegal",
},
groudon: {
randomBattleMoves: ["earthquake", "heatcrash", "heavyslam", "stealthrock", "stoneedge", "swordsdance", "thunderwave"],
Expand All @@ -2601,6 +2602,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
},
groudonprimal: {
isNonstandard: "Past",
tier: "Illegal",
},
rayquaza: {
randomBattleMoves: ["dragondance", "earthquake", "extremespeed", "outrage", "vcreate"],
Expand All @@ -2618,7 +2620,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
randomDoubleBattleMoves: ["firepunch", "followme", "ironhead", "lifedew", "protect", "thunderwave"],
randomDoubleBattleLevel: 76,
tier: "OU",
doublesTier: "DUber",
doublesTier: "DOU",
},
deoxys: {
isNonstandard: "Past",
Expand Down Expand Up @@ -3931,7 +3933,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
randomDoubleBattleMoves: ["bugbuzz", "gigadrain", "heatwave", "hurricane", "protect", "quiverdance"],
randomDoubleBattleLevel: 80,
tier: "OU",
doublesTier: "DUber",
doublesTier: "DOU",
},
cobalion: {
randomBattleMoves: ["closecombat", "ironhead", "stealthrock", "stoneedge", "swordsdance", "voltswitch"],
Expand Down Expand Up @@ -4023,7 +4025,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
randomDoubleBattleMoves: ["dragonclaw", "dragondance", "fusionbolt", "iciclespear", "protect", "roost"],
randomDoubleBattleLevel: 72,
tier: "OU",
doublesTier: "DUber",
doublesTier: "DOU",
},
kyuremwhite: {
randomBattleMoves: ["dracometeor", "earthpower", "freezedry", "fusionflare", "icebeam"],
Expand Down Expand Up @@ -4354,8 +4356,8 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
carbink: {
randomBattleMoves: ["bodypress", "lightscreen", "moonblast", "reflect", "stealthrock"],
randomBattleLevel: 88,
isNonstandard: "Past",
tier: "Illegal",
tier: "OU",
doublesTier: "DOU",
},
goomy: {
tier: "LC",
Expand Down Expand Up @@ -5206,7 +5208,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
randomDoubleBattleMoves: ["closecombat", "protect", "rocktomb", "shadowsneak", "spectralthief"],
randomDoubleBattleLevel: 72,
tier: "Uber",
doublesTier: "DUber",
doublesTier: "DOU",
},
poipole: {
tier: "NFE",
Expand Down Expand Up @@ -5248,7 +5250,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
randomDoubleBattleLevel: 76,
gmaxUnreleased: true,
tier: "OU",
doublesTier: "DUber",
doublesTier: "DOU",
},
melmetalgmax: {
// isNonstandard: "Gigantamax",
Expand Down Expand Up @@ -5294,7 +5296,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
},
cinderacegmax: {
isNonstandard: "Gigantamax",
tier: "Uber",
tier: "(Uber)",
doublesTier: "(DUber)",
},
sobble: {
Expand Down Expand Up @@ -5843,7 +5845,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
randomDoubleBattleMoves: ["closecombat", "ironhead", "protect", "suckerpunch", "wickedblow"],
randomDoubleBattleLevel: 76,
tier: "OU",
doublesTier: "DUber",
doublesTier: "DOU",
},
urshifurapidstrike: {
randomBattleMoves: ["bulkup", "drainpunch", "substitute", "surgingstrikes"],
Expand All @@ -5858,7 +5860,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
randomBattleLevel: 80,
isNonstandard: "Gigantamax",
tier: "(Uber)",
doublesTier: "DUber",
doublesTier: "(DUber)",
},
urshifurapidstrikegmax: {
randomBattleMoves: ["bulkup", "closecombat", "surgingstrikes", "thunderpunch", "uturn"],
Expand Down
4 changes: 4 additions & 0 deletions data/mods/gen7/formats-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2267,6 +2267,8 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
kyogreprimal: {
randomBattleMoves: ["calmmind", "originpulse", "scald", "thunder", "icebeam", "toxic", "rest", "sleeptalk"],
randomDoubleBattleMoves: ["originpulse", "thunder", "icebeam", "calmmind", "protect"],
tier: "Uber",
doublesTier: "DUber",
},
groudon: {
randomBattleMoves: ["dragonclaw", "earthquake", "firepunch", "lavaplume", "roar", "stealthrock", "stoneedge", "thunderwave"],
Expand All @@ -2277,6 +2279,8 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
groudonprimal: {
randomBattleMoves: ["firepunch", "lavaplume", "precipiceblades", "rockpolish", "stealthrock", "stoneedge", "swordsdance", "toxic"],
randomDoubleBattleMoves: ["precipiceblades", "rockslide", "stoneedge", "swordsdance", "rockpolish", "firepunch", "protect"],
tier: "Uber",
doublesTier: "DUber",
},
rayquaza: {
randomBattleMoves: ["dracometeor", "dragondance", "earthquake", "extremespeed", "outrage", "vcreate"],
Expand Down
100 changes: 0 additions & 100 deletions data/mods/gen7/moves.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
aeroblast: {
inherit: true,
isNonstandard: null,
},
assist: {
inherit: true,
isNonstandard: null,
Expand Down Expand Up @@ -114,18 +110,10 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
coreenforcer: {
inherit: true,
isNonstandard: null,
},
corkscrewcrash: {
inherit: true,
isNonstandard: null,
},
crushgrip: {
inherit: true,
isNonstandard: null,
},
curse: {
inherit: true,
target: "normal",
Expand Down Expand Up @@ -163,10 +151,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
diamondstorm: {
inherit: true,
isNonstandard: null,
},
dizzypunch: {
inherit: true,
isNonstandard: null,
Expand All @@ -179,10 +163,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
dragonascent: {
inherit: true,
isNonstandard: null,
},
dragonrage: {
inherit: true,
isNonstandard: null,
Expand Down Expand Up @@ -274,10 +254,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
geomancy: {
inherit: true,
isNonstandard: null,
},
gigavolthavoc: {
inherit: true,
isNonstandard: null,
Expand Down Expand Up @@ -549,10 +525,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
},
},
},
landswrath: {
inherit: true,
isNonstandard: null,
},
letssnuggleforever: {
inherit: true,
isNonstandard: null,
Expand All @@ -565,10 +537,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
lovelykiss: {
inherit: true,
isNonstandard: null,
},
lowkick: {
inherit: true,
onTryHit() {},
Expand All @@ -577,18 +545,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
lunardance: {
inherit: true,
isNonstandard: null,
},
lusterpurge: {
inherit: true,
isNonstandard: null,
},
magmastorm: {
inherit: true,
isNonstandard: null,
},
magnetbomb: {
inherit: true,
isNonstandard: null,
Expand Down Expand Up @@ -619,10 +575,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
"After You", "Assist", "Baneful Bunker", "Beak Blast", "Belch", "Bestow", "Celebrate", "Chatter", "Copycat", "Counter", "Covet", "Crafty Shield", "Destiny Bond", "Detect", "Diamond Storm", "Dragon Ascent", "Endure", "Feint", "Fleur Cannon", "Focus Punch", "Follow Me", "Freeze Shock", "Helping Hand", "Hold Hands", "Hyperspace Fury", "Hyperspace Hole", "Ice Burn", "Instruct", "King's Shield", "Light of Ruin", "Mat Block", "Me First", "Metronome", "Mimic", "Mind Blown", "Mirror Coat", "Mirror Move", "Nature Power", "Origin Pulse", "Photon Geyser", "Plasma Fists", "Precipice Blades", "Protect", "Quash", "Quick Guard", "Rage Powder", "Relic Song", "Secret Sword", "Shell Trap", "Sketch", "Sleep Talk", "Snarl", "Snatch", "Snore", "Spectral Thief", "Spiky Shield", "Spotlight", "Steam Eruption", "Struggle", "Switcheroo", "Techno Blast", "Thief", "Thousand Arrows", "Thousand Waves", "Transform", "Trick", "V-create", "Wide Guard",
],
},
mindblown: {
inherit: true,
isNonstandard: null,
},
miracleeye: {
inherit: true,
isNonstandard: null,
Expand All @@ -635,10 +587,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
mistball: {
inherit: true,
isNonstandard: null,
},
mudbomb: {
inherit: true,
isNonstandard: null,
Expand All @@ -655,10 +603,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
naturesmadness: {
inherit: true,
isNonstandard: null,
},
needlearm: {
inherit: true,
isNonstandard: null,
Expand All @@ -671,10 +615,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
oblivionwing: {
inherit: true,
isNonstandard: null,
},
oceanicoperetta: {
inherit: true,
isNonstandard: null,
Expand All @@ -687,10 +627,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
originpulse: {
inherit: true,
isNonstandard: null,
},
powder: {
inherit: true,
isNonstandard: null,
Expand Down Expand Up @@ -805,10 +741,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
roaroftime: {
inherit: true,
isNonstandard: null,
},
rockclimb: {
inherit: true,
isNonstandard: null,
Expand All @@ -821,10 +753,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
sacredfire: {
inherit: true,
isNonstandard: null,
},
sappyseed: {
inherit: true,
accuracy: 100,
Expand All @@ -835,10 +763,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
searingshot: {
inherit: true,
isNonstandard: null,
},
searingsunrazesmash: {
inherit: true,
isNonstandard: null,
Expand All @@ -851,10 +775,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
shadowforce: {
inherit: true,
isNonstandard: null,
},
sharpen: {
inherit: true,
isNonstandard: null,
Expand Down Expand Up @@ -908,10 +828,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
spacialrend: {
inherit: true,
isNonstandard: null,
},
sparklyswirl: {
inherit: true,
accuracy: 100,
Expand All @@ -934,10 +850,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
steameruption: {
inherit: true,
isNonstandard: null,
},
steamroller: {
inherit: true,
isNonstandard: null,
Expand All @@ -962,10 +874,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
inherit: true,
isNonstandard: null,
},
technoblast: {
inherit: true,
isNonstandard: null,
},
tectonicrage: {
inherit: true,
isNonstandard: null,
Expand All @@ -980,14 +888,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
selfSwitch: false,
onTryHit: false,
},
thousandarrows: {
inherit: true,
isNonstandard: null,
},
thousandwaves: {
inherit: true,
isNonstandard: null,
},
toxicthread: {
inherit: true,
isNonstandard: null,
Expand Down
Loading

0 comments on commit 41ed000

Please sign in to comment.