From 965cb43cf2fcb4e712457eb87fed7bf9495ba16d Mon Sep 17 00:00:00 2001
From: The Immortal <the_immortal123@live.com>
Date: Thu, 27 Aug 2020 00:04:56 +0400
Subject: [PATCH] Random Battle: Improve Rillaboom

---
 data/formats-data.ts | 4 +++-
 data/random-teams.ts | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/formats-data.ts b/data/formats-data.ts
index 4f88521ba2..f8b06e096a 100644
--- a/data/formats-data.ts
+++ b/data/formats-data.ts
@@ -5285,7 +5285,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		doublesTier: "DUU",
 	},
 	rillaboom: {
-		randomBattleMoves: ["acrobatics", "grassyglide", "highhorsepower", "knockoff", "swordsdance", "uturn", "woodhammer"],
+		randomBattleMoves: ["grassyglide", "highhorsepower", "knockoff", "uturn", "woodhammer"],
 		randomBattleLevel: 80,
 		randomDoubleBattleMoves: ["fakeout", "grassyglide", "highhorsepower", "protect", "uturn", "woodhammer"],
 		randomDoubleBattleLevel: 80,
@@ -5293,6 +5293,8 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		doublesTier: "DOU",
 	},
 	rillaboomgmax: {
+		randomBattleMoves: ["acrobatics", "grassyglide", "highhorsepower", "knockoff", "swordsdance"],
+		randomBattleLevel: 80,
 		isNonstandard: "Gigantamax",
 		tier: "(Uber)",
 		doublesTier: "(DUber)",
diff --git a/data/random-teams.ts b/data/random-teams.ts
index f2c69f15f3..895785282e 100644
--- a/data/random-teams.ts
+++ b/data/random-teams.ts
@@ -651,7 +651,7 @@ export class RandomTeams {
 				switch (moveid) {
 				// Not very useful without their supporting moves
 				case 'acrobatics':
-					if (!counter.setupType) rejected = true;
+					if (!counter.setupType && !isDoubles) rejected = true;
 					break;
 				case 'destinybond': case 'healbell':
 					if (movePool.includes('protect') || movePool.includes('wish')) rejected = true;
@@ -859,7 +859,7 @@ export class RandomTeams {
 					if (hasMove['leechlife'] || !hasType['Grass'] && counter.Physical > 3 && movePool.includes('uturn')) rejected = true;
 					break;
 				case 'woodhammer':
-					if (hasMove['grassyglide'] || hasMove['hornleech'] && counter.Physical < 4) rejected = true;
+					if (hasMove['hornleech'] && counter.Physical < 4) rejected = true;
 					break;
 				case 'freezedry':
 					if ((hasMove['blizzard'] && counter.setupType) || hasMove['icebeam'] && counter.Special < 4) rejected = true;
@@ -945,7 +945,6 @@ export class RandomTeams {
 					break;
 				case 'knockoff':
 					if (hasMove['darkestlariat']) rejected = true;
-					if (hasMove['acrobatics'] || hasMove['swordsdance'] && movePool.includes('acrobatics')) rejected = true;
 					break;
 				case 'suckerpunch':
 					if (counter.damagingMoves.length < 2 || counter['Dark'] > 1 && !hasType['Dark']) rejected = true;
@@ -1499,7 +1498,7 @@ export class RandomTeams {
 					if (species.gen === 8 && this.randomChance(1, 2)) continue;
 					break;
 				case 'Magearna': case 'Toxtricity': case 'Zacian': case 'Zamazenta':
-				case 'Appletun': case 'Blastoise': case 'Butterfree': case 'Copperajah': case 'Grimmsnarl': case 'Snorlax': case 'Urshifu':
+				case 'Appletun': case 'Blastoise': case 'Butterfree': case 'Copperajah': case 'Grimmsnarl': case 'Rillaboom': case 'Snorlax': case 'Urshifu':
 					if (this.gen >= 8 && this.randomChance(1, 2)) continue;
 					break;
 				}