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 Dec 6, 2024
2 parents e8924f1 + f27bf86 commit 5c946eb
Show file tree
Hide file tree
Showing 14 changed files with 888 additions and 36 deletions.
40 changes: 32 additions & 8 deletions config/formats.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -955,12 +955,12 @@ export const Formats: import('../sim/dex-formats').FormatList = [
ruleset: ['Standard OMs', 'Sleep Clause Mod', 'Terastal Clause'],
banlist: [
'Calyrex-Shadow', 'Koraidon', 'Miraidon', 'Moody', 'Shadow Tag', 'Beedrillite', 'Blazikenite', 'Blue Orb', 'Gengarite',
'Kangaskhanite', 'Mawilite', 'Medichamite', 'Pidgeotite', 'Red Orb',
'Kangaskhanite', 'Mawilite', 'Medichamite', 'Pidgeotite', 'Red Orb', 'After You',
],
restricted: [
'Arceus', 'Calyrex-Ice', 'Deoxys-Normal', 'Deoxys-Attack', 'Dialga', 'Eternatus', 'Flutter Mane', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyogre',
'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Mewtwo', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Regigigas',
'Reshiram', 'Slaking', 'Solgaleo', 'Urshifu-Rapid-Strike', 'Zacian', 'Zekrom',
'Arceus', 'Calyrex-Ice', 'Deoxys-Normal', 'Deoxys-Attack', 'Dialga', 'Dondozo', 'Eternatus', 'Flutter Mane', 'Giratina', 'Groudon', 'Ho-Oh',
'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Mewtwo', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza',
'Regigigas', 'Reshiram', 'Slaking', 'Solgaleo', 'Ursaluna-Bloodmoon', 'Urshifu-Rapid-Strike', 'Zacian', 'Zekrom',
],
onValidateTeam(team) {
const itemTable = new Set<ID>();
Expand Down Expand Up @@ -1410,10 +1410,10 @@ export const Formats: import('../sim/dex-formats').FormatList = [
mod: 'sharedpower',
ruleset: ['Standard OMs', 'Evasion Abilities Clause', 'Evasion Items Clause', 'Sleep Moves Clause'],
banlist: [
'Arceus', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chi-Yu', 'Chien-Pao', 'Conkeldurr', 'Deoxys-Attack', 'Eternatus', 'Greninja', 'Iron Crown', 'Kingambit', 'Kyogre', 'Kyurem-Black',
'Kyurem-White', 'Koraidon', 'Lunala', 'Magearna', 'Mewtwo', 'Miraidon', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Ogerpon-Hearthflame', 'Palafin', 'Rayquaza', 'Regieleki',
'Reshiram', 'Rillaboom', 'Scizor', 'Shaymin-Sky', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Crowned', 'Zekrom', 'Arena Trap', 'Moody', 'Neutralizing Gas', 'Shadow Tag',
'Speed Boost', 'Stench', 'Swift Swim', 'King\'s Rock', 'Leppa Berry', 'Razor Fang', 'Starf Berry', 'Baton Pass', 'Extreme Speed', 'Last Respects',
'Arceus', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chi-Yu', 'Chien-Pao', 'Conkeldurr', 'Deoxys-Attack', 'Eternatus', 'Greninja', 'Kingambit', 'Kyogre', 'Kyurem-Black', 'Kyurem-White',
'Koraidon', 'Lunala', 'Magearna', 'Mewtwo', 'Miraidon', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Ogerpon-Hearthflame', 'Palafin', 'Rayquaza', 'Regieleki', 'Reshiram',
'Rillaboom', 'Scizor', 'Shaymin-Sky', 'Spectrier', 'Sneasler', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Crowned', 'Zekrom', 'Arena Trap', 'Moody', 'Neutralizing Gas',
'Shadow Tag', 'Speed Boost', 'Stench', 'Swift Swim', 'King\'s Rock', 'Leppa Berry', 'Razor Fang', 'Starf Berry', 'Baton Pass', 'Extreme Speed', 'Last Respects',
],
unbanlist: ['Arceus-Bug', 'Arceus-Dragon', 'Arceus-Fire', 'Arceus-Ice'],
restricted: [
Expand Down Expand Up @@ -3057,6 +3057,30 @@ export const Formats: import('../sim/dex-formats').FormatList = [
team: 'randomBSSFactory',
ruleset: ['Flat Rules', 'VGC Timer'],
},
{
name: "[Gen 9] Draft Factory",
desc: `Randomized matchups sourced from various 6v6 singles draft leagues.`,
mod: 'gen9',
team: 'randomDraftFactory',
ruleset: ['Standard Draft'],
onBegin() {
for (const pokemon of this.getAllPokemon()) {
if (!(pokemon.set as any).teraCaptain) pokemon.canTerastallize = null;
}
},
onTeamPreview() {
for (const side of this.sides) {
let buf = ``;
for (const pokemon of side.pokemon) {
if (!(pokemon.set as any).teraCaptain) continue;
buf += buf ? ` / ` : `raw|${side.name}'s Tera Captains:<br />`;
buf += `<psicon pokemon="${pokemon.species.id}" /><psicon type="${pokemon.teraType}" />`;
}
this.add(`${buf}`);
}
this.add(`raw|Only Tera Captains are allowed to Terastallize!`);
},
},
{
name: "[Gen 9] Baby Random Battle",
mod: 'gen9',
Expand Down
4 changes: 4 additions & 0 deletions data/formats-data.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5988,6 +5988,10 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
isNonstandard: "CAP",
tier: "CAP",
},
shox: {
isNonstandard: "CAP",
tier: "CAP",
},
pokestarsmeargle: {
isNonstandard: "Custom",
tier: "Illegal",
Expand Down
29 changes: 28 additions & 1 deletion data/learnsets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99487,7 +99487,6 @@ export const Learnsets: import('../sim/dex-species').LearnsetDataTable = {
encore: ["9M"],
endure: ["9M"],
facade: ["9M"],
flamethrower: ["9M"],
flashcannon: ["9M"],
gigaimpact: ["9M"],
gunkshot: ["9M", "9L58"],
Expand Down Expand Up @@ -99535,6 +99534,34 @@ export const Learnsets: import('../sim/dex-species').LearnsetDataTable = {
{generation: 9, level: 50, shiny: true, abilities: ["armortail"], moves: ["celebrate", "dragontail", "sludgebomb", "dragondance"], pokeball: "cherishball"},
],
},
shox: {
learnset: {
bodyslam: ["9M"],
discharge: ["9M"],
doubleedge: ["9M"],
endure: ["9M"],
facade: ["9M"],
glare: ["9M"],
helpinghand: ["9M"],
hypervoice: ["9M"],
icebeam: ["9M"],
knockoff: ["9M"],
milkdrink: ["9M"],
nuzzle: ["9M"],
protect: ["9M"],
rest: ["9M"],
sleeptalk: ["9M"],
substitute: ["9M"],
superfang: ["9M"],
takedown: ["9M"],
terablast: ["9M"],
thunder: ["9M"],
thunderwave: ["9M"],
thunderbolt: ["9M"],
voltswitch: ["9M"],
wildcharge: ["9M"],
},
},
pokestarsmeargle: {
eventData: [
{generation: 5, level: 60, gender: "M", abilities: ["owntempo"], moves: ["mindreader", "guillotine", "tailwhip", "gastroacid"]},
Expand Down
5 changes: 3 additions & 2 deletions data/mods/gen3/scripts.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ export const Scripts: ModdedBattleScriptsData = {
inherit: true,
getActionSpeed() {
let speed = this.getStat('spe', false, false);
const trickRoom = this.battle.field.getPseudoWeather('trickroom');
if (trickRoom || (this.battle.ruleTable.has('twisteddimensionmod') && !trickRoom)) {
const trickRoomCheck = this.battle.ruleTable.has('twisteddimensionmod') ?
!this.battle.field.getPseudoWeather('trickroom') : this.battle.field.getPseudoWeather('trickroom');
if (trickRoomCheck) {
speed = -speed;
}
if (this.battle.quickClawRoll && this.hasItem('quickclaw')) {
Expand Down
12 changes: 12 additions & 0 deletions data/pokedex.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19514,6 +19514,18 @@ export const Pokedex: import('../sim/dex-species').SpeciesDataTable = {
eggGroups: ["Dragon", "Mineral"],
gen: 9,
},
shox: {
num: -77,
name: "Shox",
types: ["Electric", "Normal"],
baseStats: {hp: 136, atk: 73, def: 81, spa: 90, spd: 98, spe: 56},
abilities: {0: "Electromorphosis", 1: "Sticky Hold"},
heightm: 3,
weightkg: 99.9,
color: "Brown",
eggGroups: ["Field"],
gen: 9,
},
// NOTE: PokeStar "formes" are not actually formes and thus do not have a formeOrder
pokestarsmeargle: {
num: -5000,
Expand Down
Loading

0 comments on commit 5c946eb

Please sign in to comment.