From e4be677a802c02477fd4a6d85ba3aa4266831821 Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Fri, 10 Feb 2017 18:19:28 -0500 Subject: [PATCH] Teambuilder: Fix tier lists for Gen 7 Now that we have Uber, OU, and UU tier lists mostly in existence for Gen 7, we don't need the weird special-casing we were doing earlier. --- js/search.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/js/search.js b/js/search.js index 18a3f7a80..43a8058be 100644 --- a/js/search.js +++ b/js/search.js @@ -808,12 +808,9 @@ var tierSet = table.tierSet; var slices = table.formatSlices; var agTierSet = []; - if (this.gen === 6) agTierSet = [['header', "AG"], ['pokemon', 'rayquazamega']]; + if (this.gen >= 6) agTierSet = [['header', "AG"], ['pokemon', 'rayquazamega']]; if (format === 'ubers' || format === 'uber') tierSet = tierSet.slice(slices.Uber); - else if (this.gen === 7 && format === 'vgc2017') tierSet = tierSet.slice(slices.Legal); - else if (this.gen === 7 && (format === 'pokebankubers' || format === 'pokebankanythinggoes')) tierSet = tierSet.slice(slices.Uber); - else if (this.gen === 7 && format === 'ou') tierSet = tierSet.slice(slices.OU); - else if (this.gen === 7 && format === 'uu') tierSet = tierSet.slice(slices.UU); + else if (format === 'vgc2017') tierSet = tierSet.slice(slices.Legal); else if (format === 'ou') tierSet = tierSet.slice(slices.OU); else if (format === 'uu') tierSet = tierSet.slice(slices.UU); else if (format === 'ru') tierSet = tierSet.slice(slices.RU); @@ -823,7 +820,6 @@ else if (format === 'cap') tierSet = tierSet.slice(0, slices.Uber).concat(tierSet.slice(slices.OU)); else if (format === 'anythinggoes' || format === 'ag') tierSet = agTierSet.concat(tierSet.slice(slices.Uber)); else if (format === 'balancedhackmons' || format === 'bh') tierSet = agTierSet.concat(tierSet.slice(slices.Uber)); - else if (this.gen === 7) tierSet = tierSet.slice(slices.Uber); else if (format === 'doublesou') tierSet = tierSet.slice(slices.DOU); else if (format === 'doublesuu') tierSet = tierSet.slice(slices.DUU); else if (format === 'doublesnu') tierSet = tierSet.slice(slices.DNU);