DPP sleep, Gen 5-8TS, small gay changes

ShivaD173 · Sep 14, 2024 · 32c043b · 32c043b
1 parent ce28066
commit 32c043b
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 56 deletions.
diff --git a/config/formats.ts b/config/formats.ts
@@ -289,7 +289,7 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		name: "[Gen 4] SU",
 		mod: 'gen4',
 		searchShow: true,
-		ruleset: ['[Gen 4] ZU'],
+		ruleset: ['[Gen 4] ZU', 'Sleep Moves Clause', '!Sleep Clause Mod'],
 		banlist: ['ZU', 'SUBL'],
 	},
 	{

diff --git a/data/mods/gen8/rulesets.ts b/data/mods/gen8/rulesets.ts
@@ -30,43 +30,43 @@ export const Rulesets: import('../../../sim/dex-formats').ModdedFormatDataTable
 			this.makeRequest('teampreview');
 		},
 	},
-	tiershiftmod: {
-		inherit: true,
-		desc: `Pok&eacute;mon below OU get their stats, excluding HP, boosted. UU/RUBL get +10, RU/NUBL get +20, NU/PUBL get +30, and PU or lower get +40.`,
-		onModifySpecies(species, target, source, effect) {
-			if (!species.baseStats) return;
-			const boosts: {[tier: string]: number} = {
-				uu: 10,
-				rubl: 10,
-				ru: 20,
-				nubl: 20,
-				nu: 30,
-				publ: 30,
-				pu: 40,
-				zubl: 40,
-				zu: 40,
-				nfe: 40,
-				lc: 40,
-			};
-			let tier: string = this.toID(species.tier);
-			if (!(tier in boosts)) return;
-			// Non-Pokemon bans in lower tiers
-			if (target) {
-				if (target.set.item === 'lightclay') return;
-				if (['drizzle', 'drought', 'slushrush'].includes(target.set.ability) && boosts[tier] > 20) tier = 'nubl';
-			}
-			const pokemon = this.dex.deepClone(species);
-			pokemon.bst = pokemon.baseStats['hp'];
-			const boost = boosts[tier];
-			let statName: StatID;
-			for (statName in pokemon.baseStats as StatsTable) {
-				if (statName === 'hp') continue;
-				pokemon.baseStats[statName] = this.clampIntRange(pokemon.baseStats[statName] + boost, 1, 255);
-				pokemon.bst += pokemon.baseStats[statName];
-			}
-			return pokemon;
-		},
-	},
+	// tiershiftmod: {
+	// 	inherit: true,
+	// 	desc: `Pok&eacute;mon below OU get their stats, excluding HP, boosted. UU/RUBL get +10, RU/NUBL get +20, NU/PUBL get +30, and PU or lower get +40.`,
+	// 	onModifySpecies(species, target, source, effect) {
+	// 		if (!species.baseStats) return;
+	// 		const boosts: {[tier: string]: number} = {
+	// 			uu: 10,
+	// 			rubl: 10,
+	// 			ru: 20,
+	// 			nubl: 20,
+	// 			nu: 30,
+	// 			publ: 30,
+	// 			pu: 40,
+	// 			zubl: 40,
+	// 			zu: 40,
+	// 			nfe: 40,
+	// 			lc: 40,
+	// 		};
+	// 		let tier: string = this.toID(species.tier);
+	// 		if (!(tier in boosts)) return;
+	// 		// Non-Pokemon bans in lower tiers
+	// 		if (target) {
+	// 			if (target.set.item === 'lightclay') return;
+	// 			if (['drizzle', 'drought', 'slushrush'].includes(target.set.ability) && boosts[tier] > 20) tier = 'nubl';
+	// 		}
+	// 		const pokemon = this.dex.deepClone(species);
+	// 		pokemon.bst = pokemon.baseStats['hp'];
+	// 		const boost = boosts[tier];
+	// 		let statName: StatID;
+	// 		for (statName in pokemon.baseStats as StatsTable) {
+	// 			if (statName === 'hp') continue;
+	// 			pokemon.baseStats[statName] = this.clampIntRange(pokemon.baseStats[statName] + boost, 1, 255);
+	// 			pokemon.bst += pokemon.baseStats[statName];
+	// 		}
+	// 		return pokemon;
+	// 	},
+	// },
 	bonustypemod: {
 		inherit: true,
 		desc: `Pok&eacute;mon can be nicknamed the name of a type to have that type added onto their current ones.`,

diff --git a/data/mods/gen9vgcgay/formats-data.ts b/data/mods/gen9vgcgay/formats-data.ts
@@ -2530,7 +2530,7 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"shayminsky": {
 		"isNonstandard": null,
-		"tier": "OU"
+		"tier": "Uber"
 	},
 	"arceus": {
 		"isNonstandard": null,
@@ -3294,7 +3294,7 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"kyuremwhite": {
 		"isNonstandard": null,
-		"tier": "OU"
+		"tier": "Uber"
 	},
 	"keldeo": {
 		"isNonstandard": null,
@@ -3681,8 +3681,8 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 		"tier": "Uber"
 	},
 	"zygardecomplete": {
-		"isNonstandard": "Past",
-		"tier": "Illegal"
+		"isNonstandard": null,
+		"tier": "Uber"
 	},
 	"diancie": {
 		"isNonstandard": null,

diff --git a/data/mods/gen9vgcgay/learnsets.ts b/data/mods/gen9vgcgay/learnsets.ts
@@ -126352,6 +126352,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "workup": [
                 "9M"
+            ],
+            "divebomb": [
+                "9M"
             ]
         }
     },
@@ -141167,6 +141170,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "zenheadbutt": [
                 "9M"
+            ],
+            "psychout": [
+                "9M"
             ]
         }
     },
@@ -143150,9 +143156,6 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             "fling": [
                 "9M"
             ],
-            "followme": [
-                "9M"
-            ],
             "frustration": [
                 "9M"
             ],
@@ -146840,6 +146843,12 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "zenheadbutt": [
                 "9M"
+            ],
+            "dragonrush": [
+                "9M"
+            ],
+            "thunderouskick": [
+                "9M"
             ]
         }
     },
@@ -147372,6 +147381,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "icepunch": [
                 "9M"
+            ],
+            "dragonrush": [
+                "9M"
             ]
         }
     },
@@ -148197,6 +148209,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "terablast": [
                 "9M"
+            ],
+            "feint": [
+                "9M"
             ]
         }
     },
@@ -152659,6 +152674,18 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "return": [
                 "9M"
+            ],
+            "shiftgear": [
+                "9M"
+            ],
+            "dragondance": [
+                "9M"
+            ],
+            "dragonrush": [
+                "9M"
+            ],
+            "divebomb": [
+                "9M"
             ]
         }
     },
@@ -152838,6 +152865,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "return": [
                 "9M"
+            ],
+            "shiftgear": [
+                "9M"
             ]
         }
     },

diff --git a/data/mods/gen9vgcgay/moves.ts b/data/mods/gen9vgcgay/moves.ts
@@ -1744,7 +1744,7 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
 	confusion: {
 		inherit: true,
 		basePower: 30,
-		shortDesc: "Uses Highest attacking stat. Exists mainly for Deoxys-A",
+		shortDesc: "Uses Highest attacking stat. Exists for Deoxys-A.",
 		secondary: {},
 		onModifyMove(move, pokemon) {
 			if (pokemon.getStat('atk', false, true) > pokemon.getStat('spa', false, true)) move.category = 'Physical';

diff --git a/data/mods/gen9vgcgay/pokedex.ts b/data/mods/gen9vgcgay/pokedex.ts
@@ -3254,9 +3254,9 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 		],
 		"baseStats": {
 			"hp": 90,
-			"atk": 60,
+			"atk": 50,
 			"def": 65,
-			"spa": 90,
+			"spa": 100,
 			"spd": 85,
 			"spe": 70
 		},
@@ -12591,7 +12591,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 		},
 		"inherit": true
 	},
-	"zygardecompleteform": {
+	"zygardecomplete": {
 		"types": [
 			"Dragon",
 			"Ground"
@@ -13041,11 +13041,11 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 			"Normal"
 		],
 		"baseStats": {
-			"hp": 95,
+			"hp": 105,
 			"atk": 95,
-			"def": 110,
-			"spa": 105,
-			"spd": 110,
+			"def": 100,
+			"spa": 115,
+			"spd": 100,
 			"spe": 85
 		},
 		"abilities": {

diff --git a/data/rulesets.ts b/data/rulesets.ts
@@ -2195,7 +2195,7 @@ export const Rulesets: import('../sim/dex-formats').FormatDataTable = {
 	prerutiershiftmod: {
 		effectType: "Rule",
 		name: "Pre RU Tier Shift Mod",
-		desc: `Pok&eacute;mon below OU get their stats, excluding HP, boosted. +5 per tier down to 10u.`,
+		desc: `Pok&eacute;mon below OU get their stats, excluding HP, boosted. UU/RUBL gets +15, +5 per tier down to 10u.`,
 		ruleset: ['Overflow Stat Mod'],
 		onBegin() {
 			this.add('rule', 'Tier Shift Mod: Pok\u00e9mon get stat buffs depending on their tier, excluding HP.');
@@ -2252,7 +2252,7 @@ export const Rulesets: import('../sim/dex-formats').FormatDataTable = {
 	tiershiftmod: {
 		effectType: "Rule",
 		name: "Tier Shift Mod",
-		desc: `Pok&eacute;mon below OU get their stats, excluding HP, boosted. UU/RUBL get +15, RU/NUBL get +20, NU/PUBL get +25, and PU or lower get +30.`,
+		desc: `Pok&eacute;mon below OU get their stats, excluding HP, boosted. UU/RUBL gets +15, +5 per tier down to 10u.`,
 		ruleset: ['Overflow Stat Mod'],
 		onBegin() {
 			this.add('rule', 'Tier Shift Mod: Pok\u00e9mon get stat buffs depending on their tier, excluding HP.');

diff --git a/data/text/moves.ts b/data/text/moves.ts
@@ -7593,7 +7593,7 @@ export const MovesText: {[id: IDEntry]: MoveText} = {
 		name: "Ice Rink",
 		desc: "The user has 1/8 of its maximum HP, rounded down, restored at the end of each turn while it remains active. If Big Root is held by the user, the HP recovered is 1.3x normal, rounded half down. If the user uses Baton Pass, the replacement will receive the healing effect.",
 		shortDesc: "User recovers 1/8 max HP per turn.",
-		start: "  [POKEMON] surrounded itself with a ice rink!",
+		start: "  [POKEMON] surrounded itself with an ice rink!",
 		heal: "  A veil of ice restored [POKEMON]'s HP!",
 	},
 	flashfreeze: {