ZU unbans and gay changes

ShivaD173 · Oct 27, 2024 · 7a75bea · 7a75bea
1 parent 0e1326d
commit 7a75bea
Show file tree

Hide file tree

Showing 8 changed files with 7,274 additions and 6,132 deletions.
diff --git a/config/formats.ts b/config/formats.ts
@@ -54,14 +54,14 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		unbanlist: ['Mythical', 'Restricted Legendary', 'Greninja-Bond'],
 		restricted: ['Uber'],
 	},
-	{
-		name: "[Gen 9] VGC Pride FFA",
-		searchShow: true,
-		mod: 'gen9vgcgay',
-		gameType: 'freeforall',
-		ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Sketch Post-Gen 7 Moves'],
-		unbanlist: ['Greninja-Bond'],
-	},
+	// {
+	// 	name: "[Gen 9] VGC Pride FFA",
+	// 	searchShow: true,
+	// 	mod: 'gen9vgcgay',
+	// 	gameType: 'freeforall',
+	// 	ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Sketch Post-Gen 7 Moves'],
+	// 	unbanlist: ['Greninja-Bond'],
+	// },
 	{
 		section: "Free For All",
 	},
@@ -262,13 +262,13 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		banlist: ['SU', 'IUBL'],
 		unbanlist: ['Baton Pass + Substitute']
 	},
-	{
-		name: "[Gen 3] Lol",
-		mod: 'gen3',
-		searchShow: true,
-		ruleset: ['[Gen 3] IU'],
-		banlist: ['IU', '8UBL', '8U', '9UBL', '9U', '10UBL', '10U', '11UBL', 'NFE', 'LC', 'Leftovers'],
-	},
+	// {
+	// 	name: "[Gen 3] Lol",
+	// 	mod: 'gen3',
+	// 	searchShow: true,
+	// 	ruleset: ['[Gen 3] IU'],
+	// 	banlist: ['IU', '8UBL', '8U', '9UBL', '9U', '10UBL', '10U', '11UBL', 'NFE', 'LC', 'Leftovers'],
+	// },
 	{
 		section: "Gen 4 Lower Tiers",
 	},
@@ -300,13 +300,13 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		banlist: ['ZU', 'SUBL', 'SU', 'IUBL', 'Heat Rock'],
 		unbanlist: ['Damp Rock'],
 	},
-	{
-		name: "[Gen 4] Lol",
-		mod: 'gen4',
-		searchShow: true,
-		ruleset: ['[Gen 4] IU'],
-		banlist: ['IU', '8UBL', '8U', '9U', '10UBL', '10U', '11UBL', 'NFE', 'LC', 'UR'],
-	},
+	// {
+	// 	name: "[Gen 4] Lol",
+	// 	mod: 'gen4',
+	// 	searchShow: true,
+	// 	ruleset: ['[Gen 4] IU'],
+	// 	banlist: ['IU', '8UBL', '8U', '9U', '10UBL', '10U', '11UBL', 'NFE', 'LC', 'UR'],
+	// },
 	{
 		section: "Gen 5 Lower Tiers",
 	},
@@ -446,7 +446,7 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		mod: 'gen9',
 		searchShow: true,
 		ruleset: ['[Gen 9] National Dex PU'],
-		banlist: ['ND PU', 'ND ZUBL', 'Shell Smash']
+		banlist: ['ND PU', 'ND ZUBL']
 	},
 	{
 		section: "S/V Singles",

diff --git a/data/abilities.ts b/data/abilities.ts
@@ -6513,7 +6513,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 		num: -53,
 	},
 	copycore: {
-		onSwitchIn(pokemon) {
+		onStart(pokemon) {
 			const target = pokemon.side.foe.active[pokemon.side.foe.active.length - 1 - pokemon.position];
 			if (target) {
 				this.actions.useMove(this.dex.moves.get('copycat'), pokemon);
@@ -6525,7 +6525,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 		num: -54,
 	},
 	onslaughtcore: {
-		onSwitchIn(pokemon) {
+		onStart(pokemon) {
 			const target = pokemon.side.foe.active[pokemon.side.foe.active.length - 1 - pokemon.position];
 			if (target) {
 				this.actions.useMove(this.dex.moves.get('confusion'), pokemon, {target: target});
@@ -6537,7 +6537,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 		num: -55,
 	},
 	barriercore: {
-		onSwitchIn(pokemon) {
+		onStart(pokemon) {
 			this.actions.useMove(this.dex.moves.get('magiccoat'), pokemon);
 		},
 		name: "Barrier Core",
@@ -6546,7 +6546,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = {
 		num: -56,
 	},
 	hazardcore: {
-		onSwitchIn(pokemon) {
+		onStart(pokemon) {
 			this.actions.useMove(this.dex.moves.get('spikes'), pokemon);
 		},
 		name: "Hazard Core",

diff --git a/data/formats-data.ts b/data/formats-data.ts
@@ -521,7 +521,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
 	machamp: {
 		isNonstandard: "Past",
 		tier: "Illegal",
-		natDexTier: "ZUBL",
+		natDexTier: "ZU",
 	},
 	machampgmax: {
 		isNonstandard: "Past",
@@ -1507,7 +1507,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
 	sneasel: {
 		tier: "ZU",
 		doublesTier: "NFE",
-		natDexTier: "ZUBL",
+		natDexTier: "ZU",
 	},
 	sneaselhisui: {
 		tier: "SU",
@@ -3143,7 +3143,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
 		tier: "LC",
 	},
 	whimsicott: {
-		tier: "ZU",
+		tier: "NU",
 		doublesTier: "DOU",
 		natDexTier: "ZU",
 	},
@@ -4417,7 +4417,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
 	silvallyground: {
 		isNonstandard: "Past",
 		tier: "Illegal",
-		natDexTier: "ZUBL",
+		natDexTier: "ZU",
 	},
 	silvallyice: {
 		isNonstandard: "Past",

diff --git a/data/mods/gen9vgcgay/abilities.ts b/data/mods/gen9vgcgay/abilities.ts
@@ -189,15 +189,17 @@ export const Abilities: import('../../../sim/dex-abilities').ModdedAbilityDataTa
 	},
 	liquidooze: {
 		inherit: true,
-		shortDesc: "Deals damage instead of draining, Replaces foods with Black Sludges on hit.",
+		shortDesc: "This Pokemon's contact moves replace items with Black Sludges on hit.",
+		onSourceTryHeal(damage, target, source, effect) {
+		},
 		onModifyMove(move) {
 			move.secondaries?.push({
 				chance: 100,
 				onHit(target) {
-					if (target.item === "leftovers" || target.item.endsWith("berry")) {
-						this.add('message', 'Item replaced with Liquid Ooze');
-						target.setItem("blacksludge");
-					}
+					const item = target.getItem();
+					if (!this.singleEvent('TakeItem', item, target.itemState, target, target, move, item)) return;
+					this.add('message', 'Item replaced with Liquid Ooze');
+					target.setItem("blacksludge");
 				}
 			});
 		}
@@ -265,6 +267,10 @@ export const Abilities: import('../../../sim/dex-abilities').ModdedAbilityDataTa
 	illuminate: {
 		inherit: true,
 		shortDesc: "While this Pokemon is active, all moves has 1.2x accuracy.",
+		onStart(pokemon) {
+			if (this.suppressingAbility(pokemon)) return;
+			this.add('-ability', pokemon, 'Illuminate');
+		},
 		onTryBoost(boost, target, source, effect) {
 		},
 		onModifyMove(move) {