Metro Tier shift, fix some gay things

ShivaD173 · Sep 8, 2024 · def4d4e · def4d4e
1 parent bc59353
commit def4d4e
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 43 deletions.
diff --git a/data/mods/gen9metronome/formats-data.ts b/data/mods/gen9metronome/formats-data.ts
@@ -1,7 +1,7 @@
 export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = {
 	"clefairy": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"clefable": {
 		"isNonstandard": null,
@@ -61,7 +61,7 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"golemalola": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"slowbro": {
 		"isNonstandard": null,
@@ -393,7 +393,7 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"grimmsnarl": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"perrserker": {
 		"isNonstandard": null,
@@ -457,7 +457,7 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"screamtail": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"ironhands": {
 		"isNonstandard": null,
@@ -473,15 +473,15 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"hitmonlee": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"hitmonchan": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"magmar": {
 		"isNonstandard": null,
-		"tier": "NFE"
+		"tier": "UU"
 	},
 	"magmortar": {
 		"isNonstandard": null,
@@ -493,23 +493,23 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"electivire": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"snubbull": {
 		"isNonstandard": null,
 		"tier": "LC"
 	},
 	"granbull": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"alcremie": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"smeargle": {
 		"isNonstandard": null,
-		"tier": "UU"
+		"tier": "RU"
 	},
 	"scrafty": {
 		"isNonstandard": null,

diff --git a/data/mods/gen9vgcgay/abilities.ts b/data/mods/gen9vgcgay/abilities.ts
@@ -1104,6 +1104,8 @@ export const Abilities: import('../../../sim/dex-abilities').ModdedAbilityDataTa
 			if (move.flags['contact']) mod /= 2;
 			return this.chainModify(mod);
 		},
+		onTryBoost(boost, target, source, effect) {
+		},
 	},
 	lingeringaroma: {
 		inherit: true,

diff --git a/data/mods/gen9vgcgay/formats-data.ts b/data/mods/gen9vgcgay/formats-data.ts
@@ -2594,7 +2594,7 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"arceusrock": {
 		"isNonstandard": null,
-		"tier": "OU"
+		"tier": "Uber"
 	},
 	"arceussteel": {
 		"isNonstandard": null,
@@ -5298,7 +5298,7 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
 	},
 	"terapagos": {
 		"isNonstandard": null,
-		"tier": "OU"
+		"tier": "Uber"
 	},
 	"terapagosterastal": {
 		"isNonstandard": null,

diff --git a/data/mods/gen9vgcgay/items.ts b/data/mods/gen9vgcgay/items.ts
@@ -39,17 +39,15 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 			this.add('-activate', pokemon, 'item: Lustrous Globe');
 			pokemon.formeChange('Palkia-Origin', this.effect, true);
 		},*/
-		onDamagePriority: 1,
-		onDamage(damage, target, source, effect) {
-			if (target.baseSpecies.baseSpecies !== 'Palkia' || target.transformed || !target.hp) return;
-			if (target.species.id === 'palkiaorigin' || target.hp > target.maxhp / 2) return;
-			this.add('-activate', target, 'item: Lustrous Globe');
-			target.formeChange('Palkia-Origin', this.effect, true);
+		onUpdate(pokemon) {
+			if (pokemon.baseSpecies.baseSpecies !== 'Palkia' || pokemon.transformed || !pokemon.hp) return;
+			if (pokemon.species.id === 'palkiaorigin' || pokemon.hp > pokemon.maxhp / 2) return;
+			this.add('-activate', pokemon, 'item: Lustrous Globe');
+			pokemon.formeChange('Palkia-Origin', this.effect, true);
 		},
 		desc: "If the holder is Palkia, transforms into Origin forme at 1/2 HP.",
 		shortDesc: "Palkia: transforms at 1/2 HP.",
 		itemUser: ["Palkia-Origin"],
-		onBasePowerPriority: 15,
 		onBasePower() {},
 		forcedForme: "",
 	},
@@ -62,17 +60,15 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 			this.add('-activate', pokemon, 'item: Adamant Crystal');
 			pokemon.formeChange('Dialga-Origin', this.effect, true);
 		},*/
-		onDamagePriority: 1,
-		onDamage(damage, target, source, effect) {
-			if (target.baseSpecies.baseSpecies !== 'Dialga' || target.transformed || !target.hp) return;
-			if (target.species.id === 'dialgaorigin' || target.hp > target.maxhp / 2) return;
-			this.add('-activate', target, 'item: Adamant Crystal');
-			target.formeChange('Dialga-Origin', this.effect, true);
+		onUpdate(pokemon) {
+			if (pokemon.baseSpecies.baseSpecies !== 'Dialga' || pokemon.transformed || !pokemon.hp) return;
+			if (pokemon.species.id === 'dialgaorigin' || pokemon.hp > pokemon.maxhp / 2) return;
+			this.add('-activate', pokemon, 'item: Adamant Crystal');
+			pokemon.formeChange('Dialga-Origin', this.effect, true);
 		},
 		desc: "If the holder is Dialga, transforms into Origin forme at 1/2 HP.",
 		shortDesc: "Dialga: transforms at 1/2 HP.",
 		itemUser: ["Dialga"],
-		onBasePowerPriority: 15,
 		onBasePower() {},
 		forcedForme: "",
 	},
@@ -85,17 +81,15 @@ export const Items: import('../../../sim/dex-items').ModdedItemDataTable = {
 			this.add('-activate', pokemon, 'item: Griseous Core');
 			pokemon.formeChange('Giratina-Origin', this.effect, true);
 		},*/
-		onDamagePriority: 1,
-		onDamage(damage, target, source, effect) {
-			if (target.baseSpecies.baseSpecies !== 'Giratina' || target.transformed || !target.hp) return;
-			if (target.species.id === 'giratinaorigin' || target.hp > target.maxhp / 2) return;
-			this.add('-activate', target, 'item: Griseous Core');
-			target.formeChange('Giratina-Origin', this.effect, true);
+		onUpdate(pokemon) {
+			if (pokemon.baseSpecies.baseSpecies !== 'Giratina' || pokemon.transformed || !pokemon.hp) return;
+			if (pokemon.species.id === 'giratinaorigin' || pokemon.hp > pokemon.maxhp / 2) return;
+			this.add('-activate', pokemon, 'item: Griseous Core');
+			pokemon.formeChange('Giratina-Origin', this.effect, true);
 		},
 		desc: "If the holder is Giratina, transforms into Origin forme at 1/2 HP.",
 		shortDesc: "Giratina: transforms at 1/2 HP.",
 		itemUser: ["Giratina"],
-		onBasePowerPriority: 15,
 		onBasePower() {},
 		forcedForme: "",
 	},

diff --git a/data/mods/gen9vgcgay/learnsets.ts b/data/mods/gen9vgcgay/learnsets.ts
@@ -59617,6 +59617,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "xscissor": [
                 "9M"
+            ],
+            "bodypress": [
+                "9M"
             ]
         }
     },
@@ -108721,6 +108724,9 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             ],
             "terablast": [
                 "9M"
+            ],
+            "playrough": [
+                "9M"
             ]
         }
     },
@@ -149365,10 +149371,7 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
             "teleport": [
                 "9M"
             ],
-            "hiddenpower": [
-                "9M"
-            ],
-            "terablast": [
+            "storedpower": [
                 "9M"
             ]
         }

diff --git a/data/mods/gen9vgcgay/moves.ts b/data/mods/gen9vgcgay/moves.ts
@@ -257,6 +257,16 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
 		"basePower": 250
 	},
 	// Regular Moves
+	rocksmash: {
+		inherit: true,
+		shortDesc: "100% chance to lower the target's Defense by 1.",
+		secondary: {
+			chance: 100,
+			boosts: {
+				def: -1,
+			},
+		},
+	},
 	round: {
 		inherit: true,
 		basePower: 70,
@@ -1716,6 +1726,11 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
 		isNonstandard: null,
 		basePower: 180,
 	},
+	spectralthief: {
+		inherit: true,
+		isNonstandard: null,
+		basePower: 100,
+	},
 	// Origin forme changes
 	roaroftime: {
 		inherit: true,
@@ -2267,6 +2282,10 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
 		inherit: true,
 		isNonstandard: null,
 	},
+	vcreate: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	// Move Deletions
 	slam: {
 		inherit: true,

diff --git a/data/mods/gen9vgcgay/pokedex.ts b/data/mods/gen9vgcgay/pokedex.ts
@@ -4124,7 +4124,6 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 		},
 		"abilities": {
 			"0": "Intimidate",
-			"1": "Hustle",
 			"H": "Unnerve"
 		},
 		"inherit": true
@@ -4902,7 +4901,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 			"spe": 45
 		},
 		"abilities": {
-			"0": "Singularity",
+			"0": "Pressure",
 			"1": "Iron Fist",
 			"H": "Frisk"
 		},
@@ -8697,7 +8696,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 		"abilities": {
 			"0": "Beast Boost",
 			"1": "Lifetaker",
-			"H": "Singularity"
+			"H": "Dragon's Maw"
 		},
 		"inherit": true
 	},
@@ -12889,7 +12888,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 			"spe": 50
 		},
 		"abilities": {
-			"0": "As One Glastrier"
+			"0": "As One (Glastrier)"
 		},
 		"inherit": true
 	},
@@ -12907,7 +12906,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable
 			"spe": 150
 		},
 		"abilities": {
-			"0": "As One Spectrier"
+			"0": "As One (Spectrier)"
 		},
 		"inherit": true
 	},