Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-09-10 10:15:37 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Gen 4 Random Battle improvements (#5275)

Browse Source 
Fix bad sets for Bastiodon, Infernape, Jirachi, Regirock, Snorlax, Steelix.
This commit is contained in:
Honko
2019-03-08 11:57:43 -08:00
committed by The Immortal
parent 27c6739ff7
commit fc95f6e7d9
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/mods/gen4/formats-data.js
View File

@@ -403,7 +403,7 @@ let BattleFormatsData = {
tier: "LC",
},
steelix: {
randomBattleMoves: ["stealthrock", "earthquake", "explosion", "curse", "roar", "toxic", "stoneedge", "gyroball"],
randomBattleMoves: ["stealthrock", "earthquake", "explosion", "roar", "toxic", "stoneedge", "gyroball"],
tier: "UU",
},
drowzee: {
@@ -1632,7 +1632,7 @@ let BattleFormatsData = {
},
regirock: {
inherit: true,
randomBattleMoves: ["stealthrock", "thunderwave", "stoneedge", "earthquake", "curse", "rest", "sleeptalk", "rockslide", "explosion"],
randomBattleMoves: ["stealthrock", "thunderwave", "earthquake", "rest", "sleeptalk", "rockslide", "explosion"],
tier: "NU",
},
regice: {
@@ -1713,7 +1713,7 @@ let BattleFormatsData = {
tier: "NU",
},
infernape: {
randomBattleMoves: ["stealthrock", "fireblast", "closecombat", "uturn", "grassknot", "stoneedge", "machpunch", "focusblast", "swordsdance", "nastyplot", "hiddenpowerice", "flareblitz", "vacuumwave"],
randomBattleMoves: ["stealthrock", "closecombat", "uturn", "grassknot", "stoneedge", "machpunch", "swordsdance", "hiddenpowerice", "flareblitz"],
tier: "OU",
},
piplup: {

7
data/mods/gen4/random-teams.js
View File

@@ -284,7 +284,6 @@ class RandomGen4Teams extends RandomGen5Teams {
break;
case 'machpunch':
if (hasType['Fighting'] && counter.stab < 2 && !hasAbility['Technician']) rejected = true;
if (hasMove['vacuumwave'] && counter.setupType !== 'Physical') rejected = true;
if (counter.damagingMoves.length <= counter['Fighting']) rejected = true;
break;
case 'seismictoss':
@@ -324,8 +323,8 @@ class RandomGen4Teams extends RandomGen5Teams {
case 'pursuit':
if (counter.setupType || hasMove['payback']) rejected = true;
break;
case 'gyroball': case 'flashcannon':
if (hasMove['ironhead'] && counter.setupType !== 'Special') rejected = true;
case 'flashcannon':
if ((hasMove['ironhead'] || movePool.includes('ironhead')) && counter.setupType !== 'Special') rejected = true;
break;
// Status:
@@ -621,7 +620,7 @@ class RandomGen4Teams extends RandomGen5Teams {
item = 'Black Sludge';
} else if (this.getEffectiveness('Rock', template) >= 1 || hasMove['roar']) {
item = 'Leftovers';
} else if (counter.Status <= 1 && !hasMove['rapidspin'] && !hasMove['superfang']) {
} else if (counter.Status <= 1 && !hasMove['metalburst'] && !hasMove['rapidspin'] && !hasMove['superfang']) {
item = 'Life Orb';
} else {
item = 'Leftovers';

2
data/random-teams.js
View File

@@ -480,7 +480,7 @@ class RandomTeams extends Dex.ModdedDex {
];
// Moves that shouldn't be the only STAB moves:
let NoStab = [
'aquajet', 'bounce', 'explosion', 'fakeout', 'firstimpression', 'flamecharge', 'fly', 'iceshard', 'pursuit', 'quickattack', 'skyattack', 'suckerpunch',
'aquajet', 'bounce', 'explosion', 'fakeout', 'firstimpression', 'flamecharge', 'fly', 'iceshard', 'pursuit', 'quickattack', 'selfdestruct', 'skyattack', 'suckerpunch',
'chargebeam', 'clearsmog', 'eruption', 'vacuumwave', 'waterspout',
];