diff --git a/data/abilities.ts b/data/abilities.ts index abf667bd168b..a33d3d99563c 100644 --- a/data/abilities.ts +++ b/data/abilities.ts @@ -6516,7 +6516,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = { onSwitchIn(pokemon) { const target = pokemon.side.foe.active[pokemon.side.foe.active.length - 1 - pokemon.position]; if (target) { - this.actions.useMove(Dex.moves.get('copycat'), pokemon); + this.actions.useMove(this.dex.moves.get('copycat'), pokemon); } }, name: "Copy Core", @@ -6528,7 +6528,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = { onSwitchIn(pokemon) { const target = pokemon.side.foe.active[pokemon.side.foe.active.length - 1 - pokemon.position]; if (target) { - this.actions.useMove(Dex.moves.get('confusion'), pokemon, {target: target}); + this.actions.useMove(this.dex.moves.get('confusion'), pokemon, {target: target}); } }, name: "Onslaught Core", @@ -6538,7 +6538,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = { }, barriercore: { onSwitchIn(pokemon) { - this.actions.useMove(Dex.moves.get('magiccoat'), pokemon); + this.actions.useMove(this.dex.moves.get('magiccoat'), pokemon); }, name: "Barrier Core", isNonstandard: "CAP", @@ -6547,7 +6547,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = { }, hazardcore: { onSwitchIn(pokemon) { - this.actions.useMove(Dex.moves.get('spikes'), pokemon); + this.actions.useMove(this.dex.moves.get('spikes'), pokemon); }, name: "Hazard Core", isNonstandard: "CAP", @@ -6561,7 +6561,7 @@ export const Abilities: import('../sim/dex-abilities').AbilityDataTable = { return; } const dazzlingHolder = this.effectState.target; - if ((source.isAlly(dazzlingHolder) || move.target === 'all') && move.priority > 0.1) { + if ((source === dazzlingHolder || move.target === 'all') && move.priority > 0.1) { this.attrLastMove('[still]'); this.add('cant', dazzlingHolder, 'ability: Time Lord', move, '[of] ' + target); return false; diff --git a/data/mods/gen9vgcgay/learnsets.ts b/data/mods/gen9vgcgay/learnsets.ts index 9a7914e30710..f191e60b2d0e 100644 --- a/data/mods/gen9vgcgay/learnsets.ts +++ b/data/mods/gen9vgcgay/learnsets.ts @@ -86089,9 +86089,6 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab "partingshot": [ "9M" ], - "snarl": [ - "9M" - ], "darkpulse": [ "9M" ], diff --git a/data/mods/gen9vgcgay/moves.ts b/data/mods/gen9vgcgay/moves.ts index 163879dddd06..53af5451c889 100644 --- a/data/mods/gen9vgcgay/moves.ts +++ b/data/mods/gen9vgcgay/moves.ts @@ -966,7 +966,7 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = { inherit: true, isNonstandard: null, shortDesc: "Hits Twice, 20% to drop defense", - basePower: 50, + basePower: 45, multihit: 2, }, ragefist: { @@ -988,14 +988,10 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = { }, }, }, - dragondarts: { - inherit: true, - basePower: 55 - }, twinbeam: { inherit: true, shortDesc: "Hits twice. Doubles: Tries to hit each foe once.", - basePower: 55, + basePower: 50, smartTarget: true, }, diamondstorm: { @@ -1734,7 +1730,7 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = { darkvoid: { inherit: true, isNonstandard: null, - accuracy: 75, + accuracy: 70, }, hyperspacehole: { inherit: true, @@ -1756,21 +1752,19 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = { inherit: true, isNonstandard: null, self: null, - shortDesc: "User recharge if doesn't KO. Dialga-O: Hits both foes.", + basePower: 140, + shortDesc: "User recharge if doesn't KO. Dialga-O: No Recharge.", onHit(target, source) { - if (target.hp) { + if (target.hp || source.species.name === 'Dialga-Origin') { source.addVolatile('mustrecharge'); } }, - onModifyMove(move, pokemon) { - if (pokemon.species.name === 'Dialga-Origin') { - move.target = 'allAdjacentFoes'; - } - }, }, spacialrend: { inherit: true, isNonstandard: null, + basePower: 95, + accuracy: true, shortDesc: "High critical hit ratio. Palkia-O: Always crits.", onModifyMove(move, pokemon) { if (pokemon.species.name === 'Palkia-Origin') { diff --git a/data/mods/gen9vgcgay/pokedex.ts b/data/mods/gen9vgcgay/pokedex.ts index 0aee151cb505..7acb15511a48 100644 --- a/data/mods/gen9vgcgay/pokedex.ts +++ b/data/mods/gen9vgcgay/pokedex.ts @@ -1932,9 +1932,9 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "baseStats": { "hp": 200, "atk": 33, - "def": 68, + "def": 63, "spa": 33, - "spd": 68, + "spd": 63, "spe": 33 }, "abilities": { @@ -4177,7 +4177,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "def": 80, "spa": 97, "spd": 88, - "spe": 90 + "spe": 85 }, "abilities": { "0": "Flower Gift" @@ -4194,7 +4194,7 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "def": 80, "spa": 97, "spd": 88, - "spe": 90 + "spe": 85 }, "abilities": { "0": "Flower Gift" @@ -12382,9 +12382,9 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "baseStats": { "hp": 91, "atk": 72, - "def": 90, + "def": 85, "spa": 129, - "spd": 90, + "spd": 85, "spe": 108 }, "abilities": { @@ -12400,9 +12400,9 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "baseStats": { "hp": 91, "atk": 72, - "def": 90, + "def": 85, "spa": 129, - "spd": 90, + "spd": 85, "spe": 108 }, "abilities": { @@ -12577,11 +12577,11 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "Ground" ], "baseStats": { - "hp": 108, + "hp": 100, "atk": 100, - "def": 121, - "spa": 81, - "spd": 95, + "def": 123, + "spa": 85, + "spd": 97, "spe": 95 }, "abilities": { @@ -12597,10 +12597,10 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable ], "baseStats": { "hp": 64, - "atk": 140, - "def": 71, - "spa": 100, - "spd": 85, + "atk": 135, + "def": 76, + "spa": 95, + "spd": 90, "spe": 140 }, "abilities": { @@ -12615,11 +12615,11 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "Ground" ], "baseStats": { - "hp": 216, + "hp": 200, "atk": 100, - "def": 121, - "spa": 91, - "spd": 95, + "def": 123, + "spa": 95, + "spd": 97, "spe": 85 }, "abilities": { @@ -12943,7 +12943,8 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "spe": 105 }, "abilities": { - "0": "Leaf Guard" + "0": "Leaf Guard", + "H": "Seed Sower" }, "inherit": true }, @@ -13059,11 +13060,11 @@ export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable "Normal" ], "baseStats": { - "hp": 105, + "hp": 95, "atk": 95, - "def": 100, - "spa": 115, - "spd": 100, + "def": 110, + "spa": 105, + "spd": 110, "spe": 85 }, "abilities": { diff --git a/data/text/abilities.ts b/data/text/abilities.ts index b84f0cea2618..e9d23d9ab601 100644 --- a/data/text/abilities.ts +++ b/data/text/abilities.ts @@ -2509,8 +2509,8 @@ export const AbilitiesText: {[id: IDEntry]: AbilityText} = { }, timelord: { name: "Time Lord", - desc: "Priority moves used by opposing Pokemon targeting this Pokemon or its allies are prevented from having an effect.", - shortDesc: "This Pokemon and its allies are protected from opposing priority moves.", + desc: "Priority moves used by opposing Pokemon targeting this Pokemon only are prevented from having an effect.", + shortDesc: "This Pokemon is protected from opposing priority moves.", block: "#damp", }, megashiftx: {