Skip to content

Commit

Permalink
Update @pkmn/dex
Browse files Browse the repository at this point in the history
  • Loading branch information
@thejetou
thejetou committed Sep 15, 2023
1 parent 3553cff commit d71a899
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 63 deletions.
30 changes: 15 additions & 15 deletions calc/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion calc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@types/node": "^18.14.2"
},
"devDependencies": {
"@pkmn/dex": "^0.7.43",
"@pkmn/dex": "^0.7.51",
"@pkmn/eslint-config": "^2.15.0",
"@types/jest": "^29.4.0",
"@typescript-eslint/eslint-plugin": "^5.54.0",
Expand Down
2 changes: 1 addition & 1 deletion calc/src/data/abilities.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ const SV = SS.concat([
'Earth Eater',
'Electromorphosis',
'Embody Aspect (Cornerstone)',
'Embody Aspect (Heartflame)',
'Embody Aspect (Hearthflame)',
'Embody Aspect (Teal)',
'Embody Aspect (Wellspring)',
'Good as Gold',
Expand Down
4 changes: 4 additions & 0 deletions calc/src/data/items.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ const DPP = ADV.concat([
const BW = DPP.concat([
'Absorb Bulb',
'Air Balloon',
'Big Nugget',
'Binding Band',
'Bug Gem',
'Burn Drive',
Expand Down Expand Up @@ -482,11 +483,14 @@ const SV = SS.concat([
'Hearthflame Mask',
'Loaded Dice',
'Malicious Armor',
'Masterpiece Teacup',
'Mirror Herb',
'Punching Glove',
'Lustrous Globe',
'Griseous Core',
'Strange Ball',
'Syrupy Apple',
'Unremarkable Teacup',
'Wellspring Mask',
]);

Expand Down
11 changes: 9 additions & 2 deletions calc/src/data/moves.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4258,7 +4258,13 @@ const SV_PATCH: {[name: string]: DeepPartial<MoveData>} = {
isWind: true,
target: 'allAdjacentFoes',
},
'Blood Moon': {bp: 120, category: 'Special', type: 'Normal'},
'Blood Moon': {
bp: 140,
type: 'Normal',
category: 'Special',
zp: 200,
maxPower: 140,
},
'Ceaseless Edge': {
bp: 65,
type: 'Dark',
Expand Down Expand Up @@ -4490,8 +4496,9 @@ const SV_PATCH: {[name: string]: DeepPartial<MoveData>} = {
type: 'Grass',
category: 'Special',
target: 'allAdjacentFoes',
zp: 140,
zp: 160,
maxPower: 130,
secondaries: true,
drain: [1, 2],
},
'Mortal Spin': {
Expand Down
73 changes: 39 additions & 34 deletions calc/src/data/species.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6203,7 +6203,7 @@ const SM_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
Geodude: {otherFormes: ['Geodude-Alola']},
Golem: {otherFormes: ['Golem-Alola']},
Graveler: {otherFormes: ['Graveler-Alola']},
Greninja: {otherFormes: ['Greninja-Ash']},
Greninja: {otherFormes: ['Greninja-Ash', 'Greninja-Bond']},
Grimer: {otherFormes: ['Grimer-Alola']},
Illumise: {bs: {df: 75, sd: 85}},
Lunatone: {bs: {hp: 90}},
Expand Down Expand Up @@ -6500,6 +6500,13 @@ const SM_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
abilities: {0: 'Battle Bond'},
baseSpecies: 'Greninja',
},
'Greninja-Bond': {
types: ['Water', 'Dark'],
bs: {hp: 72, at: 95, df: 67, sa: 103, sd: 71, sp: 122},
weightkg: 40,
abilities: {0: 'Battle Bond'},
baseSpecies: 'Greninja',
},
Grubbin: {
types: ['Bug'],
bs: {hp: 47, at: 62, df: 45, sa: 55, sd: 45, sp: 46},
Expand Down Expand Up @@ -7983,7 +7990,7 @@ const SS_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
'Farfetch\u2019d-Galar': {
types: ['Fighting'],
bs: {hp: 52, at: 95, df: 55, sa: 58, sd: 62, sp: 55},
weightkg: 15,
weightkg: 42,
abilities: {0: 'Steadfast'},
nfe: true,
baseSpecies: 'Farfetch\u2019d',
Expand Down Expand Up @@ -8883,7 +8890,7 @@ const PLA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
Overqwil: {
types: ['Dark', 'Poison'],
bs: {hp: 85, at: 115, df: 95, sa: 65, sd: 65, sp: 85},
weightkg: 3.9,
weightkg: 60.5,
abilities: {0: 'Poison Point'},
},
'Palkia-Origin': {
Expand Down Expand Up @@ -8988,6 +8995,13 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
'Zacian-Crowned': {bs: {at: 150}},
Zamazenta: {bs: {at: 120}},
'Zamazenta-Crowned': {bs: {at: 120, df: 140, sd: 140}},
Ababo: {
types: ['Fairy'],
bs: {hp: 42, at: 35, df: 27, sa: 35, sd: 35, sp: 38},
weightkg: 3.5,
abilities: {0: 'Pixilate'},
nfe: true,
},
Annihilape: {
types: ['Fighting', 'Ghost'],
bs: {hp: 110, at: 115, df: 80, sa: 50, sd: 90, sp: 90},
Expand Down Expand Up @@ -9169,10 +9183,10 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
abilities: {0: 'Cud Chew'},
},
Fezandipiti: {
types: ['Poison', 'Psychic'],
types: ['Poison', 'Fairy'],
bs: {hp: 88, at: 91, df: 82, sa: 70, sd: 125, sp: 99},
weightkg: 12.2,
gender: 'M',
weightkg: 30.1,
// gender: 'M',
abilities: {0: 'Toxic Chain'},
},
Fidough: {
Expand Down Expand Up @@ -9296,7 +9310,7 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
},
Hemogoblin: {
types: ['Fairy', 'Fire'],
bs: {hp: 90, at: 99, df: 89, sa: 99, sd: 97, sp: 55},
bs: {hp: 90, at: 96, df: 87, sa: 96, sd: 89, sp: 55},
weightkg: 85,
abilities: {0: 'Pixilate'},
},
Expand Down Expand Up @@ -9444,9 +9458,8 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
},
Munkidori: {
types: ['Poison', 'Psychic'],
bs: {hp: 88, at: 75, sa: 130, sd: 90, sp: 106},
bs: {hp: 88, at: 75, df: 66, sa: 130, sd: 90, sp: 106},
weightkg: 12.2,
gender: 'M',
abilities: {0: 'Toxic Chain'},
},
Nacli: {
Expand All @@ -9472,78 +9485,64 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
},
Ogerpon: {
types: ['Grass'],
gender: 'F',
bs: {hp: 80, at: 120, df: 84, sa: 60, sd: 96, sp: 110},
abilities: {0: 'Defiant'},
weightkg: 39.8,
otherFormes: [
'Ogerpon-Wellspring', 'Ogerpon-Hearthflame', 'Ogerpon-Cornerstone', 'Ogerpon-Teal-Tera',
'Ogerpon-Wellspring-Tera', 'Ogerpon-Hearthflame-Tera', 'Ogerpon-Cornerstone-Tera',
'Ogerpon-Cornerstone', 'Ogerpon-Cornerstone-Tera',
'Ogerpon-Hearthflame', 'Ogerpon-Hearthflame-Tera',
'Ogerpon-Teal-Tera',
'Ogerpon-Wellspring', 'Ogerpon-Wellspring-Tera',
],
forceTeraType: 'Grass',
},
'Ogerpon-Wellspring': {
types: ['Grass', 'Water'],
gender: 'F',
bs: {hp: 80, at: 120, df: 84, sa: 60, sd: 96, sp: 110},
abilities: {0: 'Water Absorb'},
weightkg: 39.8,
baseSpecies: 'Ogerpon',
forceTeraType: 'Water',
},
'Ogerpon-Hearthflame': {
types: ['Grass', 'Fire'],
gender: 'F',
bs: {hp: 80, at: 120, df: 84, sa: 60, sd: 96, sp: 110},
abilities: {0: 'Mold Breaker'},
weightkg: 39.8,
baseSpecies: 'Ogerpon',
forceTeraType: 'Fire',
},
'Ogerpon-Cornerstone': {
types: ['Grass', 'Rock'],
gender: 'F',
bs: {hp: 80, at: 120, df: 84, sa: 60, sd: 96, sp: 110},
abilities: {0: 'Sturdy'},
weightkg: 39.8,
baseSpecies: 'Ogerpon',
forceTeraType: 'Rock',
},
'Ogerpon-Teal-Tera': {
types: ['Grass'],
gender: 'F',
bs: {hp: 80, at: 120, df: 84, sa: 60, sd: 96, sp: 110},
abilities: {0: 'Embody Aspect (Teal)'},
weightkg: 39.8,
baseSpecies: 'Ogerpon',
forceTeraType: 'Grass',
},
'Ogerpon-Wellspring-Tera': {
types: ['Grass', 'Water'],
gender: 'F',
bs: {hp: 80, at: 120, df: 84, sa: 60, sd: 96, sp: 110},
abilities: {0: 'Embody Aspect (Wellspring)'},
weightkg: 39.8,
baseSpecies: 'Ogerpon',
forceTeraType: 'Water',
},
'Ogerpon-Hearthflame-Tera': {
types: ['Grass', 'Fire'],
gender: 'F',
bs: {hp: 80, at: 120, df: 84, sa: 60, sd: 96, sp: 110},
abilities: {0: 'Embody Aspect (Hearthflame)'},
weightkg: 39.8,
baseSpecies: 'Ogerpon',
forceTeraType: 'Fire',
},
'Ogerpon-Cornerstone-Tera': {
types: ['Grass', 'Rock'],
gender: 'F',
bs: {hp: 80, at: 120, df: 84, sa: 60, sd: 96, sp: 110},
abilities: {0: 'Embody Aspect (Cornerstone)'},
weightkg: 39.8,
baseSpecies: 'Ogerpon',
forceTeraType: 'Rock',
},
Oinkologne: {
types: ['Normal'],
Expand All @@ -9563,7 +9562,6 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
types: ['Poison', 'Fighting'],
bs: {hp: 88, at: 128, df: 115, sa: 58, sd: 86, sp: 80},
weightkg: 92,
gender: 'M',
abilities: {0: 'Toxic Chain'},
},
Orthworm: {
Expand Down Expand Up @@ -9608,7 +9606,7 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
},
Poltchageist: {
types: ['Grass', 'Ghost'],
bs: {hp: 40, at: 45, df: 45, sd: 54, sp: 50},
bs: {hp: 40, at: 45, df: 45, sa: 74, sd: 54, sp: 50},
weightkg: 1.1,
abilities: {0: 'Hospitality'},
nfe: true,
Expand All @@ -9617,7 +9615,7 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
},
'Poltchageist-Artisan': {
types: ['Grass', 'Ghost'],
bs: {hp: 40, at: 45, df: 45, sd: 54, sp: 50},
bs: {hp: 40, at: 45, df: 45, sa: 74, sd: 54, sp: 50},
weightkg: 1.1,
abilities: {0: 'Hospitality'},
nfe: true,
Expand Down Expand Up @@ -9678,6 +9676,13 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
gender: 'N',
abilities: {0: 'Protosynthesis'},
},
Scattervein: {
types: ['Fairy'],
bs: {hp: 75, at: 74, df: 87, sa: 62, sd: 89, sp: 63},
weightkg: 25,
abilities: {0: 'Pixilate'},
nfe: true,
},
Scovillain: {
types: ['Grass', 'Fire'],
bs: {hp: 65, at: 108, df: 65, sa: 108, sd: 65, sp: 75},
Expand Down Expand Up @@ -9806,21 +9811,21 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
'Tauros-Paldea-Aqua': {
types: ['Fighting', 'Water'],
bs: {hp: 75, at: 110, df: 105, sa: 30, sd: 70, sp: 100},
weightkg: 88.4,
weightkg: 110,
abilities: {0: 'Intimidate'},
baseSpecies: 'Tauros',
},
'Tauros-Paldea-Blaze': {
types: ['Fighting', 'Fire'],
bs: {hp: 75, at: 110, df: 105, sa: 30, sd: 70, sp: 100},
weightkg: 88.4,
weightkg: 85,
abilities: {0: 'Intimidate'},
baseSpecies: 'Tauros',
},
'Tauros-Paldea-Combat': {
types: ['Fighting'],
bs: {hp: 75, at: 110, df: 105, sa: 30, sd: 70, sp: 100},
weightkg: 88.4,
weightkg: 115,
abilities: {0: 'Intimidate'},
baseSpecies: 'Tauros',
},
Expand Down Expand Up @@ -9918,7 +9923,7 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
'Wooper-Paldea': {
types: ['Poison', 'Ground'],
bs: {hp: 55, at: 45, df: 45, sa: 25, sd: 25, sp: 15},
weightkg: 8.5,
weightkg: 11,
abilities: {0: 'Poison Point'},
baseSpecies: 'Wooper',
nfe: true,
Expand Down
Loading

0 comments on commit d71a899

Please sign in to comment.