Gay to Pride

ShivaD173 · Oct 13, 2024 · db18d02 · db18d02
1 parent dea486b
commit db18d02
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 19 deletions.
diff --git a/config/formats.ts b/config/formats.ts
@@ -26,7 +26,7 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		section: "Custom Modes",
 	},
 	{
-		name: "[Gen 9] VGC Gay Random Battle",
+		name: "[Gen 9] VGC Pride Random Battle",
 		searchShow: true,
 		mod: 'gen9vgcgay',
 		team: 'random',
@@ -36,7 +36,7 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		unbanlist: ['Greninja-Bond'],
 	},
 	{
-		name: "[Gen 9] VGC Gay",
+		name: "[Gen 9] VGC Pride",
 		searchShow: true,
 		mod: 'gen9vgcgay',
 		gameType: 'doubles',
@@ -45,7 +45,7 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		unbanlist: ['Greninja-Bond'],
 	},
 	{
-		name: "[Gen 9] VGC Gay Restricted",
+		name: "[Gen 9] VGC Pride Restricted",
 		searchShow: true,
 		mod: 'gen9vgcgay',
 		gameType: 'doubles',
@@ -55,7 +55,7 @@ export const Formats: import('../sim/dex-formats').FormatList = [
 		restricted: ['Uber'],
 	},
 	{
-		name: "[Gen 9] VGC Gay FFA",
+		name: "[Gen 9] VGC Pride FFA",
 		searchShow: true,
 		mod: 'gen9vgcgay',
 		gameType: 'freeforall',

diff --git a/data/mods/gen9vgcgay/formats-data.ts b/data/mods/gen9vgcgay/formats-data.ts
@@ -3301,8 +3301,8 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 		"tier": "OU"
 	},
 	"keldeoresolute": {
-		"isNonstandard": "Past",
-		"tier": "Illegal"
+		"isNonstandard": null,
+		"tier": "OU"
 	},
 	"meloetta": {
 		"isNonstandard": null,

diff --git a/data/mods/gen9vgcgay/learnsets.ts b/data/mods/gen9vgcgay/learnsets.ts
@@ -30593,6 +30593,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "recycle": [
                 "9M"
+            ],
+            "shelter": [
+                "9M"
             ]
         }
     },
@@ -63072,6 +63075,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "aeroblast": [
                 "9M"
+            ],
+            "partingshot": [
+                "9M"
             ]
         }
     },
@@ -100216,6 +100222,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "stalacbite": [
                 "9M"
+            ],
+            "trumpcard": [
+                "9M"
             ]
         }
     },
@@ -140061,6 +140070,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "snowscape": [
                 "9M"
+            ],
+            "closecombat": [
+                "9M"
             ]
         }
     },
@@ -145970,6 +145982,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "snowscape": [
                 "9M"
+            ],
+            "megahorn": [
+                "9M"
             ]
         }
     },

diff --git a/data/mods/gen9vgcgay/moves.ts b/data/mods/gen9vgcgay/moves.ts
@@ -1001,7 +1001,7 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
 	diamondstorm: {
 		inherit: true,
 		isNonstandard: null,
-		shortDesc: "Hits both in sandstorm, 50% raise defense by 1",
+		shortDesc: "Hits both in sandstorm, 50% raise defense by 1.",
 		target: "normal",
 		category: "Special",
 		basePower: 95,
@@ -1781,7 +1781,7 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
 	shadowforce: {
 		inherit: true,
 		isNonstandard: null,
-		shortDesc: "Breaks protection. Not Giratina-O: Disappears T1, hits T2.",
+		shortDesc: "Breaks Protect. Not Gira-O: Disappears T1, hits T2.",
 		onTryMove(attacker, defender, move) {
 			if (attacker.removeVolatile(move.id)) {
 				return;

diff --git a/data/mods/gen9vgcgay/pokedex.ts b/data/mods/gen9vgcgay/pokedex.ts
@@ -12392,6 +12392,24 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 		},
 		"inherit": true
 	},
+	"keldeoresolute": {
+		"types": [
+			"Water",
+			"Fighting"
+		],
+		"baseStats": {
+			"hp": 91,
+			"atk": 72,
+			"def": 90,
+			"spa": 129,
+			"spd": 90,
+			"spe": 108
+		},
+		"abilities": {
+			"0": "Justified"
+		},
+		"inherit": true
+	},
 	"meloetta": {
 		"types": [
 			"Normal",
@@ -12687,7 +12705,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 			"Steel"
 		],
 		"baseStats": {
-			"hp": 137,
+			"hp": 127,
 			"atk": 137,
 			"def": 107,
 			"spa": 113,
@@ -12705,7 +12723,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 			"Ghost"
 		],
 		"baseStats": {
-			"hp": 137,
+			"hp": 127,
 			"atk": 113,
 			"def": 89,
 			"spa": 137,
@@ -12726,8 +12744,8 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 			"hp": 97,
 			"atk": 157,
 			"def": 127,
-			"spa": 113,
-			"spd": 109,
+			"spa": 108,
+			"spd": 104,
 			"spe": 77
 		},
 		"abilities": {
@@ -12742,8 +12760,8 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 		],
 		"baseStats": {
 			"hp": 97,
-			"atk": 113,
-			"def": 109,
+			"atk": 108,
+			"def": 104,
 			"spa": 157,
 			"spd": 127,
 			"spe": 77
@@ -12811,11 +12829,11 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 			"Steel"
 		],
 		"baseStats": {
-			"hp": 135,
+			"hp": 125,
 			"atk": 133,
 			"def": 133,
-			"spa": 80,
-			"spd": 65,
+			"spa": 85,
+			"spd": 60,
 			"spe": 34
 		},
 		"abilities": {

diff --git a/sim/battle-actions.ts b/sim/battle-actions.ts
@@ -404,7 +404,7 @@ export class BattleActions {
 				this.runMove(move.id, dancer, dancersTargetLoc, {sourceEffect: this.dex.abilities.get('ballin'), externalMove: true});
 			}
 		}
-		if (this.battle.format.fullname.includes("vgcgay")) {
+		if (this.battle.format.fullname.includes("vgcpride")) {
 			if (pokemon.hasAbility("plus") && moveDidSomething && !move.isExternal) {
 				const dancers = [];
 				for (const currentPoke of this.battle.getAllActive()) {

diff --git a/sim/teams.ts b/sim/teams.ts
@@ -620,7 +620,7 @@ export const Teams = new class Teams {
 		format = Dex.formats.get(format);
 		if (toID(format).includes('gen9computergeneratedteams')) {
 			TeamGenerator = require(Dex.forFormat(format).dataDir + '/cg-teams').default;
-		} else if (toID(format).includes('gen9vgcgay')) {
+		} else if (toID(format).includes('gen9vgcpride')) {
 			TeamGenerator = require(`../data/mods/gen9vgcgay/random-teams`).default;
 		} else if (toID(format).includes('gen9superstaffbrosultimate')) {
 			TeamGenerator = require(`../data/mods/gen9ssb/random-teams`).default;