don't merge this

.gitignore

@@ -1,2 +1,8 @@
 /config/chatrooms.json
-
+.config-dist
+.data-dist
+.git
+.github
+.lib-dist
+.server-dist
+.sim-dist

config/formats.ts

@@ -836,9 +836,9 @@ export const Formats: FormatList = [
 
 		mod: 'gen3hoenngaiden',
 		ruleset: ['Standard', '3 Baton Pass Clause', 'Dynamax Clause', 'Data Mod'],
-		banlist: ['Uber', 'Smeargle + Baton Pass', 'Mr. Mime', 'Sand Veil'],
+		banlist: ['Uber', 'Smeargle + Baton Pass'],
 		unbanlist: [
-			'Snow Warning', 'Snover', 'Abomasnow', 'Gliscor', 'Frillish', 'Jellicent', 'Tynamo', 'Eelektrik', 'Eelektross', 'Cryogonal', 'Type: Null', 'Silvally', 'Silvally-Bug', 'Silvally-Dark',
+			'Sand Veil', 'Snow Warning', 'Snover', 'Abomasnow', 'Gliscor', 'Frillish', 'Jellicent', 'Tynamo', 'Eelektrik', 'Eelektross', 'Cryogonal', 'Type: Null', 'Silvally', 'Silvally-Bug', 'Silvally-Dark',
 			'Silvally-Dragon', 'Silvally-Electric', 'Silvally-Fighting', 'Silvally-Fire', 'Silvally-Flying', 'Silvally-Ghost', 'Silvally-Grass', 'Silvally-Ground', 'Silvally-Ice', 'Silvally-Poison',
 			'Silvally-Psychic', 'Silvally-Rock', 'Silvally-Steel', 'Silvally-Water', 'Multi-Attack', 'RKS System',
 		],
@@ -852,7 +852,7 @@ export const Formats: FormatList = [
 		banlist: [
 			'Alakazite', 'Arceus', 'Blastoisinite', 'Blaziken', 'Cinderace', 'Darkrai', 'Darmanitan-Galar', 'Deoxys-Attack', 'Deoxys-Base', 'Deoxys-Speed', 'Dialga', 'Dracovish',
 			'Dragapult', 'Eternatus', 'Genesect', 'Gengarite', 'Giratina', 'Groudon', 'Ho-Oh', 'Kangaskhanite', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base',
-			'Lucarionite', 'Lugia', 'Lunala', 'Marshadow', 'Metagrossite', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Necrozma-Ultra',
+			'Lucarionite', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Metagrossite', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Necrozma-Ultra',
 			'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Salamencite', 'Shaymin-Sky', 'Solgaleo', 'Spectrier', 'Tornadus-Therian', 'Urshifu-Base', 'Xerneas', 'Yveltal',
 			'Zacian', 'Zamazenta', 'Zekrom', 'Zygarde-Base', 'Zygarde-Complete',  'Calyrex-Ice', 'Calyrex-Shadow', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag',
 			'Baton Pass',
@@ -1072,7 +1072,7 @@ export const Formats: FormatList = [
 			'All Pokemon'
 		],
 		unbanlist: [
-			'Prairret', 'Fluxtape', 'Cetaidon', 'Gencook', 'Heraleo', 'Drakotomy', 'Harzodia', 'Correept', 'Dojodo',
+			'Prairret', 'Fluxtape', 'Cetaidon', 'Gencook', 'Heraleo', 'Drakotomy', 'Correept', 'Dojodo', 'Harzodia', 'Nimbustorm', 'Burrodger', 'Wesgranit',
 		],
 	},
 	{  
@@ -1392,6 +1392,22 @@ export const Formats: FormatList = [
 		ruleset: ['Team Preview', 'Cancel Mod', 'OHKO Clause', 'Evasion Moves Clause', 'Dynamax Clause', 'Sleep Clause Mod', 'Freeze Clause Mod', 'Mega Data Mod'],
 		mod: 'm4asandbox',
 	},
+	{
+		name: "[Gen 8] M4A VGC Sandbox",
+		desc: ["• Megas for All v7",
+		      ],
+		// now intended as a custom game-esque format with more freedom for testing
+		mod: 'm4asandbox',
+		searchShow: false,
+		gameType: 'doubles',
+		forcedLevel: 50,
+		teamLength: {
+			validate: [4, 6],
+			battle: 4,
+		},
+		ruleset: ['VGC Timer', 'Dynamax Clause', 'Mega Data Mod'],
+		teambuilderFormat: 'Doubles OU',
+	},
 	{
 		name: "[Gen 8] Mix and M4A",
 		desc: `Mega Evolve any Pokémon with any Mega Stone and no limit. Boosts based on Mega Evolution from Megas for All v7.`,
@@ -1402,11 +1418,12 @@ export const Formats: FormatList = [
 		banlist: [
 			'Calyrex-Shadow', 'Zacian-Crowned',
 			'Beedrillite', 'Blazikenite', 'Gengarite', 'Kangaskhanite', 'Mawilite', 'Medichamite', 'Pidgeotite',
-			'Butterfrite', 'Delibirdite', 'Gourgeite', 'Gumshoosite', 'Klinklite', 'Leavannite', 'Lurantisite', 'Meowsticite', 'Parasite', 'Vikavoltite',
+			'Araquanite', 'Bastiodite', 'Butterfrite', 'Delibirdite', 'Gourgeite', 'Gumshoosite', 'Klinklite', 'Leavannite', 'Lurantisite', 'Luxrite', 'Meowsticite',
+			'Parasite', 'Vikavoltite',
 			'Moody', 'Shadow Tag', 'Baton Pass', 'Electrify',
 		],
 		restricted: [
-			'Arceus', 'Calyrex-Ice', 'Deoxys-Attack', 'Deoxys-Base', 'Dialga', 'Eternatus', 'Gengar', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyogre',
+			'Arceus', 'Blissey', 'Calyrex-Ice', 'Deoxys-Attack', 'Deoxys-Base', 'Dialga', 'Eternatus', 'Gengar', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyogre',
 			'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
 			'Palkia', 'Rayquaza', 'Regigigas', 'Reshiram', 'Slaking', 'Xerneas', 'Yveltal', 'Zacian', 'Zekrom', 'Zygarde-Complete',
 		],
@@ -1463,7 +1480,6 @@ export const Formats: FormatList = [
 			}
 		},
   },
-/*
   {
 		name: "[Gen 8] M4A Monotype",
 		desc: ["• Whole team must share a type",
@@ -1482,12 +1498,11 @@ export const Formats: FormatList = [
 
 			//Item Restrictions
 			'Blastoisinite', 'Damp Rock', 'Gengarite', 'Kangaskhanite', 'Lucarionite', 'Metagrossite', 'Salamencite', 'Smooth Rock', 'Terrain Extender', 
-			//Banned MfA Stones 
-			'Dragalgite', 'Draconite', 
+			//Banned MfA Stones
+			'Dragalgite', 'Dragonitite',
 		],
 		mod: 'm4av6',
 	},
-*/
 	{  
 		name: "[Gen 8] SylveMons AG",
 		desc: ["&bullet; <a href=https://www.smogon.com/forums/threads/.3612509/>SylveMons</a>",

data/mods/conniecorddraft/abilities.ts

@@ -331,4 +331,90 @@ export const Abilities: {[abilityid: string]: ModdedAbilityData} = {
 		},
 		desc: "If another Pokémon is poisoned, heals 1/2 the damage taken from that poison.",
 	},
+
+	//Misc
+	returnfire: {
+		name: "Return Fire",
+		num: -1016,
+		desc: "When this Pokemon is targeted by a non-contact move, attacker loses 1/8 max HP.",
+		onDamagingHitOrder: 1,
+		onDamagingHit(damage, target, source, move) {
+			if (!move.flags['contact']) {
+				this.damage(source.baseMaxhp / 8, source, target);
+			}
+		},
+	},
+	thorngrowth: {
+		name: "Thorn Growth",
+		num: -1018,
+		desc: "On entry, summons a room that turns contact moves into 1/4 recoil moves for 5 turns.",
+		pseudoWeather: 'thorngrowth',
+		onStart(source) {
+			this.field.addPseudoWeather('thorngrowth');
+		},
+		condition: {
+			duration: 5,
+			onStart(side, source) {
+				this.add('-fieldstart', 'ability: Thorn Growth', '[of] ' + source);
+			},
+			onModifyMove(move) {
+				if (move.flags['contact'] && !move.recoil) {
+					move.recoil = [25, 100];
+				}
+			},
+			onEnd() {
+				this.add('-fieldend', 'ability: Thorn Growth');
+			},
+		},
+	},
+	arborous: {
+		name: "Arborous",
+		num: -1019,
+		desc: "This Pokemon is immune to Bug and Flying when over 1/2 max HP.",
+		onTryHit(target, source, move) {
+			if (target !== source && (move.type === 'Bug' || move.type === 'Flying') && (target.hp > target.maxhp/2)) {
+				this.add('-immune', target, '[from] ability: Arborous');
+				return null;
+			}
+		},
+	},
+	figurehead: {
+		desc: "This Pokémon moves first in its priority bracket when it is the target of a super effective attack.",
+		shortDesc: "Moves first in its priority bracket when targeted with a super effective attack.",
+		onUpdate(pokemon) { // if this doesn't work, replace with onUpdate - trying to avoid checking 500 times since it shouldn't need to change mid-turn
+			for (const attacker of pokemon.side.foe.active) {
+				if (!attacker || attacker.fainted) continue;
+				const action = this.queue.willMove(attacker);
+				if (!action) return;
+				const move = this.dex.getMove(action.move);
+				if (move.category === 'Status') continue;
+				const target = this.getTarget(action.pokemon, action.move, action.targetLoc);
+				if (!target) return; // unfortunately not sure how to make this play nice with doubles ._. that feels like the biggest obstacle
+				const moveType = move.id === 'hiddenpower' ? target.hpType : move.type;
+				if (
+					this.dex.getImmunity(moveType, pokemon) && this.dex.getEffectiveness(moveType, pokemon) > 0 ||
+					move.ohko
+				) {
+					pokemon.addVolatile('figurehead');
+					return;
+				}
+			}
+		},
+		condition: {
+			duration: 1,
+			onStart(pokemon) {
+				const action = this.queue.willMove(pokemon);
+				if (action) {
+					this.add('-ability', pokemon, 'Figurehead');
+					this.add('-message', `${pokemon.name} prepared to move immediately!`);
+				}
+			},
+			onModifyPriority(priority) {
+				return priority + 0.1;
+			},
+		},
+		name: "Figurehead",
+		rating: 3,
+		num: -1020,
+	},
 };

data/mods/conniecorddraft/formats-data.ts

@@ -1,4 +1,5 @@
 export const FormatsData: {[k: string]: SpeciesFormatsData} = {
+	//Draft Season 1 custom mons
 	boohawk: {
 		tier: "CCD1",
 		doublesTier: "CCD1",
@@ -59,4 +60,34 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		tier: "CCD1",
 		doublesTier: "CCD1",
 	},
+	//Other custom mons
+	marabastion: {
+		tier: "New",
+		doublesTier: "New",
+	},
+	lurantissinnoh: {
+		tier: "New",
+		doublesTier: "New",
+	},
+	wormuddle: {
+		tier: "New",
+		doublesTier: "New",
+	},
+	shamaiai: {
+		tier: "New",
+		doublesTier: "New",
+	},
+	millibark: {
+		tier: "New",
+		doublesTier: "New",
+	},
+	graciflame: {
+		tier: "New",
+		doublesTier: "New",
+	},
+	flufnir: {
+		tier: "New",
+		doublesTier: "New",
+	},
+
 };