Merge pull request #996 from MrSableye/greed-two

Final new capmons from cope
MrSableye · Dec 20, 2024 · 31a7e27 · 31a7e27
2 parents fc5df48 + 0e6e531
commit 31a7e27
Show file tree

Hide file tree

Showing 6 changed files with 261 additions and 1 deletion.
diff --git a/data/formats-data.ts b/data/formats-data.ts
@@ -11216,9 +11216,17 @@ export const FormatsData: { [k: string]: SpeciesFormatsData } = {
 		isNonstandard: "Future",	
 	},
 	camerex: {
+		tier: "Illegal",
+		isNonstandard: "Future",
+	},
+	airuite: {
 		tier: "Illegal",
 		isNonstandard: "Future",	
 	},
+	kaquapo: {
+		tier: "Illegal",
+		isNonstandard: "Future",
+	},
 	shelbert: {
 		tier: "Illegal",
 		isNonstandard: "Future",	

diff --git a/data/learnsets.ts b/data/learnsets.ts
@@ -201235,7 +201235,201 @@ switcheroo: ["8E"],
 obstruct: ["8E"],
 zingzap: ["8E"],
 psychup: ["8E"],
-                    },
+		},
+},
+airuite: {
+	learnset: {
+		batonpass: ["8L1"],
+		relicsong: ["8L1"],
+		revelationdance: ["8L1"],
+		soak: ["8L1"],
+		peck: ["8L1"],
+		watergun: ["8L1"],
+		growl: ["8L1"],
+		sing: ["8L1"],
+		raindance: ["8L10"],
+		mirrormove: ["8L14"],
+		chatter: ["8L20"],
+		brine: ["8L24"],
+		echoedvoice: ["8L27", "8T"],
+		aquatail: ["8L30"],
+		hypervoice: ["8L35", "8M"],
+		featherdance: ["8L37"],
+		sparklingaria: ["8L40"],
+		bravebird: ["8L44"],
+		hurricane: ["8L48"],
+		hydropump: ["8L51"],
+		boomburst: ["8L56"],
+		sonicboom: ["8L60", "8T"],
+		tropkick: ["8T"], // (???)
+		icepunch: ["8T"],
+		clobber: ["8T"],
+		coaching: ["8T"],
+		bodyslam: ["8T"],
+		doubleedge: ["8T"],
+		tailwind: ["8T"],
+		icywind: ["8T"],
+		roost: ["8T"],
+		dualwingbeat: ["8T"],
+		bounce: ["8T"],
+		fractus: ["8T"],
+		terrainpulse: ["8T"],
+		flipturn: ["8T"],
+		scald: ["8T"],
+		waterpledge: ["8T"],
+		aquaring: ["8T"],
+		lifedew: ["8T"],
+		haze: ["8T"],
+		present: ["8T"],
+		payday: ["8T"],
+		endeavor: ["8T"],
+		seedbomb: ["8T"],
+		metronome: ["8T"],
+		acupressure: ["8T"],
+		softboiled: ["8T"],
+		simplebeam: ["8T"],
+		swagger: ["8T"],
+		braindamage: ["8T"],
+		drumroll: ["8T"],
+		waterpulse: ["8M"],
+		roar: ["8M"],
+		toxic: ["8M"],
+		bulletseed: ["8M"],
+		hiddenpower: ["8M"],
+		taunt: ["8M"],
+		icebeam: ["8M"],
+		blizzard: ["8M"],
+		hyperbeam: ["8M"],
+		protect: ["8M"],
+		raindance: ["8M"],
+		safeguard: ["8M"],
+		frustration: ["8M"],
+		irontail: ["8M"],
+		return: ["8M"],
+		doubleteam: ["8M"],
+		aerialace: ["8M"],
+		torment: ["8M"],
+		facade: ["8M"],
+		rest: ["8M"],
+		attract: ["8M"],
+		steelwing: ["8M"],
+		snatch: ["8M"],
+		sleeptalk: ["8M"],
+		holdback: ["8M"],
+		substitute: ["8M"],
+		workup: ["8M"],
+		acrobatics: ["8M"],
+		weatherball: ["8M"],
+		recycle: ["8M"],
+		razorwind: ["8M"],
+		swift: ["8M"],
+		defog: ["8M"],
+		cut: ["8M"],
+		surf: ["8M"],
+		waterfall: ["8M"],
+		amnesia: ["8E"],
+		encore: ["8E"],
+		partingshot: ["8E"],
+		wish: ["8E"],
+		yawn: ["8E"],
+            },
+		},
+		kaquapo: {
+			learnset: {
+				batonpass: ["8L1"],
+				relicsong: ["8L1"],
+				revelationdance: ["8L1"],
+				soak: ["8L1"],
+				peck: ["8L1"],
+				watergun: ["8L1"],
+				growl: ["8L1"],
+				sing: ["8L1"],
+				raindance: ["8L10"],
+				mirrormove: ["8L14"],
+				chatter: ["8L20"],
+				brine: ["8L24"],
+				echoedvoice: ["8L27", "8T"],
+				aquatail: ["8L30"],
+				hypervoice: ["8L35", "8M"],
+				featherdance: ["8L37"],
+				sparklingaria: ["8L40"],
+				bravebird: ["8L44"],
+				hurricane: ["8L48"],
+				hydropump: ["8L51"],
+				boomburst: ["8L56"],
+				sonicboom: ["8L60", "8T"],
+				tropkick: ["8T"], // (???)
+				icepunch: ["8T"],
+				clobber: ["8T"],
+				coaching: ["8T"],
+				bodyslam: ["8T"],
+				doubleedge: ["8T"],
+				tailwind: ["8T"],
+				icywind: ["8T"],
+				roost: ["8T"],
+				dualwingbeat: ["8T"],
+				bounce: ["8T"],
+				fractus: ["8T"],
+				terrainpulse: ["8T"],
+				flipturn: ["8T"],
+				scald: ["8T"],
+				waterpledge: ["8T"],
+				aquaring: ["8T"],
+				lifedew: ["8T"],
+				haze: ["8T"],
+				present: ["8T"],
+				payday: ["8T"],
+				endeavor: ["8T"],
+				seedbomb: ["8T"],
+				metronome: ["8T"],
+				acupressure: ["8T"],
+				softboiled: ["8T"],
+				simplebeam: ["8T"],
+				swagger: ["8T"],
+				braindamage: ["8T"],
+				drumroll: ["8T"],
+				waterpulse: ["8M"],
+				roar: ["8M"],
+				toxic: ["8M"],
+				bulletseed: ["8M"],
+				hiddenpower: ["8M"],
+				taunt: ["8M"],
+				icebeam: ["8M"],
+				blizzard: ["8M"],
+				hyperbeam: ["8M"],
+				protect: ["8M"],
+				raindance: ["8M"],
+				safeguard: ["8M"],
+				frustration: ["8M"],
+				irontail: ["8M"],
+				return: ["8M"],
+				doubleteam: ["8M"],
+				aerialace: ["8M"],
+				torment: ["8M"],
+				facade: ["8M"],
+				rest: ["8M"],
+				attract: ["8M"],
+				steelwing: ["8M"],
+				snatch: ["8M"],
+				sleeptalk: ["8M"],
+				holdback: ["8M"],
+				substitute: ["8M"],
+				workup: ["8M"],
+				acrobatics: ["8M"],
+				weatherball: ["8M"],
+				recycle: ["8M"],
+				razorwind: ["8M"],
+				swift: ["8M"],
+				defog: ["8M"],
+				cut: ["8M"],
+				surf: ["8M"],
+				waterfall: ["8M"],
+				amnesia: ["8E"],
+				encore: ["8E"],
+				partingshot: ["8E"],
+				wish: ["8E"],
+				yawn: ["8E"],
+								},
 	},
 jahl: {
 		learnset: {

diff --git a/data/mods/clovercap/formats-data.ts b/data/mods/clovercap/formats-data.ts
@@ -1238,6 +1238,16 @@ export const FormatsData: { [k: string]: ModdedSpeciesFormatsData } = {
 		isNonstandard: null,
 		tier: "OU",
 	},
+	kaquapo: {
+		inherit: true,
+		isNonstandard: null,
+		tier: "OU",
+	},
+	airuite: {
+		inherit: true,
+		isNonstandard: null,
+		tier: "LC",
+	},
 	manatank: {
 		inherit: true,
 		isNonstandard: null,

diff --git a/data/mods/cope/formats-data.ts b/data/mods/cope/formats-data.ts
@@ -1866,6 +1866,16 @@ export const FormatsData: { [k: string]: ModdedSpeciesFormatsData } = {
 		isNonstandard: null,
 		tier: "OU",
 	},
+	kaquapo: {
+		inherit: true,
+		isNonstandard: null,
+		tier: "OU",
+	},
+	airuite: {
+		inherit: true,
+		isNonstandard: null,
+		tier: "OU",
+	},
 	spycrab: {
 		inherit: true,
 		isNonstandard: null,

diff --git a/data/mods/sandbox/formats-data.ts b/data/mods/sandbox/formats-data.ts
@@ -12821,6 +12821,16 @@ export const FormatsData: { [k: string]: ModdedSpeciesFormatsData } = {
 		isNonstandard: null,
 		tier: "OU",
 	},
+	airuite: {
+		inherit: true,
+		isNonstandard: null,
+		tier: "LC",
+	},
+	kaquapo: {
+		inherit: true,
+		isNonstandard: null,
+		tier: "OU",
+	},
 	elmage: {
 		inherit: true,
 		isNonstandard: null,

diff --git a/data/pokedex.ts b/data/pokedex.ts
@@ -51716,6 +51716,34 @@ sketchoui: {
 		gen: 8,
 		creator: "Zac",
 	},
+	airuite: {
+	 num: -8614,
+	 name: "Airuite",
+	 types: ["Flying", "Water"],
+	 genderRatio: {M: 0.75, F: 0.25},
+	 baseStats: {hp: 41, atk: 53, def: 45, spa: 61, spd: 55, spe: 90},
+	 abilities: {0: "Swift Swim", 1: "Shower Power", S: "Multiscale", H: "Liquid Voice"},
+	 heightm: 0.4,
+	 weightkg: 4,
+	 color: "Blue",
+	 eggGroups: ["Water1", "Flying"], 
+	 gen: 8,
+	 creator: "Ney",
+	},
+   kaquapo: {
+	num: -8613,
+	name: "Kaquapo",
+	types: ["Flying", "Water"],
+	genderRatio: {M: 0.75, F: 0.25},
+	baseStats: {hp: 101, atk: 79, def: 70, spa: 95, spd: 80, spe: 70},
+	abilities: {0: "Propeller Tail", 1: "Shower Power", S: "Multiscale", H: "Liquid Voice"},
+	heightm: 0.98,
+	weightkg: 40,
+	color: "Blue",
+	eggGroups: ["Water1", "Flying"], 
+	gen: 8,
+	creator: "Ney",
+},
 	jahl: {
 		num: -8608,
 		name: "Jahl",