Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShivaD173
ShivaD173 committed Oct 17, 2024
2 parents cb0c9ee + a3c090d commit 8f8219a
Show file tree
Hide file tree
Showing 43 changed files with 185 additions and 4,265 deletions.
2 changes: 1 addition & 1 deletion PROTOCOL.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Messages from the user to the server are in the form:

`ROOMID` can optionally be left blank if unneeded (commands like `/join lobby`
can be sent anywhere). Responses will be sent to a PM box with no username
(so `|/command` is equivalent to `|/pm &, /command`).
(so `|/command` is equivalent to `|/pm ~, /command`).

`TEXT` can contain newlines, in which case it'll be treated the same
way as if each line were sent to the room separately.
Expand Down
49 changes: 24 additions & 25 deletions config/formats.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,14 +822,6 @@ export const Formats: import('../sim/dex-formats').FormatList = [
pokemon.apparentType = pokemon.getTypes(true).join('/');
},
},
{
name: "[Gen 6] NEXT OU",
mod: 'gennext',
searchShow: false,
challengeShow: false,
ruleset: ['Obtainable', 'Standard NEXT', 'Team Preview'],
banlist: ['Uber'],
},

// Draft League
///////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -917,6 +909,13 @@ export const Formats: import('../sim/dex-formats').FormatList = [
ruleset: ['Standard Draft', 'Moody Clause', 'Swagger Clause'],
banlist: ['Soul Dew'],
},
{
name: "[Gen 3] Draft",
mod: 'gen3',
searchShow: false,
ruleset: ['Standard Draft', 'Swagger Clause', 'DryPass Clause', '!Team Preview'],
banlist: ['King\'s Rock', 'Quick Claw', 'Assist'],
},

// OM of the Month
///////////////////////////////////////////////////////////////////
Expand All @@ -935,11 +934,11 @@ export const Formats: import('../sim/dex-formats').FormatList = [
'Arceus', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chi-Yu', 'Chien-Pao', 'Darkrai', 'Deoxys-Normal', 'Deoxys-Attack', 'Deoxys-Speed', 'Dialga', 'Dialga-Origin',
'Dondozo', 'Eternatus', 'Flutter Mane', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-oh', 'Inteleon', 'Iron Bundle', 'Iron Hands', 'Koraidon', 'Kyogre',
'Kyurem-Black', 'Kyurem-White', 'Landorus-Incarnate', 'Lilligant-Hisui', 'Lugia', 'Lunala', 'Magearna', 'Manaphy', 'Mewtwo', 'Miraidon', 'Necrozma-Dawn-Wings',
'Necrozma-Dusk-Mane', 'Ogerpon-Hearthflame', 'Palafin', 'Palkia', 'Palkia-Origin', 'Rayquaza', 'Regieleki', 'Regigigas', 'Reshiram', 'Shaymin-Sky', 'Solgaleo',
'Slaking', 'Smeargle', 'Spectrier', 'Urshifu-Single-Strike', 'Urshifu-Rapid-Strike', 'Walking Wake', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned',
'Zekrom', 'Arena Trap', 'Comatose', 'Contrary', 'Drizzle', 'Imposter', 'Moody', 'Pure Power', 'Shadow Tag', 'Speed Boost', 'Heat Rock', 'King\'s Rock',
'Light Clay', 'Razor Fang', 'Baton Pass', 'Extreme Speed', 'Last Respects', 'Population Bomb', 'Quiver Dance', 'Rage Fist', 'Shed Tail', 'Shell Smash',
'Spore', 'Transform',
'Necrozma-Dusk-Mane', 'Ogerpon-Hearthflame', 'Palafin', 'Palkia', 'Palkia-Origin', 'Primarina', 'Rayquaza', 'Regieleki', 'Regigigas', 'Reshiram', 'Shaymin-Sky',
'Solgaleo', 'Slaking', 'Smeargle', 'Spectrier', 'Urshifu-Single-Strike', 'Urshifu-Rapid-Strike', 'Walking Wake', 'Zacian', 'Zacian-Crowned', 'Zamazenta',
'Zamazenta-Crowned', 'Zekrom', 'Arena Trap', 'Comatose', 'Contrary', 'Drizzle', 'Imposter', 'Moody', 'Pure Power', 'Shadow Tag', 'Speed Boost', 'Unburden',
'Heat Rock', 'King\'s Rock', 'Light Clay', 'Razor Fang', 'Baton Pass', 'Boomburst', 'Extreme Speed', 'Last Respects', 'Population Bomb', 'Quiver Dance',
'Rage Fist', 'Shed Tail', 'Shell Smash', 'Spore', 'Transform',
],
},
{
Expand All @@ -948,10 +947,10 @@ export const Formats: import('../sim/dex-formats').FormatList = [
mod: 'gen9',
ruleset: ['Standard OMs', 'Sleep Moves Clause', 'Inverse Mod', 'Terastal Clause'],
banlist: [
'Arceus', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chien-Pao', 'Deoxys-Attack', 'Deoxys-Normal', 'Deoxys-Speed', 'Eternatus', 'Giratina-Origin', 'Groudon', 'Ho-Oh',
'Koraidon', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Lunala', 'Mewtwo', 'Miraidon', 'Necrozma-Dawn-Wings', 'Palkia', 'Palkia-Origin', 'Rayquaza',
'Regidrago', 'Regieleki', 'Reshiram', 'Rillaboom', 'Shaymin-Sky', 'Zacian', 'Zacian-Crowned', 'Zekrom', 'Arena Trap', 'Moody', 'Shadow Tag', 'King\'s Rock',
'Light Clay', 'Baton Pass', 'Shed Tail',
'Arceus', 'Baxcalibur', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chien-Pao', 'Deoxys-Attack', 'Deoxys-Normal', 'Deoxys-Speed', 'Espathra', 'Eternatus', 'Flutter Mane',
'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Koraidon', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Lunala', 'Maushold', 'Mewtwo', 'Miraidon', 'Necrozma-Dawn-Wings',
'Palkia', 'Palkia-Origin', 'Porygon-Z', 'Rayquaza', 'Regidrago', 'Regieleki', 'Reshiram', 'Rillaboom', 'Shaymin-Sky', 'Ursaluna', 'Ursaluna-Bloodmoon', 'Zacian',
'Zacian-Crowned', 'Zamazenta-Hero', 'Zekrom', 'Arena Trap', 'Moody', 'Shadow Tag', 'King\'s Rock', 'Light Clay', 'Baton Pass', 'Last Respects', 'Shed Tail',
],
},
{
Expand Down Expand Up @@ -1180,9 +1179,9 @@ export const Formats: import('../sim/dex-formats').FormatList = [
'Calyrex-Shadow', 'Deoxys-Attack', 'Diancie-Mega', 'Gengar-Mega', 'Groudon-Primal', 'Kartana', 'Mewtwo-Mega-X', 'Mewtwo-Mega-Y', 'Rayquaza-Mega',
'Regigigas', 'Shedinja', 'Slaking', 'Arena Trap', 'Comatose', 'Contrary', 'Gorilla Tactics', 'Hadron Engine', 'Huge Power', 'Illusion', 'Innards Out',
'Libero', 'Liquid Ooze', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Orichalcum Pulse', 'Parental Bond', 'Poison Heal', 'Protean', 'Pure Power',
'Shadow Tag', 'Stakeout', 'Water Bubble', 'Wonder Guard', 'Baton Pass', 'Belly Drum', 'Ceaseless Edge', 'Dire Claw', 'Electro Shot', 'Fillet Away',
'Imprison', 'Last Respects', 'Lumina Crash', 'Photon Geyser', 'Quiver Dance', 'Rage Fist', 'Revival Blessing', 'Shed Tail', 'Substitute', 'Shell Smash',
'Tail Glow',
'Shadow Tag', 'Stakeout', 'Water Bubble', 'Wonder Guard', 'Baton Pass', 'Belly Drum', 'Ceaseless Edge', 'Clangorous Soul', 'Dire Claw', 'Electro Shot',
'Fillet Away', 'Imprison', 'Last Respects', 'Lumina Crash', 'No Retreat', 'Photon Geyser', 'Quiver Dance', 'Rage Fist', 'Revival Blessing', 'Shed Tail',
'Substitute', 'Shell Smash', 'Tail Glow',
],
},
{
Expand Down Expand Up @@ -2723,12 +2722,12 @@ export const Formats: import('../sim/dex-formats').FormatList = [
searchShow: false,
ruleset: ['[Gen 9] National Dex Ubers'],
banlist: [
'Arceus-Normal', 'Arceus-Dark', 'Arceus-Ground', 'Calyrex-Ice', 'Chansey', 'Deoxys-Attack', 'Ditto', 'Dondozo', 'Eternatus', 'Giratina-Origin', 'Glimmora',
'Groudon-Primal', 'Ho-Oh', 'Kyogre-Primal', 'Lunala', 'Marshadow', 'Melmetal', 'Mewtwo-Mega-Y', 'Necrozma-Dusk-Mane', 'Necrozma-Ultra', 'Rayquaza',
'Arceus-Normal', 'Arceus-Dark', 'Arceus-Ground', 'Calyrex-Ice', 'Chansey', 'Deoxys-Attack', 'Deoxys-Speed', 'Ditto', 'Dondozo', 'Eternatus', 'Glimmora',
'Groudon-Primal', 'Ho-Oh', 'Kyogre-Primal', 'Lugia', 'Lunala', 'Marshadow', 'Melmetal', 'Mewtwo-Mega-Y', 'Necrozma-Dusk-Mane', 'Necrozma-Ultra',
'Salamence-Mega', 'Smeargle', 'Yveltal', 'Zacian-Crowned', 'Zygarde-50%',
// UUBL
'Arceus-Fairy', 'Arceus-Ghost', 'Arceus-Water', 'Blaziken-Mega', 'Chi-Yu', 'Flutter Mane', 'Kyogre', 'Kyurem-Black', 'Shaymin-Sky', 'Zacian', 'Zekrom',
'Power Construct', 'Light Clay', 'Ultranecrozium Z', 'Last Respects',
'Arceus-Fairy', 'Arceus-Fire', 'Arceus-Ghost', 'Arceus-Water', 'Blaziken-Mega', 'Chi-Yu', 'Flutter Mane', 'Kyogre', 'Kyurem-Black', 'Rayquaza',
'Shaymin-Sky', 'Zacian', 'Zekrom', 'Power Construct', 'Light Clay', 'Ultranecrozium Z', 'Last Respects',
],
},
{
Expand Down Expand Up @@ -4603,7 +4602,7 @@ export const Formats: import('../sim/dex-formats').FormatList = [
mod: 'gen2',
searchShow: false,
ruleset: ['[Gen 2] NU'],
banlist: ['NU', 'PUBL'],
banlist: ['NU', 'PUBL', 'Baton Pass + Mean Look', 'Baton Pass + Spider Web'],
unbanlist: ['Swagger'],
},
{
Expand Down
16 changes: 8 additions & 8 deletions data/formats-data.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1929,7 +1929,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
tier: "LC",
},
hariyama: {
tier: "ZU",
tier: "ZUBL",
doublesTier: "(DUU)",
natDexTier: "ZU",
},
Expand Down Expand Up @@ -2855,7 +2855,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
natDexTier: "Uber",
},
cresselia: {
tier: "NU",
tier: "NUBL",
doublesTier: "DOU",
natDexTier: "RU",
},
Expand Down Expand Up @@ -3662,7 +3662,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
natDexTier: "OU",
},
kyurem: {
tier: "Uber",
tier: "OU",
doublesTier: "DOU",
natDexTier: "OU",
},
Expand Down Expand Up @@ -3729,7 +3729,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
tier: "NFE",
},
delphox: {
tier: "ZU",
tier: "ZUBL",
doublesTier: "(DUU)",
natDexTier: "PU",
},
Expand Down Expand Up @@ -4983,7 +4983,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
natDexTier: "ZU",
},
indeedee: {
tier: "PU",
tier: "PUBL",
doublesTier: "DUU",
natDexTier: "NU",
},
Expand Down Expand Up @@ -5030,7 +5030,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
natDexTier: "ZU",
},
duraludon: {
tier: "PU",
tier: "PUBL",
doublesTier: "NFE",
natDexTier: "NFE",
},
Expand Down Expand Up @@ -5370,7 +5370,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
natDexTier: "ZU",
},
flamigo: {
tier: "PU",
tier: "PUBL",
doublesTier: "(DUU)",
natDexTier: "NUBL",
},
Expand Down Expand Up @@ -5499,7 +5499,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
natDexTier: "NUBL",
},
ironthorns: {
tier: "NU",
tier: "NUBL",
doublesTier: "(DUU)",
natDexTier: "PU",
},
Expand Down
5 changes: 3 additions & 2 deletions data/mods/gen1/scripts.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ export const Scripts: ModdedBattleScriptsData = {
gen: 1,
init() {
for (const i in this.data.Pokedex) {
(this.data.Pokedex[i] as any).gender = 'N';
(this.data.Pokedex[i] as any).eggGroups = null;
const poke = this.modData('Pokedex', i);
poke.gender = 'N';
poke.eggGroups = null;
}
},
// BattlePokemon scripts.
Expand Down
8 changes: 4 additions & 4 deletions data/mods/gen8linked/moves.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,11 @@ export const Moves: import('../../../sim/dex-moves').ModdedMoveDataTable = {
if (!lastMove) return false;
const possibleTypes = [];
const attackType = lastMove.type;
for (const type in this.dex.data.TypeChart) {
if (source.hasType(type)) continue;
const typeCheck = this.dex.data.TypeChart[type].damageTaken[attackType];
for (const type of this.dex.types.all()) {
if (source.hasType(type.name)) continue;
const typeCheck = type.damageTaken[attackType];
if (typeCheck === 2 || typeCheck === 3) {
possibleTypes.push(type);
possibleTypes.push(type.name);
}
}
if (!possibleTypes.length) {
Expand Down
Loading

0 comments on commit 8f8219a

Please sign in to comment.