From fc95f6e7d96db09fa2896bbd595b15327c2d112e Mon Sep 17 00:00:00 2001
From: Honko <robin.usher10@gmail.com>
Date: Fri, 8 Mar 2019 11:57:43 -0800
Subject: [PATCH] Gen 4 Random Battle improvements (#5275)

Fix bad sets for Bastiodon, Infernape, Jirachi, Regirock, Snorlax, Steelix.
---
 data/mods/gen4/formats-data.js | 6 +++---
 data/mods/gen4/random-teams.js | 7 +++----
 data/random-teams.js           | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/data/mods/gen4/formats-data.js b/data/mods/gen4/formats-data.js
index 08d8ce2d82..bd6f901a04 100644
--- a/data/mods/gen4/formats-data.js
+++ b/data/mods/gen4/formats-data.js
@@ -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: {
diff --git a/data/mods/gen4/random-teams.js b/data/mods/gen4/random-teams.js
index ab2dddea2d..1f0676885e 100644
--- a/data/mods/gen4/random-teams.js
+++ b/data/mods/gen4/random-teams.js
@@ -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';
diff --git a/data/random-teams.js b/data/random-teams.js
index 33c518283f..3c4288f9d4 100644
--- a/data/random-teams.js
+++ b/data/random-teams.js
@@ -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',
 		];