Skip to content

Commit

Permalink
Gen 1: Implement NU listing
Browse files Browse the repository at this point in the history
Where as SmogDex does not list the NU tier, it is been a long-standing existing tier within Smogon and rby2k10 communities.
The NU tiering serves for Random Battle balance purposes mainly, as there is no UU format.
One could use the change to build a Gen 1 NU tier or similar, though.
  • Loading branch information
Joimer committed Jun 9, 2015
1 parent 61a9849 commit 3a4abaf
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 34 deletions.
64 changes: 32 additions & 32 deletions mods/gen1/formats-data.js
Expand Up @@ -45,7 +45,7 @@ exports.BattleFormatsData = {
},
butterfree: {
randomBattleMoves: ["psychic","megadrain","sleeppowder","stunspore"],
tier: "UU"
tier: "NU"
},
weedle: {
randomBattleMoves: ["poisonsting","stringshot"],
Expand All @@ -57,7 +57,7 @@ exports.BattleFormatsData = {
},
beedrill: {
randomBattleMoves: ["twineedle","hyperbeam","swordsdance","agility"],
tier: "UU"
tier: "NU"
},
pidgey: {
randomBattleMoves: ["agility","mimic","mirrormove","skyattack","rest","reflect","sandattack"],
Expand All @@ -67,12 +67,12 @@ exports.BattleFormatsData = {
pidgeotto: {
randomBattleMoves: ["agility","mimic","mirrormove","skyattack","rest","reflect"],
essentialMove: "doubleedge",
tier: "UU"
tier: "NFE"
},
pidgeot: {
randomBattleMoves: ["hyperbeam","agility","mimic","mirrormove","skyattack","rest","reflect"],
essentialMove: "doubleedge",
tier: "UU"
tier: "NU"
},
rattata: {
randomBattleMoves: ["bodyslam","blizzard","bubblebeam","thunderbolt"],
Expand All @@ -93,15 +93,15 @@ exports.BattleFormatsData = {
eventPokemon: [
{"generation":1,"level":20,"moves":["growl","leer","furyattack","payday"]}
],
tier: "UU"
tier: "NU"
},
ekans: {
randomBattleMoves: ["glare","earthquake","bodyslam","rockslide"],
tier: "LC"
},
arbok: {
randomBattleMoves: ["earthquake","glare","hyperbeam","bodyslam","rockslide"],
tier: "UU"
tier: "NU"
},
pikachu: {
randomBattleMoves: ["thunderbolt","thunderwave","surf","bodyslam","agility","thunder"],
Expand Down Expand Up @@ -177,27 +177,27 @@ exports.BattleFormatsData = {
},
wigglytuff: {
randomBattleMoves: ["thunderwave","bodyslam","doubleedge","hyperbeam","blizzard","bubblebeam","sing"],
tier: "UU"
tier: "NU"
},
zubat: {
randomBattleMoves: ["screech","confuseray","doubleedge","supersonic","megadrain","leechlife","toxic"],
tier: "LC"
},
golbat: {
randomBattleMoves: ["screech","confuseray","doubleedge","hyperbeam","megadrain"],
tier: "UU"
tier: "NU"
},
oddish: {
randomBattleMoves: ["sleeppowder","swordsdance","doubleedge","megadrain","toxic"],
tier: "LC"
},
gloom: {
randomBattleMoves: ["sleeppowder","swordsdance","doubleedge","megadrain"],
tier: "UU"
tier: "NFE"
},
vileplume: {
randomBattleMoves: ["sleeppowder","swordsdance","bodyslam","megadrain"],
tier: "UU"
tier: "NU"
},
paras: {
randomBattleMoves: ["stunspore","swordsdance","bodyslam","slash","megadrain","doubleedge","growth","toxic"],
Expand All @@ -207,7 +207,7 @@ exports.BattleFormatsData = {
parasect: {
randomBattleMoves: ["stunspore","swordsdance","bodyslam","slash","megadrain","doubleedge","growth","hyperbeam","toxic"],
essentialMove: "spore",
tier: "UU"
tier: "NU"
},
venonat: {
randomBattleMoves: ["psychic","megadrain","sleeppowder","stunspore","toxic"],
Expand Down Expand Up @@ -256,7 +256,7 @@ exports.BattleFormatsData = {
},
primeape: {
randomBattleMoves: ["submission","rockslide","bodyslam","hyperbeam","megakick"],
tier: "UU"
tier: "NU"
},
growlithe: {
randomBattleMoves: ["fireblast","bodyslam","mimic","reflect"],
Expand Down Expand Up @@ -305,7 +305,7 @@ exports.BattleFormatsData = {
},
machamp: {
randomBattleMoves: ["bodyslam","earthquake","hyperbeam","submission","rockslide"],
tier: "UU"
tier: "NU"

This comment has been minimized.

Copy link
@Zarel

Zarel Dec 27, 2015

Member

lol

},
bellsprout: {
randomBattleMoves: ["razorleaf","swordsdance","bodyslam","toxic","stunspore"],
Expand Down Expand Up @@ -352,7 +352,7 @@ exports.BattleFormatsData = {
eventPokemon: [
{"generation":1,"level":40,"moves":["ember","firespin","stomp","payday"]}
],
tier: "UU"
tier: "NU"
},
slowpoke: {
randomBattleMoves: ["amnesia","surf","thunderwave","rest"],
Expand All @@ -369,12 +369,12 @@ exports.BattleFormatsData = {
magneton: {
randomBattleMoves: ["thunderwave","mimic","doubleedge","hyperbeam"],
essentialMove: "thunderbolt",
tier: "UU"
tier: "NU"
},
farfetchd: {
randomBattleMoves: ["sandattack","substitute","swordsdance","bodyslam","toxic"],
essentialMove: "slash",
tier: "UU"
tier: "NU"
},
doduo: {
randomBattleMoves: ["drillpeck","bodyslam","mimic","doubleedge","agility","growl","reflect"],
Expand All @@ -400,7 +400,7 @@ exports.BattleFormatsData = {
muk: {
randomBattleMoves: ["sludge","bodyslam","megadrain","screech"],
essentialMove: "explosion",
tier: "UU"
tier: "NU"
},
shellder: {
randomBattleMoves: ["surf","blizzard","icebeam","explosion","withdraw","toxic","supersonic"],
Expand All @@ -427,7 +427,7 @@ exports.BattleFormatsData = {
},
onix: {
randomBattleMoves: ["earthquake","explosion","rockslide","toxic"],
tier: "UU"
tier: "NU"
},
drowzee: {
randomBattleMoves: ["hypnosis","psychic","thunderwave","counter","rest"],
Expand Down Expand Up @@ -455,7 +455,7 @@ exports.BattleFormatsData = {
electrode: {
randomBattleMoves: ["thunder","thunderbolt","thunderwave","screech","flash","reflect"],
essentialMove: "explosion",
tier: "UU"
tier: "NU"
},
exeggcute: {
randomBattleMoves: ["sleeppowder","explosion","eggbomb","megadrain","stunspore"],
Expand All @@ -473,19 +473,19 @@ exports.BattleFormatsData = {
},
marowak: {
randomBattleMoves: ["earthquake","blizzard","bodyslam","seismictoss"],
tier: "UU"
tier: "NU"
},
hitmonlee: {
randomBattleMoves: ["bodyslam","counter","highjumpkick","mimic","seismictoss","substitute"],
tier: "UU"
tier: "NU"
},
hitmonchan: {
randomBattleMoves: ["bodyslam","submission","seismictoss","counter"],
tier: "UU"
tier: "NU"
},
lickitung: {
randomBattleMoves: ["swordsdance","earthquake","hyperbeam","bodyslam"],
tier: "UU"
tier: "NU"
},
koffing: {
randomBattleMoves: ["sludge","thunder","thunderbolt","fireblast"],
Expand All @@ -495,7 +495,7 @@ exports.BattleFormatsData = {
weezing: {
randomBattleMoves: ["sludge","thunder","thunderbolt","fireblast"],
essentialMove: "explosion",
tier: "UU"
tier: "NU"
},
rhyhorn: {
randomBattleMoves: ["earthquake","rockslide","substitute","bodyslam"],
Expand Down Expand Up @@ -524,15 +524,15 @@ exports.BattleFormatsData = {
},
seadra: {
randomBattleMoves: ["smokescreen","hydropump","surf","blizzard","mimic"],
tier: "UU"
tier: "NU"
},
goldeen: {
randomBattleMoves: ["surf","blizzard","agility","doubleedge","toxic","supersonic"],
tier: "LC"
},
seaking: {
randomBattleMoves: ["surf","blizzard","hyperbeam","doubleedge"],
tier: "UU"
tier: "NU"
},
staryu: {
randomBattleMoves: ["blizzard","thunderbolt","thunderwave","surf"],
Expand All @@ -550,7 +550,7 @@ exports.BattleFormatsData = {
},
scyther: {
randomBattleMoves: ["slash","swordsdance","agility","hyperbeam"],
tier: "UU"
tier: "NU"
},
jynx: {
randomBattleMoves: ["lovelykiss","blizzard","psychic","mimic"],
Expand All @@ -562,7 +562,7 @@ exports.BattleFormatsData = {
},
magmar: {
randomBattleMoves: ["confuseray","fireblast","bodyslam","hyperbeam","mimic"],
tier: "UU"
tier: "NU"
},
pinsir: {
randomBattleMoves: ["swordsdance","hyperbeam","bodyslam","submission"],
Expand All @@ -589,7 +589,7 @@ exports.BattleFormatsData = {
},
ditto: {
randomBattleMoves: ["transform"],
tier: "UU"
tier: "NU"
},
eevee: {
randomBattleMoves: ["doubleedge","growl","mimic","reflect","sandattack","tailwhip","toxic"],
Expand All @@ -607,7 +607,7 @@ exports.BattleFormatsData = {
},
flareon: {
randomBattleMoves: ["fireblast","bodyslam","hyperbeam","quickattack"],
tier: "UU"
tier: "NU"
},
porygon: {
randomBattleMoves: ["thunderwave","thunderbolt","blizzard","icebeam","doubleedge","hyperbeam","sharpen","psychic","agility","triattack"],
Expand All @@ -622,7 +622,7 @@ exports.BattleFormatsData = {
omastar: {
randomBattleMoves: ["hydropump","surf","mimic","rest","seismictoss"],
essentialMove: "blizzard",
tier: "UU"
tier: "NU"
},
kabuto: {
randomBattleMoves: ["swordsdance","bodyslam","surf","toxic","harden","slash"],
Expand All @@ -634,7 +634,7 @@ exports.BattleFormatsData = {
},
aerodactyl: {
randomBattleMoves: ["skyattack","reflect","doubleedge","hyperbeam"],
tier: "UU"
tier: "NU"
},
snorlax: {
randomBattleMoves: ["blizzard","icebeam","bodyslam","thunderbolt","rest","selfdestruct","hyperbeam","surf","earthquake"],
Expand Down
5 changes: 3 additions & 2 deletions mods/gen1/scripts.js
Expand Up @@ -1078,7 +1078,7 @@ exports.BattleScripts = {
// If you have a shitmon, you're covered in OUs and Ubers if possible
var tier = template.tier;
if (tier === 'LC' && (nuCount > 1 || hasShitmon)) continue;
if ((tier === 'NFE' || tier === 'UU') && (hasShitmon || (nuCount > 2 && this.random(1)))) continue;
if ((tier === 'NFE' || tier === 'UU' || tier === 'NU') && (hasShitmon || (nuCount > 2 && this.random(1)))) continue;
// Unless you have one of the worst mons, in that case we allow luck to give you both Mew and Mewtwo.
if (tier === 'Uber' && uberCount >= 1 && !hasShitmon) continue;

Expand Down Expand Up @@ -1124,7 +1124,7 @@ exports.BattleScripts = {
// Increment type bias counters.
if (tier === 'Uber') {
uberCount++;
} else if (tier === 'UU' || tier === 'NFE' || tier === 'LC') {
} else if (tier === 'UU' || tier === 'NU' || tier === 'NFE' || tier === 'LC') {
nuCount++;
}

Expand Down Expand Up @@ -1317,6 +1317,7 @@ exports.BattleScripts = {
var levelScale = {
LC: 96,
NFE: 90,
NU: 90,
UU: 85,
OU: 79,
Uber: 74
Expand Down

0 comments on commit 3a4abaf

Please sign in to comment.