Skip to content

Commit

Permalink
First wave of restricted changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShivaD173
ShivaD173 committed Oct 17, 2024
1 parent d551f92 commit cb0c9ee
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 49 deletions.
10 changes: 5 additions & 5 deletions data/abilities.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions data/mods/gen9vgcgay/learnsets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86089,9 +86089,6 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
"partingshot": [
"9M"
],
"snarl": [
"9M"
],
"darkpulse": [
"9M"
],
Expand Down
22 changes: 8 additions & 14 deletions data/mods/gen9vgcgay/moves.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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: {
Expand Down Expand Up @@ -1734,7 +1730,7 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
darkvoid: {
inherit: true,
isNonstandard: null,
accuracy: 75,
accuracy: 70,
},
hyperspacehole: {
inherit: true,
Expand All @@ -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') {
Expand Down
51 changes: 26 additions & 25 deletions data/mods/gen9vgcgay/pokedex.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions data/text/abilities.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down

0 comments on commit cb0c9ee

Please sign in to comment.