Skip to content

Commit d29279d

Browse files
andrebastosdiasandrebastosdias
committed
Merge remote-tracking branch 'upstream/master'
2 parents aa2e0ca + cfdf46f commit d29279d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1126
-1029
lines changed

‎config/formats.ts

+443-421
Large diffs are not rendered by default.

‎data/aliases.ts

+20
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ export const Aliases: import('../sim/dex').AliasesTable = {
176176
arcrock: "Arceus-Rock",
177177
arcsteel: "Arceus-Steel",
178178
arcwater: "Arceus-Water",
179+
basculegionm: "Basculegion",
179180
basculinb: "Basculin-Blue-Striped",
180181
basculinblue: "Basculin-Blue-Striped",
181182
basculinbluestripe: "Basculin-Blue-Striped",
@@ -309,7 +310,11 @@ export const Aliases: import('../sim/dex').AliasesTable = {
309310
galardash: "Rapidash-Galar",
310311
nddf: "Indeedee-F",
311312
zacianc: "Zacian-Crowned",
313+
zacianh: "Zacian",
314+
zacianhero: "Zacian",
312315
zamazentac: "Zamazenta-Crowned",
316+
zamazentah: "Zamazenta",
317+
zamazentahero: "Zamazenta",
313318
glowbro: "Slowbro-Galar",
314319
gbro: "Slowbro-Galar",
315320
glowking: "Slowking-Galar",
@@ -426,9 +431,21 @@ export const Aliases: import('../sim/dex').AliasesTable = {
426431
ufof: "Pokestar UFO",
427432
ufoflying: "Pokestar UFO",
428433
vivillonmeadow: "Vivillon",
434+
xerneasactive: "Xerneas",
435+
indeedeem: "Indeedee",
436+
polteageistphony: "Polteageist",
437+
rockruffmidday: "Rockruff",
438+
sinisteaphony: "Sinistea",
439+
dudunsparcetwosegment: "Dudunsparce",
429440
enamorusi: "Enamorus",
430441
enamorusincarnate: "Enamorus",
431442
enamorusincarnation: "Enamorus",
443+
gimmighoulchest: "Gimmighoul",
444+
mausholdthree: "Maushold",
445+
oinkolognem: "Oinkologne",
446+
palafinzero: "Palafin",
447+
poltchageistcounterfeit: "Poltchageist",
448+
sinistchaunremarkable: "Sinistcha",
432449
squawkabillygreen: "Squawkabilly",
433450
squawkabillyg: "Squawkabilly",
434451
tealpon: "Ogerpon",
@@ -510,6 +527,7 @@ export const Aliases: import('../sim/dex').AliasesTable = {
510527
icrown: "Iron Crown",
511528

512529
// cosmetic formes
530+
alcremievanillacream: "Alcremie",
513531
alcremierubycream: "Alcremie",
514532
alcremiematchacream: "Alcremie",
515533
alcremiemintcream: "Alcremie",
@@ -592,6 +610,7 @@ export const Aliases: import('../sim/dex').AliasesTable = {
592610
miniorblue: "Minior",
593611
miniorindigo: "Minior",
594612
miniorviolet: "Minior",
613+
unowna: "Unown",
595614
unownb: "Unown",
596615
unownc: "Unown",
597616
unownd: "Unown",
@@ -619,6 +638,7 @@ export const Aliases: import('../sim/dex').AliasesTable = {
619638
unownz: "Unown",
620639
unownexclamation: "Unown",
621640
unownquestion: "Unown",
641+
tatsugiricurly: "Tatsugiri",
622642
tatsugiridroopy: "Tatsugiri",
623643
tatsugiristretchy: "Tatsugiri",
624644

‎data/formats-data.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
327327
tier: "NFE",
328328
},
329329
ninetales: {
330-
tier: "PU",
330+
tier: "ZU",
331331
doublesTier: "DUU",
332332
natDexTier: "RU",
333333
},
@@ -758,7 +758,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
758758
natDexTier: "RU",
759759
},
760760
electrodehisui: {
761-
tier: "ZU",
761+
tier: "ZUBL",
762762
doublesTier: "(DUU)",
763763
natDexTier: "RU",
764764
},
@@ -1165,7 +1165,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
11651165
zapdosgalar: {
11661166
tier: "RU",
11671167
doublesTier: "(DUU)",
1168-
natDexTier: "UU",
1168+
natDexTier: "UUBL",
11691169
},
11701170
moltres: {
11711171
tier: "OU",
@@ -1850,7 +1850,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
18501850
natDexTier: "UU",
18511851
},
18521852
gallade: {
1853-
tier: "NU",
1853+
tier: "NUBL",
18541854
doublesTier: "(DUU)",
18551855
natDexTier: "RU",
18561856
},
@@ -5429,7 +5429,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
54295429
natDexTier: "OU",
54305430
},
54315431
brutebonnet: {
5432-
tier: "NU",
5432+
tier: "PU",
54335433
doublesTier: "DUU",
54345434
natDexTier: "RU",
54355435
},

‎data/learnsets.ts

+2
Original file line numberDiff line numberDiff line change
@@ -94882,6 +94882,7 @@ export const Learnsets: import('../sim/dex-species').LearnsetDataTable = {
9488294882
dreameater: ["7M", "4M"],
9488394883
earthquake: ["9M", "8M", "7M", "4M"],
9488494884
embargo: ["7M", "4M"],
94885+
encore: ["9M"],
9488594886
endeavor: ["9M", "7T", "4T"],
9488694887
facade: ["9M", "8M", "7M", "4M"],
9488794888
fakeout: ["9L1", "8L1", "7L27", "4L35"],
@@ -94960,6 +94961,7 @@ export const Learnsets: import('../sim/dex-species').LearnsetDataTable = {
9496094961
toxic: ["7M", "4M"],
9496194962
trick: ["9M", "9L1", "8M", "8L1", "7T", "4T"],
9496294963
trickroom: ["9M", "8M", "7M", "4M"],
94964+
upperhand: ["9M"],
9496394965
uturn: ["9M", "8M", "7M", "4M"],
9496494966
willowisp: ["9M", "8M", "7M", "4M"],
9496594967
},

‎data/mods/gen1rbycap/formats-data.ts

+3
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormat
1111
mandrelec: {
1212
tier: "OU",
1313
},
14+
pineguin: {
15+
tier: "OU",
16+
},
1417
};

‎data/mods/gen1rbycap/learnsets.ts

+43
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
6060
bodyslam: ["1M"],
6161
takedown: ["1M"],
6262
doubleedge: ["1M"],
63+
hyperbeam: ["1M"],
6364
dragonrage: ["1M"],
6465
earthquake: ["1M"],
6566
mimic: ["1M"],
@@ -153,4 +154,46 @@ export const Learnsets: import('../../../sim/dex-species').ModdedLearnsetDataTab
153154
{generation: 1, level: 5},
154155
],
155156
},
157+
pineguin: {
158+
learnset: {
159+
absorb: ["1L1"],
160+
peck: ["1L1"],
161+
leechseed: ["1L1"],
162+
wingattack: ["1L13"],
163+
stunspore: ["1L21"],
164+
pinmissile: ["1L29"],
165+
camouflage: ["1L31"],
166+
aurorabeam: ["1L33"],
167+
razorleaf: ["1L41"],
168+
mist: ["1L51"],
169+
razorwind: ["1M"],
170+
whirlwind: ["1M"],
171+
toxic: ["1M"],
172+
bodyslam: ["1M"],
173+
takedown: ["1M"],
174+
doubleedge: ["1M"],
175+
bubblebeam: ["1M"],
176+
watergun: ["1M"],
177+
icebeam: ["1M"],
178+
blizzard: ["1M"],
179+
hyperbeam: ["1M"],
180+
megadrain: ["1M"],
181+
solarbeam: ["1M"],
182+
mimic: ["1M"],
183+
doubleteam: ["1M"],
184+
reflect: ["1M"],
185+
substitute: ["1M"],
186+
counter: ["2E"],
187+
seismictoss: ["2E"],
188+
selfdestruct: ["2E"],
189+
explosion: ["2E"],
190+
headbutt: ["2M"],
191+
defensecurl: ["2M"],
192+
drillpeck: ["2E"],
193+
strength: ["2M"],
194+
},
195+
encounters: [
196+
{generation: 1, level: 5},
197+
],
198+
},
156199
};

‎data/mods/gen1rbycap/moves.ts

+30
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,34 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
4141
type: "Fighting",
4242
contestType: "Cool",
4343
},
44+
camouflage: {
45+
num: 293,
46+
accuracy: 100,
47+
basePower: 80,
48+
category: "Special",
49+
shortDesc: "Hides on turn 1, strikes turn 2.",
50+
name: "Camouflage",
51+
pp: 10,
52+
priority: 0,
53+
flags: {protect: 1, mirror: 1, metronome: 1},
54+
onPrepareHit(target, source, move) {
55+
this.attrLastMove('[still]');
56+
this.add('-anim', source, "Leaf Blade", target);
57+
},
58+
onTryMove(attacker, defender, move) {
59+
if (attacker.removeVolatile('twoturnmove')) {
60+
attacker.removeVolatile('invulnerability');
61+
return;
62+
}
63+
this.add('-prepare', attacker, move.name);
64+
attacker.addVolatile('twoturnmove', defender);
65+
attacker.addVolatile('invulnerability', defender);
66+
return null;
67+
},
68+
secondary: null,
69+
target: "normal",
70+
type: "Grass",
71+
contestType: "Clever",
72+
gen: 1,
73+
},
4474
};

‎data/mods/gen1rbycap/pokedex.ts

+12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
export const Pokedex: import('../../../sim/dex-species').ModdedSpeciesDataTable = {
2+
pineguin: {
3+
num: 2000,
4+
name: "Pineguin",
5+
types: ["Grass", "Ice"],
6+
baseStats: {hp: 120, atk: 70, def: 40, spa: 95, spd: 95, spe: 80},
7+
abilities: {0: "No Ability"},
8+
heightm: 3.2,
9+
weightkg: 106,
10+
color: "Green",
11+
eggGroups: ["Water 1", "Grass"],
12+
gen: 1,
13+
},
214
corupcake: {
315
num: 2001,
416
name: "Corupcake",

‎data/mods/gen6megasrevisited/abilities.ts

+26
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,32 @@ export const Abilities: import('../../../sim/dex-abilities').ModdedAbilityDataTa
260260
shortDesc: "On switch-in, sets Delta Stream. User takes halved damage from hazards.",
261261
rating: 5,
262262
},
263+
parentalbond: {
264+
onPrepareHit(source, target, move) {
265+
if (move.category === 'Status' || move.selfdestruct || move.multihit) return;
266+
if ([
267+
'endeavor', 'seismictoss', 'psywave', 'nightshade', 'sonicboom', 'dragonrage',
268+
'superfang', 'naturesmadness', 'bide', 'counter', 'mirrorcoat', 'metalburst',
269+
].includes(move.id)) return;
270+
if (!move.spreadHit && !move.isZ && !move.isMax) {
271+
move.multihit = 2;
272+
move.multihitType = 'parentalbond';
273+
}
274+
},
275+
onBasePowerPriority: 7,
276+
onBasePower(basePower, pokemon, target, move) {
277+
if (move.multihitType === 'parentalbond' && move.hit > 1) return this.chainModify(0.5);
278+
},
279+
onSourceModifySecondaries(secondaries, target, source, move) {
280+
if (move.multihitType === 'parentalbond' && move.id === 'secretpower' && move.hit < 2) {
281+
// hack to prevent accidentally suppressing King's Rock/Razor Fang
282+
return secondaries.filter(effect => effect.volatileStatus === 'flinch');
283+
}
284+
},
285+
name: "Parental Bond",
286+
rating: 4.5,
287+
num: 184,
288+
},
263289

264290
// for ngas
265291
galewings: {

0 commit comments

Comments
 (0)