Earth & Sky randbats and stuff

config/formats.ts

@@ -2051,6 +2051,9 @@ export const Formats: FormatList = [
 	 	],
 	 	mod: 'earthsky',
 	 	ruleset: [ '[Gen 9] Earth & Sky Horizons OU', 'Horizons Pokedex',],
+		banlist: [
+			'Manaphy', 'Meloetta-Pirouette', 'Diancie-Mega', 'Melmetal', 'Enamorus-Base', 'Latias-Mega', 'Latios-Mega', 'Zygarde-Base', 'Hoopa-Unbound', 'Marshadow',
+			'Spectrier', 'Calyrex-Ice', 'Roaring Moon', 'Valiant Droid', 'Terapagos-Terastal'],
 	 },
 	 {
 	 	name: "[Gen 9] Earth & Sky Horizons Ubers",

data/mods/earthsky/formats-data.ts

@@ -1249,8 +1249,8 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		natDexTier: 'OU'
 	},
 	darkrai: {
-		tier: 'OU',
-		natDexTier: 'OU'
+		tier: 'Uber',
+		natDexTier: 'Uber'
 	},
 	shaymin: {
 		tier: 'OU',

data/mods/earthsky/learnsets.ts

@@ -2574,7 +2574,6 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			earthquake: ["9M"],
 			ironhead: ["9M"],
 			waterfall: ["9M"],
-			aquatail: ["9M"],
 			gunkshot: ["9M"],
 			rockslide: ["9M"],
 			trailhead: ["9M"],
@@ -2592,6 +2591,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			acidarmor: ["9E"],
 			heavyslam: ["9E"],
 			highhorsepower: ["9E"],
+			liquidation: ["9E"],
 			stomp: ["9E"],
 			waterspout: ["9E"],
 			terablast: ["9T"],
@@ -3602,7 +3602,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 	},
 	keelmora: {
 		learnset: {
-			disarmingvoice: ["9L0"],
+			alluringvoice: ["9L0"],
 			nightshade: ["9L1"],
 			hypnosis: ["9L1"],
 			fairywind: ["9L1"],
@@ -4049,7 +4049,6 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			uproar: ["9M"],
 			uturn: ["9M"],
 			skyattack: ["9M"],
-			knockoff: ["9M"],
 			endure: ["9M"],
 			terablast: ["9T"],
 			belch: ["9D"],
@@ -5767,6 +5766,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			captivate: ["9E"],
 			doubleedge: ["9E"],
 			doublekick: ["9E"],
+			highhorsepower: ["9E"],
 			horndrill: ["9E"],
 			hypnosis: ["9E"],
 			lowkick: ["9E"],
@@ -5898,12 +5898,12 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			belch: ["9E"],
 			bodyslam: ["9E"],
 			curse: ["9E"],
-			feintattack: ["9E"],
 			nightslash: ["9E"],
 			pursuit: ["9E"],
+			rockblast: ["9E"],
+			sandblast: ["9E"],
 			suckerpunch: ["9E"],
-			tickle: ["9E"],
-			wrap: ["9E"],
+			temperflare: ["9E"],
 			terablast: ["9T"],
 			instruct: ["9D"],
 		},
@@ -5956,6 +5956,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			explosion: ["9M"],
 			endure: ["9M"],
 			batonpass: ["9E"],
+			escapetunnel: ["9E"],
 			feintattack: ["9E"],
 			flareblitz: ["9E"],
 			poisonfang: ["9E"],
@@ -6748,6 +6749,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			lastresort: ["9M"],
 			retaliate: ["9M"],
 			bodypress: ["9M"],
+			uturn: ["9M"],
 			superpower: ["9M"],
 			skyattack: ["9M"],
 			outrage: ["9M"],
@@ -6814,6 +6816,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			lastresort: ["9M"],
 			retaliate: ["9M"],
 			bodypress: ["9M"],
+			uturn: ["9M"],
 			superpower: ["9M"],
 			skyattack: ["9M"],
 			outrage: ["9M"],
@@ -6880,6 +6883,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			lastresort: ["9M"],
 			retaliate: ["9M"],
 			bodypress: ["9M"],
+			uturn: ["9M"],
 			superpower: ["9M"],
 			skyattack: ["9M"],
 			outrage: ["9M"],
@@ -6946,6 +6950,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			lastresort: ["9M"],
 			retaliate: ["9M"],
 			bodypress: ["9M"],
+			uturn: ["9M"],
 			superpower: ["9M"],
 			skyattack: ["9M"],
 			outrage: ["9M"],
@@ -9019,6 +9024,7 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			darkpulse: ["7M", "7L47"],
 			destinybond: ["7L50", "7E"],
 			dig: ["7M"],
+			disable: ["7L8"],
 			earthpower: ["7M"],
 			earthquake: ["7M"],
 			endure: ["7M"],
@@ -9052,7 +9058,6 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			protect: ["7M"],
 			psychic: ["7M"],
 			raindance: ["7M"],
-			recover: ["7L8"],
 			reflect: ["7M"],
 			rest: ["7M"],
 			revenge: ["7M"],
@@ -10319,6 +10324,15 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 	enamorustherian: {
 		learnset: {},
 	},
+	squawkabillyblue: {
+		learnset: {},
+	},
+	squawkabillyyellow: {
+		learnset: {},
+	},
+	squawkabillywhite: {
+		learnset: {},
+	},
 	revavroomsegin: {
 		learnset: {},
 	},

data/mods/earthsky/moves.ts

@@ -19,7 +19,7 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 		name: "Aerate",
 		pp: 15,
 		priority: 0,
-		flags: {protect: 1, mirror: 1},
+		flags: {protect: 1, mirror: 1, wind: 1},
 		onTryHit(target, source, move){
 			target.side.removeSideCondition('mist');
 			target.side.removeSideCondition('auroraveil');
@@ -193,7 +193,7 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 		name: "Chaotic Storm",
 		pp: 10,
 		priority: 0,
-		flags: {protect: 1, mirror: 1},
+		flags: {protect: 1, mirror: 1, wind: 1},
 		onBasePower(basePower, pokemon){
 			if(['sunnyday', 'desolateland', 'raindance', 'primordialsea'].includes(this.field.effectiveWeather())) return this.chainModify(1.5);
 		},
@@ -1083,7 +1083,7 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 		type: "Grass",
 		contestType: "Beautiful",
 		desc: "At the end of the next turn, the Pokemon at the user's position has 1/2 of the user's maximum HP restored to it, rounded down, and its non-volatile status condition will be cured. Fails if this move is already in effect for the user's position.",
-		shortDesc: "Next turn, 50% of the user's max HP is restored, cures status.",
+		shortDesc: "Next turn, 50% of user's max HP restored, cures status.",
 		onPrepareHit(target, source, move) {
 			this.attrLastMove('[still]');
 			this.add('-anim', source, "Geomancy");
@@ -3250,6 +3250,10 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 		inherit: true,
 		target: "any",
 	},
+	hypnosis: {
+		inherit: true,
+		ignoreImmunity: false,
+	},
 	iceball: {
 		num: 301,
 		accuracy: 100,
@@ -3875,6 +3879,7 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 	moonblast: {
 		inherit: true,
 		basePower: 90,
+		pp: 10,
 		secondary: {
 			chance: 10,
 			boosts: {
@@ -4815,6 +4820,7 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 	},
 	shelter: {
 		inherit: true,
+		pp: 5,
 		onTry(source, target, move) {
 			if (source.volatiles['shelter']) return false;
 		},
@@ -5754,9 +5760,12 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 	trumpcard: {
 		num: 376,
 		accuracy: 100,
-		basePower: 40,
+		basePower: 0,
+		onTry(pokemon, target) {
+			if (!pokemon.side.totalFainted) return false;
+		},
 		basePowerCallback(pokemon, target, move) {
-			return 40 * (1 + pokemon.side.totalFainted);
+			return 40 * (pokemon.side.totalFainted);
 		},
 		category: "Special",
 		name: "Trump Card",

data/mods/earthsky/pokedex.ts

@@ -2352,6 +2352,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 	mawile: {
 		inherit: true,
 		abilities: {0: "Hyper Cutter", 1: "Disturbance", H: "Strong Jaw"},
+		eggGroups: ["Monster", "Fairy"],
 		isNonstandard: null,
 	},
 	plusle: {
@@ -2872,6 +2873,10 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		abilities: {0: "Frisk", 1: "Forewarn", H: "Shadow Tag"},
 	},
+	duosion: {
+		inherit: true,
+		baseStats: {hp: 75, atk: 40, def: 55, spa: 125, spd: 65, spe: 30},
+	},
 	vanillite: {
 		inherit: true,
 		abilities: {0: "Ice Body", H: "Weak Armor"},
@@ -3644,6 +3649,8 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 	kleavor: {
 		inherit: true,
 		baseStats: {hp: 70, atk: 130, def: 100, spa: 55, spd: 60, spe: 85},
+		evoType: "trade",
+		evoItem: "Black Augurite",
 	},
 	ursaluna: {
 		num: 901,
@@ -3774,6 +3781,10 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		abilities: {0: "Illuminate", 1: "Static", H: "Damp"},
 	},
+	shroodle: {
+		inherit: true,
+		abilities: {0: "Unburden", 1: "Poison Touch", H: "Prankster"},
+	},
 	toedscool: {
 		inherit: true,
 		abilities: {0: "Mycelium Might", H: "Poison Heal"},
@@ -4429,6 +4440,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 	zygarde: {
 		inherit: true,
 		abilities: {0: "Climate Break", H: "Power Construct"},
+		exclusiveMoves: ["Bind", "Slam", "Glare", "Coil", "Thousand Waves", "Thousand Arrows", "Avalanche"],
 		isNonstandard: null,
 	},
 	zygarde10: {
@@ -4616,6 +4628,18 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		color: "Orange",
 		isNonstandard: null,
 	},
+	sandile: {
+		inherit: true,
+		eggGroups: ["Field", "Monster"],
+	},
+	krokorok: {
+		inherit: true,
+		eggGroups: ["Field", "Monster"],
+	},
+	krookodile: {
+		inherit: true,
+		eggGroups: ["Field", "Monster"],
+	},
 	scrafty: {
 		inherit: true,
 		color: "Orange",
@@ -4715,6 +4739,10 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		abilities: {0: "Scrappy", 1: "Tangled Feet", H: "Co-Star"},
 	},
+	cyclizar: {
+		inherit: true,
+		eggGroups: ["Field", "Dragon"],
+	},
 	orthworm: {
 		inherit: true,
 		eggGroups: ["Field", "Amorphous"],