Skip to content

Commit 91f4fd3

Browse files
Daniel1464KrisXV
andauthored
Add ZA DLC Megas to Damage Calc (#746)
* Initial * Fixed zygarde's weight * Additional Fixes * correct skipped test * Fix tests again * Add newline at the end of test.ts * Apply suggestions from code review --------- Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
1 parent a490037 commit 91f4fd3

2 files changed

Lines changed: 223 additions & 6 deletions

File tree

calc/src/data/items.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,32 @@ const ZA_MEGA_STONES: {[species: string]: string} = {
500500
Zygardite: 'Zygarde-Complete',
501501
};
502502

503+
const ZA_DLC_MEGA_STONES: {[species: string]: string} = {
504+
'Absolite Z': 'Absol',
505+
Baxcalibrite: 'Baxcalibur',
506+
Chimechite: 'Chimecho',
507+
Crabominite: 'Crabominable',
508+
Darkranite: 'Darkrai',
509+
'Garchompite Z': 'Garchomp',
510+
Glimmoranite: 'Glimmora',
511+
Golisopite: 'Golisopod',
512+
Golurkite: 'Golurk',
513+
Heatranite: 'Heatran',
514+
'Lucarionite Z': 'Lucario',
515+
Magearnite: 'Magearna',
516+
Meowsticite: 'Meowstic',
517+
'Raichunite X': 'Raichu',
518+
'Raichunite Y': 'Raichu',
519+
Scovillainite: 'Scovillain',
520+
Staraptite: 'Staraptor',
521+
Tatsugirinite: 'Tatsugiri',
522+
Zeraorite: 'Zeraora',
523+
};
524+
503525
const SV = SS.concat(
504526
[
505527
...Object.keys(ZA_MEGA_STONES),
528+
...Object.keys(ZA_DLC_MEGA_STONES),
506529
'Adamant Crystal',
507530
'Auspicious Armor',
508531
'Ability Shield',

calc/src/data/species.ts

Lines changed: 200 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10066,10 +10066,15 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1006610066
};
1006710067

1006810068
const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
10069+
Absol: {otherFormes: ['Absol-Mega', 'Absol-Mega-Z']},
1006910070
Barbaracle: {otherFormes: ['Barbaracle-Mega']},
10071+
Baxcalibur: {otherFormes: ['Baxcalibur-Mega']},
1007010072
Chandelure: {otherFormes: ['Chandelure-Mega']},
1007110073
Chesnaught: {otherFormes: ['Chesnaught-Mega']},
10074+
Chimecho: {otherFormes: ['Chimecho-Mega']},
1007210075
Clefable: {otherFormes: ['Clefable-Mega']},
10076+
Crabominable: {otherFormes: ['Crabominable-Mega']},
10077+
Darkrai: {otherFormes: ['Darkrai-Mega']},
1007310078
Delphox: {otherFormes: ['Delphox-Mega']},
1007410079
Dragalge: {otherFormes: ['Dragalge-Mega']},
1007510080
Dragonite: {otherFormes: ['Dragonite-Mega']},
@@ -10081,17 +10086,39 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1008110086
Feraligatr: {otherFormes: ['Feraligatr-Mega']},
1008210087
Floette: {otherFormes: ['Floette-Eternal', 'Floette-Mega']},
1008310088
Froslass: {otherFormes: ['Froslass-Mega']},
10089+
Garchomp: {otherFormes: ['Garchomp-Mega', 'Garchomp-Mega-Z']},
10090+
Glimmora: {otherFormes: ['Glimmora-Mega']},
10091+
Golisopod: {otherFormes: ['Golisopod-Mega']},
10092+
Golurk: {otherFormes: ['Golurk-Mega']},
1008410093
Greninja: {otherFormes: ['Greninja-Ash', 'Greninja-Bond', 'Greninja-Mega']},
1008510094
Hawlucha: {otherFormes: ['Hawlucha-Mega']},
10095+
Heatran: {otherFormes: ['Heatran-Mega']},
10096+
Lucario: {otherFormes: ['Lucario-Mega', 'Lucario-Mega-Z']},
10097+
Magearna: {otherFormes: ['Magearna-Original', 'Magearna-Mega', 'Magearna-Original-Mega']},
1008610098
Malamar: {otherFormes: ['Malamar-Mega']},
1008710099
Meganium: {otherFormes: ['Meganium-Mega']},
10100+
Meowstic: {otherFormes: ['Meowstic-Mega']},
1008810101
Pyroar: {otherFormes: ['Pyroar-Mega']},
10102+
Raichu: {otherFormes: ['Raichu-Mega-X', 'Raichu-Mega-Y']},
1008910103
Scolipede: {otherFormes: ['Scolipede-Mega']},
10104+
Scovillain: {otherFormes: ['Scovillain-Mega']},
1009010105
Scrafty: {otherFormes: ['Scrafty-Mega']},
1009110106
Skarmory: {otherFormes: ['Skarmory-Mega']},
10107+
Staraptor: {otherFormes: ['Staraptor-Mega']},
1009210108
Starmie: {otherFormes: ['Starmie-Mega']},
10109+
Tatsugiri: {otherFormes: ['Tatsugiri-Mega']},
1009310110
Victreebel: {otherFormes: ['Victreebel-Mega']},
10111+
Zeraora: {otherFormes: ['Zeraora-Mega']},
1009410112
Zygarde: {otherFormes: ['Zygarde-10%', 'Zygarde-Complete', 'Zygarde-Mega']},
10113+
'Absol-Mega-Z': {
10114+
types: ['Dark', 'Ghost'],
10115+
bs: {hp: 65, at: 154, df: 60, sa: 75, sd: 60, sp: 151},
10116+
weightkg: 49.0,
10117+
abilities: {
10118+
0: 'Pressure',
10119+
},
10120+
baseSpecies: 'Absol',
10121+
},
1009510122
'Barbaracle-Mega': {
1009610123
types: [
1009710124
'Rock',
@@ -10111,6 +10138,15 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1011110138
},
1011210139
baseSpecies: 'Barbaracle',
1011310140
},
10141+
'Baxcalibur-Mega': {
10142+
types: ['Dragon', 'Ice'],
10143+
bs: {'hp': 115, 'at': 175, 'df': 117, 'sa': 105, 'sd': 101, 'sp': 87},
10144+
weightkg: 315.0,
10145+
abilities: {
10146+
'0': 'Thermal Exchange',
10147+
},
10148+
baseSpecies: 'Baxcalibur',
10149+
},
1011410150
'Chandelure-Mega': {
1011510151
types: [
1011610152
'Ghost',
@@ -10149,6 +10185,15 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1014910185
},
1015010186
baseSpecies: 'Chesnaught',
1015110187
},
10188+
'Chimecho-Mega': {
10189+
types: ['Psychic', 'Steel'],
10190+
bs: {'hp': 75, 'at': 50, 'df': 110, 'sa': 135, 'sd': 120, 'sp': 65},
10191+
weightkg: 8.0,
10192+
abilities: {
10193+
'0': 'Levitate',
10194+
},
10195+
baseSpecies: 'Chimecho',
10196+
},
1015210197
'Clefable-Mega': {
1015310198
types: [
1015410199
'Fairy',
@@ -10168,6 +10213,24 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1016810213
},
1016910214
baseSpecies: 'Clefable',
1017010215
},
10216+
'Crabominable-Mega': {
10217+
types: ['Ice', 'Fighting'],
10218+
bs: {'hp': 97, 'at': 157, 'df': 122, 'sa': 62, 'sd': 107, 'sp': 33},
10219+
weightkg: 252.8,
10220+
abilities: {
10221+
'0': 'Hyper Cutter',
10222+
},
10223+
baseSpecies: 'Crabominable',
10224+
},
10225+
'Darkrai-Mega': {
10226+
types: ['Dark'],
10227+
bs: {'hp': 70, 'at': 120, 'df': 130, 'sa': 165, 'sd': 130, 'sp': 85},
10228+
weightkg: 240.0,
10229+
abilities: {
10230+
'0': 'Bad Dreams',
10231+
},
10232+
baseSpecies: 'Darkrai',
10233+
},
1017110234
'Delphox-Mega': {
1017210235
types: [
1017310236
'Fire',
@@ -10238,7 +10301,7 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1023810301
sd: 116,
1023910302
sp: 36,
1024010303
},
10241-
weightkg: 185,
10304+
weightkg: 240.5,
1024210305
abilities: {
1024310306
'0': 'Berserk',
1024410307
},
@@ -10256,7 +10319,7 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1025610319
sd: 90,
1025710320
sp: 80,
1025810321
},
10259-
weightkg: 160.0,
10322+
weightkg: 180.0,
1026010323
abilities: {
1026110324
'0': 'Levitate',
1026210325
},
@@ -10316,7 +10379,6 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1031610379
abilities: {
1031710380
'0': 'Battle Armor',
1031810381
},
10319-
gender: 'N',
1032010382
baseSpecies: 'Falinks',
1032110383
},
1032210384
'Feraligatr-Mega': {
@@ -10338,7 +10400,6 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1033810400
},
1033910401
baseSpecies: 'Feraligatr',
1034010402
},
10341-
'Floette-Eternal': {bs: {hp: 74, at: 65, df: 67, sa: 125, sd: 128, sp: 92}},
1034210403
'Floette-Mega': {
1034310404
types: [
1034410405
'Fairy',
@@ -10376,6 +10437,42 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1037610437
},
1037710438
baseSpecies: 'Froslass',
1037810439
},
10440+
'Garchomp-Mega-Z': {
10441+
types: ['Dragon'],
10442+
bs: {hp: 108, at: 130, df: 85, sa: 141, sd: 85, sp: 151},
10443+
weightkg: 99.0,
10444+
abilities: {
10445+
0: 'Sand Veil',
10446+
},
10447+
baseSpecies: 'Garchomp',
10448+
},
10449+
'Glimmora-Mega': {
10450+
types: ['Rock', 'Poison'],
10451+
bs: {'hp': 83, 'at': 90, 'df': 105, 'sa': 150, 'sd': 96, 'sp': 101},
10452+
weightkg: 77.0,
10453+
abilities: {
10454+
'0': 'Toxic Debris',
10455+
},
10456+
baseSpecies: 'Glimmora',
10457+
},
10458+
'Golisopod-Mega': {
10459+
types: ['Bug', 'Steel'],
10460+
bs: {'hp': 75, 'at': 150, 'df': 175, 'sa': 70, 'sd': 120, 'sp': 40},
10461+
weightkg: 148.0,
10462+
abilities: {
10463+
'0': 'Emergency Exit',
10464+
},
10465+
baseSpecies: 'Golisopod',
10466+
},
10467+
'Golurk-Mega': {
10468+
types: ['Ground', 'Ghost'],
10469+
bs: {'hp': 89, 'at': 159, 'df': 105, 'sa': 70, 'sd': 105, 'sp': 55},
10470+
weightkg: 330.0,
10471+
abilities: {
10472+
'0': 'Iron Fist',
10473+
},
10474+
baseSpecies: 'Golurk',
10475+
},
1037910476
'Greninja-Mega': {
1038010477
types: [
1038110478
'Water',
@@ -10414,6 +10511,42 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1041410511
},
1041510512
baseSpecies: 'Hawlucha',
1041610513
},
10514+
'Heatran-Mega': {
10515+
types: ['Fire', 'Steel'],
10516+
bs: {'hp': 91, 'at': 120, 'df': 106, 'sa': 175, 'sd': 141, 'sp': 67},
10517+
weightkg: 570.0,
10518+
abilities: {
10519+
'0': 'Flash Fire',
10520+
},
10521+
baseSpecies: 'Heatran',
10522+
},
10523+
'Lucario-Mega-Z': {
10524+
types: ['Fighting', 'Steel'],
10525+
bs: {hp: 70, at: 100, df: 70, sa: 164, sd: 70, sp: 151},
10526+
weightkg: 49.4,
10527+
abilities: {
10528+
0: 'Steadfast',
10529+
},
10530+
baseSpecies: 'Lucario',
10531+
},
10532+
'Magearna-Mega': {
10533+
types: ['Steel', 'Fairy'],
10534+
bs: {hp: 80, at: 125, df: 115, sa: 170, sd: 115, sp: 95},
10535+
weightkg: 248.1,
10536+
abilities: {
10537+
0: 'Soul-Heart',
10538+
},
10539+
baseSpecies: 'Magearna',
10540+
},
10541+
'Magearna-Original-Mega': {
10542+
types: ['Steel', 'Fairy'],
10543+
bs: {hp: 80, at: 125, df: 115, sa: 170, sd: 115, sp: 95},
10544+
weightkg: 248.1,
10545+
abilities: {
10546+
0: 'Soul-Heart',
10547+
},
10548+
baseSpecies: 'Magearna',
10549+
},
1041710550
'Malamar-Mega': {
1041810551
types: [
1041910552
'Dark',
@@ -10452,6 +10585,15 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1045210585
},
1045310586
baseSpecies: 'Meganium',
1045410587
},
10588+
'Meowstic-Mega': {
10589+
types: ['Psychic'],
10590+
bs: {'hp': 74, 'at': 48, 'df': 76, 'sa': 143, 'sd': 101, 'sp': 124},
10591+
weightkg: 10.1,
10592+
abilities: {
10593+
'0': 'Keen Eye',
10594+
},
10595+
baseSpecies: 'Meowstic',
10596+
},
1045510597
'Pyroar-Mega': {
1045610598
types: [
1045710599
'Fire',
@@ -10471,6 +10613,24 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1047110613
},
1047210614
baseSpecies: 'Pyroar',
1047310615
},
10616+
'Raichu-Mega-X': {
10617+
types: ['Electric'],
10618+
bs: {hp: 60, at: 135, df: 95, sa: 90, sd: 95, sp: 110},
10619+
weightkg: 38.0,
10620+
abilities: {
10621+
0: 'Static',
10622+
},
10623+
baseSpecies: 'Raichu',
10624+
},
10625+
'Raichu-Mega-Y': {
10626+
types: ['Electric'],
10627+
bs: {hp: 60, at: 100, df: 55, sa: 160, sd: 80, sp: 130},
10628+
weightkg: 26.0,
10629+
abilities: {
10630+
0: 'Static',
10631+
},
10632+
baseSpecies: 'Raichu',
10633+
},
1047410634
'Scolipede-Mega': {
1047510635
types: [
1047610636
'Bug',
@@ -10490,6 +10650,15 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1049010650
},
1049110651
baseSpecies: 'Scolipede',
1049210652
},
10653+
'Scovillain-Mega': {
10654+
types: ['Grass', 'Fire'],
10655+
bs: {'hp': 65, 'at': 138, 'df': 85, 'sa': 138, 'sd': 85, 'sp': 75},
10656+
weightkg: 22.0,
10657+
abilities: {
10658+
'0': 'Chlorophyll',
10659+
},
10660+
baseSpecies: 'Scovillain',
10661+
},
1049310662
'Scrafty-Mega': {
1049410663
types: [
1049510664
'Dark',
@@ -10528,6 +10697,15 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1052810697
},
1052910698
baseSpecies: 'Skarmory',
1053010699
},
10700+
'Staraptor-Mega': {
10701+
types: ['Fighting', 'Flying'],
10702+
bs: {'hp': 85, 'at': 140, 'df': 100, 'sa': 60, 'sd': 90, 'sp': 110},
10703+
weightkg: 50.0,
10704+
abilities: {
10705+
'0': 'Intimidate',
10706+
},
10707+
baseSpecies: 'Staraptor',
10708+
},
1053110709
'Starmie-Mega': {
1053210710
types: [
1053310711
'Water',
@@ -10545,9 +10723,17 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1054510723
abilities: {
1054610724
'0': 'Illuminate',
1054710725
},
10548-
gender: 'N',
1054910726
baseSpecies: 'Starmie',
1055010727
},
10728+
'Tatsugiri-Mega': {
10729+
types: ['Water', 'Dragon'],
10730+
bs: {'hp': 68, 'at': 65, 'df': 90, 'sa': 135, 'sd': 125, 'sp': 92},
10731+
weightkg: 24.0,
10732+
abilities: {
10733+
'0': 'Commander',
10734+
},
10735+
baseSpecies: 'Tatsugiri',
10736+
},
1055110737
'Victreebel-Mega': {
1055210738
types: [
1055310739
'Grass',
@@ -10567,6 +10753,15 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1056710753
},
1056810754
baseSpecies: 'Victreebel',
1056910755
},
10756+
'Zeraora-Mega': {
10757+
types: ['Electric'],
10758+
bs: {'hp': 88, 'at': 157, 'df': 75, 'sa': 147, 'sd': 80, 'sp': 153},
10759+
weightkg: 44.5,
10760+
abilities: {
10761+
'0': 'Volt Absorb',
10762+
},
10763+
baseSpecies: 'Zeraora',
10764+
},
1057010765
'Zygarde-Mega': {
1057110766
types: [
1057210767
'Dragon',
@@ -10584,7 +10779,6 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
1058410779
abilities: {
1058510780
'0': 'Aura Break',
1058610781
},
10587-
gender: 'N',
1058810782
baseSpecies: 'Zygarde',
1058910783
},
1059010784
};

0 commit comments

Comments
 (0)