diff --git a/config/formats.ts b/config/formats.ts index 49d876bc95..4e877f4876 100644 --- a/config/formats.ts +++ b/config/formats.ts @@ -1,12 +1,12 @@ // Note: This is the list of formats -// The rules that formats use are stored in data/rulesets.ts +// The rules that formats use are stored in data/format-rules.ts /* If you want to add custom formats, create a file in this folder named: "custom-formats.ts" Paste the following code into the file and add your desired formats and their sections between the brackets: -------------------------------------------------------------------------------- // Note: This is the list of formats -// The rules that formats use are stored in data/rulesets.ts +// The rules that formats use are stored in data/format-rules.ts export const Formats: FormatList = [ ]; diff --git a/data/conditions.ts b/data/conditions.ts index 06d8e6eeca..bf9cff09c0 100644 --- a/data/conditions.ts +++ b/data/conditions.ts @@ -1,4 +1,8 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { + + // #region Statuses + /////////////////////////////////////////////////////////////////// + brn: { name: 'brn', effectType: 'Status', @@ -159,6 +163,15 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { this.damage(this.clampIntRange(pokemon.baseMaxhp / 16, 1) * this.effectState.stage); }, }, + + // #endregion + // #region Generic conditions + /////////////////////////////////////////////////////////////////// + + // Most conditions are attached to the move or other effect that + // gives them, but some are shared between multiple moves and not + // specific to any of them. Those are defined here. + confusion: { name: 'confusion', // this is a volatile status @@ -457,10 +470,71 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { }, }, - // weather is implemented here since it's so important to the game + // #endregion + // #region Extra conditions + /////////////////////////////////////////////////////////////////// + + // Rollout and Commander need multiple conditions to function, so + // those are defined here. + + rolloutstorage: { + name: 'Rollout storage', + duration: 2, + onBasePower(relayVar, source, target, move) { + let bp = Math.max(1, move.basePower); + bp *= Math.pow(2, source.volatiles['rolloutstorage'].contactHitCount); + if (source.volatiles['defensecurl']) { + bp *= 2; + } + source.removeVolatile('rolloutstorage'); + return bp; + }, + }, + // Commander needs two conditions so they are implemented here + // Dondozo + commanded: { + name: "Commanded", + noCopy: true, + onStart(pokemon) { + this.boost({atk: 2, spa: 2, spe: 2, def: 2, spd: 2}, pokemon); + }, + onDragOutPriority: 2, + onDragOut() { + return false; + }, + // Prevents Shed Shell allowing a swap + onTrapPokemonPriority: -11, + onTrapPokemon(pokemon) { + pokemon.trapped = true; + }, + }, + // Tatsugiri + commanding: { + name: "Commanding", + noCopy: true, + onDragOutPriority: 2, + onDragOut() { + return false; + }, + // Prevents Shed Shell allowing a swap + onTrapPokemonPriority: -11, + onTrapPokemon(pokemon) { + pokemon.trapped = true; + }, + // Dodging moves is handled in BattleActions#hitStepInvulnerabilityEvent + // This is here for moves that manually call this event like Perish Song + onInvulnerability: false, + onBeforeTurn(pokemon) { + this.queue.cancelAction(pokemon); + }, + }, + + // #endregion + // #region Weather + /////////////////////////////////////////////////////////////////// raindance: { - name: 'RainDance', + name: 'Rain Dance', effectType: 'Weather', duration: 5, durationCallback(source, effect) { @@ -498,7 +572,7 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { }, }, primordialsea: { - name: 'PrimordialSea', + name: 'Primordial Sea', effectType: 'Weather', duration: 0, onTryMovePriority: 1, @@ -530,7 +604,7 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { }, }, sunnyday: { - name: 'SunnyDay', + name: 'Sunny Day', effectType: 'Weather', duration: 5, durationCallback(source, effect) { @@ -576,7 +650,7 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { }, }, desolateland: { - name: 'DesolateLand', + name: 'Desolate Land', effectType: 'Weather', duration: 0, onTryMovePriority: 1, @@ -713,7 +787,7 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { }, }, deltastream: { - name: 'DeltaStream', + name: 'Delta Stream', effectType: 'Weather', duration: 0, onEffectivenessPriority: -1, @@ -790,44 +864,9 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { }, }, - // Commander needs two conditions so they are implemented here - // Dondozo - commanded: { - name: "Commanded", - noCopy: true, - onStart(pokemon) { - this.boost({atk: 2, spa: 2, spe: 2, def: 2, spd: 2}, pokemon); - }, - onDragOutPriority: 2, - onDragOut() { - return false; - }, - // Prevents Shed Shell allowing a swap - onTrapPokemonPriority: -11, - onTrapPokemon(pokemon) { - pokemon.trapped = true; - }, - }, - // Tatsugiri - commanding: { - name: "Commanding", - noCopy: true, - onDragOutPriority: 2, - onDragOut() { - return false; - }, - // Prevents Shed Shell allowing a swap - onTrapPokemonPriority: -11, - onTrapPokemon(pokemon) { - pokemon.trapped = true; - }, - // Dodging moves is handled in BattleActions#hitStepInvulnerabilityEvent - // This is here for moves that manually call this event like Perish Song - onInvulnerability: false, - onBeforeTurn(pokemon) { - this.queue.cancelAction(pokemon); - }, - }, + // #endregion + // #region Species + /////////////////////////////////////////////////////////////////// // Arceus and Silvally's actual typing is implemented here. // Their true typing for all their formes is Normal, and it's only @@ -865,17 +904,6 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = { return [type]; }, }, - rolloutstorage: { - name: 'rolloutstorage', - duration: 2, - onBasePower(relayVar, source, target, move) { - let bp = Math.max(1, move.basePower); - bp *= Math.pow(2, source.volatiles['rolloutstorage'].contactHitCount); - if (source.volatiles['defensecurl']) { - bp *= 2; - } - source.removeVolatile('rolloutstorage'); - return bp; - }, - }, + + // #endregion }; diff --git a/data/rulesets.ts b/data/format-rules.ts similarity index 99% rename from data/rulesets.ts rename to data/format-rules.ts index a81e83615f..70039310fc 100644 --- a/data/rulesets.ts +++ b/data/format-rules.ts @@ -5,7 +5,7 @@ import type {Learnset} from "../sim/dex-species"; // The list of formats is stored in config/formats.js export const Rulesets: import('../sim/dex-formats').FormatDataTable = { - // Rulesets + // Rules /////////////////////////////////////////////////////////////////// standard: { @@ -2018,7 +2018,7 @@ export const Rulesets: import('../sim/dex-formats').FormatDataTable = { effectType: 'ValidatorRule', name: "NC 2000 Move Legality", desc: "Prevents Pok\u00e9mon from having moves that would only be obtainable in Pok\u00e9mon Crystal.", - // Implemented in mods/gen2/rulesets.ts + // Implemented in mods/gen2/format-rules.ts }, aptclause: { effectType: 'ValidatorRule', @@ -2030,7 +2030,7 @@ export const Rulesets: import('../sim/dex-formats').FormatDataTable = { effectType: 'ValidatorRule', name: "NC 1997 Move Legality", desc: "Bans move combinations on Pok\u00e9mon that weren't legal in NC 1997.", - // Implemented in mods/gen1jpn/rulesets.ts + // Implemented in mods/gen1jpn/format-rules.ts }, noswitching: { effectType: 'Rule', @@ -2768,12 +2768,12 @@ export const Rulesets: import('../sim/dex-formats').FormatDataTable = { uselessmovesclause: { effectType: 'ValidatorRule', name: 'Useless Moves Clause', - // implemented in /mods/moderngen2/rulesets.ts + // implemented in /mods/moderngen2/format-rules.ts }, uselessitemsclause: { effectType: 'ValidatorRule', name: 'Useless Items Clause', - // implemented in /mods/moderngen2/rulesets.ts + // implemented in /mods/moderngen2/format-rules.ts }, ferventimpersonationmod: { effectType: 'Rule', diff --git a/data/mods/gen1/rulesets.ts b/data/mods/gen1/format-rules.ts similarity index 100% rename from data/mods/gen1/rulesets.ts rename to data/mods/gen1/format-rules.ts diff --git a/data/mods/gen1/formats-data.ts b/data/mods/gen1/pokedex-tiers.ts similarity index 98% rename from data/mods/gen1/formats-data.ts rename to data/mods/gen1/pokedex-tiers.ts index 695af81fea..c1b91d428f 100644 --- a/data/mods/gen1/formats-data.ts +++ b/data/mods/gen1/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen1jpn/rulesets.ts b/data/mods/gen1jpn/format-rules.ts similarity index 100% rename from data/mods/gen1jpn/rulesets.ts rename to data/mods/gen1jpn/format-rules.ts diff --git a/data/mods/gen1stadium/rulesets.ts b/data/mods/gen1stadium/format-rules.ts similarity index 100% rename from data/mods/gen1stadium/rulesets.ts rename to data/mods/gen1stadium/format-rules.ts diff --git a/data/mods/gen1stadium/formats-data.ts b/data/mods/gen1stadium/pokedex-tiers.ts similarity index 98% rename from data/mods/gen1stadium/formats-data.ts rename to data/mods/gen1stadium/pokedex-tiers.ts index b80dfef904..0030ee7e06 100644 --- a/data/mods/gen1stadium/formats-data.ts +++ b/data/mods/gen1stadium/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen2/rulesets.ts b/data/mods/gen2/format-rules.ts similarity index 100% rename from data/mods/gen2/rulesets.ts rename to data/mods/gen2/format-rules.ts diff --git a/data/mods/gen2/formats-data.ts b/data/mods/gen2/pokedex-tiers.ts similarity index 98% rename from data/mods/gen2/formats-data.ts rename to data/mods/gen2/pokedex-tiers.ts index 793ea0449b..9ab78fd5a2 100644 --- a/data/mods/gen2/formats-data.ts +++ b/data/mods/gen2/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen2stadium2/rulesets.ts b/data/mods/gen2stadium2/format-rules.ts similarity index 100% rename from data/mods/gen2stadium2/rulesets.ts rename to data/mods/gen2stadium2/format-rules.ts diff --git a/data/mods/gen3/rulesets.ts b/data/mods/gen3/format-rules.ts similarity index 100% rename from data/mods/gen3/rulesets.ts rename to data/mods/gen3/format-rules.ts diff --git a/data/mods/gen3/formats-data.ts b/data/mods/gen3/pokedex-tiers.ts similarity index 99% rename from data/mods/gen3/formats-data.ts rename to data/mods/gen3/pokedex-tiers.ts index 3e5c0679fe..4d4db59e6d 100644 --- a/data/mods/gen3/formats-data.ts +++ b/data/mods/gen3/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen4/rulesets.ts b/data/mods/gen4/format-rules.ts similarity index 100% rename from data/mods/gen4/rulesets.ts rename to data/mods/gen4/format-rules.ts diff --git a/data/mods/gen4/formats-data.ts b/data/mods/gen4/pokedex-tiers.ts similarity index 99% rename from data/mods/gen4/formats-data.ts rename to data/mods/gen4/pokedex-tiers.ts index 4065adac33..1c1f664e60 100644 --- a/data/mods/gen4/formats-data.ts +++ b/data/mods/gen4/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen4pt/formats-data.ts b/data/mods/gen4pt/formats-data.ts deleted file mode 100644 index 8fc4ca29bf..0000000000 --- a/data/mods/gen4pt/formats-data.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { - pichuspikyeared: { - isNonstandard: "Future", - tier: "Illegal", - }, -}; diff --git a/data/mods/gen4pt/pokedex-tiers.ts b/data/mods/gen4pt/pokedex-tiers.ts new file mode 100644 index 0000000000..8728e29f96 --- /dev/null +++ b/data/mods/gen4pt/pokedex-tiers.ts @@ -0,0 +1,6 @@ +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { + pichuspikyeared: { + isNonstandard: "Future", + tier: "Illegal", + }, +}; diff --git a/data/mods/gen5/rulesets.ts b/data/mods/gen5/format-rules.ts similarity index 100% rename from data/mods/gen5/rulesets.ts rename to data/mods/gen5/format-rules.ts diff --git a/data/mods/gen5/formats-data.ts b/data/mods/gen5/pokedex-tiers.ts similarity index 99% rename from data/mods/gen5/formats-data.ts rename to data/mods/gen5/pokedex-tiers.ts index d057636dd9..084113f94a 100644 --- a/data/mods/gen5/formats-data.ts +++ b/data/mods/gen5/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen5bw1/formats-data.ts b/data/mods/gen5bw1/pokedex-tiers.ts similarity index 93% rename from data/mods/gen5bw1/formats-data.ts rename to data/mods/gen5bw1/pokedex-tiers.ts index bafde5f210..a20190edda 100644 --- a/data/mods/gen5bw1/formats-data.ts +++ b/data/mods/gen5bw1/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { venusaur: { tier: "OU", }, diff --git a/data/mods/gen6/formats-data.ts b/data/mods/gen6/pokedex-tiers.ts similarity index 99% rename from data/mods/gen6/formats-data.ts rename to data/mods/gen6/pokedex-tiers.ts index eb91b94230..1d1fbfae8b 100644 --- a/data/mods/gen6/formats-data.ts +++ b/data/mods/gen6/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen6xy/formats-data.ts b/data/mods/gen6xy/pokedex-tiers.ts similarity index 95% rename from data/mods/gen6xy/formats-data.ts rename to data/mods/gen6xy/pokedex-tiers.ts index 959b35b549..52278b03ef 100644 --- a/data/mods/gen6xy/formats-data.ts +++ b/data/mods/gen6xy/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { beedrillmega: { isNonstandard: "Future", tier: "Illegal", diff --git a/data/mods/gen7/rulesets.ts b/data/mods/gen7/format-rules.ts similarity index 100% rename from data/mods/gen7/rulesets.ts rename to data/mods/gen7/format-rules.ts diff --git a/data/mods/gen7/formats-data.ts b/data/mods/gen7/pokedex-tiers.ts similarity index 99% rename from data/mods/gen7/formats-data.ts rename to data/mods/gen7/pokedex-tiers.ts index 4fc2cef0cb..e23f435e92 100644 --- a/data/mods/gen7/formats-data.ts +++ b/data/mods/gen7/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen7letsgo/formats-data.ts b/data/mods/gen7letsgo/pokedex-tiers.ts similarity index 98% rename from data/mods/gen7letsgo/formats-data.ts rename to data/mods/gen7letsgo/pokedex-tiers.ts index 79158f835d..bdcca5bcce 100644 --- a/data/mods/gen7letsgo/formats-data.ts +++ b/data/mods/gen7letsgo/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen7sm/formats-data.ts b/data/mods/gen7sm/pokedex-tiers.ts similarity index 90% rename from data/mods/gen7sm/formats-data.ts rename to data/mods/gen7sm/pokedex-tiers.ts index aa488e96c5..76ac9a3cb4 100644 --- a/data/mods/gen7sm/formats-data.ts +++ b/data/mods/gen7sm/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { pikachupartner: { isNonstandard: "Future", tier: "Illegal", diff --git a/data/mods/gen8/rulesets.ts b/data/mods/gen8/format-rules.ts similarity index 100% rename from data/mods/gen8/rulesets.ts rename to data/mods/gen8/format-rules.ts diff --git a/data/mods/gen8/formats-data.ts b/data/mods/gen8/pokedex-tiers.ts similarity index 99% rename from data/mods/gen8/formats-data.ts rename to data/mods/gen8/pokedex-tiers.ts index 91a8d4e57a..cdd3534d14 100644 --- a/data/mods/gen8/formats-data.ts +++ b/data/mods/gen8/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen8bdsp/formats-data.ts b/data/mods/gen8bdsp/pokedex-tiers.ts similarity index 99% rename from data/mods/gen8bdsp/formats-data.ts rename to data/mods/gen8bdsp/pokedex-tiers.ts index c3dee6585b..061e80eee9 100644 --- a/data/mods/gen8bdsp/formats-data.ts +++ b/data/mods/gen8bdsp/pokedex-tiers.ts @@ -1,5 +1,5 @@ // TODO: alphabetize move names. I'm trying to implement this on a low-quality laptop under time pressure, so I haven't bothered doing so. -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/gen8dlc1/rulesets.ts b/data/mods/gen8dlc1/format-rules.ts similarity index 100% rename from data/mods/gen8dlc1/rulesets.ts rename to data/mods/gen8dlc1/format-rules.ts diff --git a/data/mods/gen8dlc1/formats-data.ts b/data/mods/gen8dlc1/pokedex-tiers.ts similarity index 99% rename from data/mods/gen8dlc1/formats-data.ts rename to data/mods/gen8dlc1/pokedex-tiers.ts index 16b18855d7..5780dab262 100644 --- a/data/mods/gen8dlc1/formats-data.ts +++ b/data/mods/gen8dlc1/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { pikachuworld: { isNonstandard: "Unobtainable", tier: "Unreleased", diff --git a/data/mods/gen9dlc1/formats-data.ts b/data/mods/gen9dlc1/pokedex-tiers.ts similarity index 99% rename from data/mods/gen9dlc1/formats-data.ts rename to data/mods/gen9dlc1/pokedex-tiers.ts index bd8f196cf6..ef344b8bf4 100644 --- a/data/mods/gen9dlc1/formats-data.ts +++ b/data/mods/gen9dlc1/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { isNonstandard: "Past", tier: "Illegal", diff --git a/data/mods/gen9predlc/formats-data.ts b/data/mods/gen9predlc/pokedex-tiers.ts similarity index 99% rename from data/mods/gen9predlc/formats-data.ts rename to data/mods/gen9predlc/pokedex-tiers.ts index a6bc3d53c4..c6be418028 100644 --- a/data/mods/gen9predlc/formats-data.ts +++ b/data/mods/gen9predlc/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { isNonstandard: "Past", tier: "Illegal", diff --git a/data/mods/gen9ssb/abilities.ts b/data/mods/gen9ssb/abilities.ts index 582ce8e4bd..48644d3f51 100644 --- a/data/mods/gen9ssb/abilities.ts +++ b/data/mods/gen9ssb/abilities.ts @@ -1906,7 +1906,7 @@ export const Abilities: import('../../../sim/dex-abilities').ModdedAbilityDataTa shortDesc: "Bypasses Sleep Clause Mod once per battle.", name: "I Did It Again", flags: {}, - // implemented in rulesets.ts + // implemented in format-rules.ts }, // Pulse_kS diff --git a/data/mods/gen9ssb/rulesets.ts b/data/mods/gen9ssb/format-rules.ts similarity index 100% rename from data/mods/gen9ssb/rulesets.ts rename to data/mods/gen9ssb/format-rules.ts diff --git a/data/mods/gennext/formats-data.ts b/data/mods/gennext/pokedex-tiers.ts similarity index 88% rename from data/mods/gennext/formats-data.ts rename to data/mods/gennext/pokedex-tiers.ts index 9d0f7c7648..cec34c4465 100644 --- a/data/mods/gennext/formats-data.ts +++ b/data/mods/gennext/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { aegislash: { inherit: true, tier: "OU", diff --git a/data/mods/mixandmega/scripts.ts b/data/mods/mixandmega/scripts.ts index 1fa80f3933..1e26ca0085 100644 --- a/data/mods/mixandmega/scripts.ts +++ b/data/mods/mixandmega/scripts.ts @@ -5,7 +5,7 @@ export const Scripts: ModdedBattleScriptsData = { if (!this.data.Items[i].megaStone) continue; this.modData('Items', i).onTakeItem = false; const id = this.toID(this.data.Items[i].megaStone); - this.modData('FormatsData', id).isNonstandard = null; + this.modData('PokedexTiers', id).isNonstandard = null; } }, start() { diff --git a/data/mods/moderngen2/rulesets.ts b/data/mods/moderngen2/format-rules.ts similarity index 100% rename from data/mods/moderngen2/rulesets.ts rename to data/mods/moderngen2/format-rules.ts diff --git a/data/mods/moderngen2/formats-data.ts b/data/mods/moderngen2/pokedex-tiers.ts similarity index 99% rename from data/mods/moderngen2/formats-data.ts rename to data/mods/moderngen2/pokedex-tiers.ts index 8d12814b35..fe40148883 100644 --- a/data/mods/moderngen2/formats-data.ts +++ b/data/mods/moderngen2/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../../../sim/dex-species').ModdedSpeciesFormatsDataTable = { +export const PokedexTiers: import('../../../sim/dex-species').ModdedTiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/mods/moderngen2/scripts.ts b/data/mods/moderngen2/scripts.ts index 601921b95c..a9d2206a13 100644 --- a/data/mods/moderngen2/scripts.ts +++ b/data/mods/moderngen2/scripts.ts @@ -22,9 +22,9 @@ export const Scripts: ModdedBattleScriptsData = { for (const i in this.data.Pokedex) { if (this.species.get(i).gen > 2) this.modData('Pokedex', i).gen = 2; } - for (const i in this.data.FormatsData) { + for (const i in this.data.PokedexTiers) { if (this.forGen(9).species.get(i).isNonstandard === 'Past') { - this.modData('FormatsData', i).isNonstandard = null; + this.modData('PokedexTiers', i).isNonstandard = null; } } }, diff --git a/data/formats-data.ts b/data/pokedex-tiers.ts similarity index 99% rename from data/formats-data.ts rename to data/pokedex-tiers.ts index 4a939b5daa..79623362c7 100644 --- a/data/formats-data.ts +++ b/data/pokedex-tiers.ts @@ -1,4 +1,4 @@ -export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable = { +export const PokedexTiers: import('../sim/dex-species').TiersDataTable = { bulbasaur: { tier: "LC", }, diff --git a/data/random-battles/gen7letsgo/teams.ts b/data/random-battles/gen7letsgo/teams.ts index 66f37bdfdf..4862e0c0a2 100644 --- a/data/random-battles/gen7letsgo/teams.ts +++ b/data/random-battles/gen7letsgo/teams.ts @@ -223,7 +223,7 @@ export class RandomLetsGoTeams extends RandomGen8Teams { const pokemon: RandomTeamsTypes.RandomSet[] = []; const pokemonPool: string[] = []; - for (const id in this.dex.data.FormatsData) { + for (const id in this.dex.data.PokedexTiers) { const species = this.dex.species.get(id); if ( species.num < 1 || diff --git a/server/chat-commands/info.ts b/server/chat-commands/info.ts index e7ca0c8879..f10afbe5f5 100644 --- a/server/chat-commands/info.ts +++ b/server/chat-commands/info.ts @@ -3164,7 +3164,7 @@ export const pages: Chat.PageTable = { ``, `

More details

`, ]; - const rulesets = [ + const formatRules = [ `

Rules, mods, and clauses

`, `

The following rules can be added to challenges/tournaments to modify the style of play. Alternatively, already present rules can be removed from formats by preceding the rule name with !

`, `

However, some rules, like Obtainable, are made of subrules, that can be individually turned on and off.

`, @@ -3173,9 +3173,9 @@ export const pages: Chat.PageTable = { for (const rule of rules) { if (rule.hasValue) continue; const desc = rule.desc ? rule.desc : "No description."; - rulesets.push(`${rule.name}${desc}`); + formatRules.push(`${rule.name}${desc}`); } - rulesets.push( + formatRules.push( ``, `

Value rules

`, `