Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix missed conversions of validate -> obtainable

Browse Source
This commit is contained in:
Guangcong Luo 2019-10-06 04:32:23 +11:00
parent 71498d451d
commit 3cd04c349e
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/mods/gen1/rulesets.js
View File

@ -2,7 +2,7 @@
/**@type {{[k: string]: ModdedFormatsData}} */
let BattleFormats = {
validatemoves: {
obtainablemoves: {
inherit: true,
banlist: [
// https://www.smogon.com/forums/threads/implementing-all-old-gens-in-ps-testers-required.3483261/post-5420130

2
data/mods/gen2/rulesets.js
View File

@ -2,7 +2,7 @@
/**@type {{[k: string]: ModdedFormatsData}} */
let BattleFormats = {
validatemoves: {
obtainablemoves: {
inherit: true,
banlist: [
'Hypnosis + Mean Look',

2
data/mods/gen5/rulesets.js
View File

@ -2,7 +2,7 @@
/**@type {{[k: string]: ModdedFormatsData}} */
let BattleFormats = {
validatemoves: {
obtainablemoves: {
inherit: true,
banlist: [
'Chansey + Charm + Seismic Toss',

10
data/rulesets.js
View File

@ -74,14 +74,14 @@ let BattleFormats = {
desc: "The standard ruleset for all official Smogon doubles tiers",
ruleset: ['Species Clause', 'Nickname Clause', 'OHKO Clause', 'Moody Clause', 'Evasion Abilities Clause', 'Evasion Moves Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
},
validate: {
obtainable: {
effectType: 'ValidatorRule',
name: 'Obtainable',
desc: "Makes sure the team is possible to obtain in-game.",
ruleset: ['Obtainable Moves', 'Obtainable Abilities', 'Obtainable Formes', 'Obtainable Misc'],
banlist: ['Unreleased', 'Nonexistent'],
},
validatemoves: {
obtainablemoves: {
effectType: 'ValidatorRule',
name: 'Obtainable Moves',
desc: "Makes sure moves are learnable by the species.",
@ -92,13 +92,13 @@ let BattleFormats = {
],
// Mostly hardcoded in team-validator.ts
},
validateabilities: {
obtainableabilities: {
effectType: 'ValidatorRule',
name: 'Obtainable Abilities',
desc: "Makes sure abilities match the species.",
// Hardcoded in team-validator.ts
},
validateformes: {
obtainableformes: {
effectType: 'ValidatorRule',
name: 'Obtainable Formes',
desc: "Makes sure in-battle formes only appear in-battle.",
@ -130,7 +130,7 @@ let BattleFormats = {
return [];
},
},
validatemisc: {
obtainablemisc: {
effectType: 'ValidatorRule',
name: 'Obtainable Misc',
desc: "Validate all obtainability things that aren't moves/abilities (Hidden Power type, gender, stats, etc).",

2
sim/battle.ts
View File

@ -1399,7 +1399,7 @@ export class Battle extends Dex.ModdedDex {
continue;
}
const ruleTable = this.getRuleTable(this.getFormat());
if ((ruleTable.has('+hackmons') || !ruleTable.has('validateabilities')) && !this.getFormat().team) {
if ((ruleTable.has('+hackmons') || !ruleTable.has('obtainableabilities')) && !this.getFormat().team) {
// hackmons format
continue;
} else if (abilitySlot === 'H' && template.unreleasedHidden) {

2
sim/dex-data.ts
View File

@ -192,7 +192,7 @@ export class RuleTable extends Map<string, string> {
getReason(key: string): string | null {
const source = this.get(key);
if (source === undefined) return null;
if (key === '-nonexistent' || key.startsWith('validate')) {
if (key === '-nonexistent' || key.startsWith('obtainable')) {
return 'not obtainable';
}
return source ? `banned by ${source}` : `banned`;

30
sim/team-validator.ts
View File

@ -331,11 +331,11 @@ export class TeamValidator {
const setHas: {[k: string]: true} = {};
const allowEVs = dex.currentMod !== 'letsgo';
const capEVs = dex.gen > 2 && (ruleTable.has('validatemisc') || dex.gen === 6);
const capEVs = dex.gen > 2 && (ruleTable.has('obtainablemisc') || dex.gen === 6);
if (!set.evs) set.evs = TeamValidator.fillStats(null, allowEVs && !capEVs ? 252 : 0);
if (!set.ivs) set.ivs = TeamValidator.fillStats(null, 31);
if (ruleTable.has('validateformes')) {
if (ruleTable.has('obtainableformes')) {
problems.push(...this.validateForme(set));
}
@ -354,7 +354,7 @@ export class TeamValidator {
item = dex.getItem(set.item);
ability = dex.getAbility(set.ability);
if (ability.id === 'battlebond' && template.id === 'greninja' && ruleTable.has('validateabilities')) {
if (ability.id === 'battlebond' && template.id === 'greninja' && ruleTable.has('obtainableabilities')) {
template = dex.getTemplate('greninjaash');
if (set.gender && set.gender !== 'M') {
problems.push(`Battle Bond Greninja must be male.`);
@ -406,7 +406,7 @@ export class TeamValidator {
problem = this.checkItem(set, item, setHas);
if (problem) problems.push(problem);
if (ruleTable.has('validatemisc')) {
if (ruleTable.has('obtainablemisc')) {
if (dex.gen <= 1 || ruleTable.has('allowavs')) {
if (item.id) {
// no items allowed
@ -416,7 +416,7 @@ export class TeamValidator {
}
if (!set.ability) set.ability = 'No Ability';
if (ruleTable.has('validateabilities')) {
if (ruleTable.has('obtainableabilities')) {
if (dex.gen <= 2 || ruleTable.has('allowavs')) {
set.ability = 'No Ability';
} else {
@ -492,7 +492,7 @@ export class TeamValidator {
problem = this.checkMove(set, move, setHas);
if (problem) problems.push(problem);
if (ruleTable.has('validatemoves')) {
if (ruleTable.has('obtainablemoves')) {
const checkLearnset = (ruleTable.checkLearnset && ruleTable.checkLearnset[0] || this.checkLearnset);
lsetProblem = checkLearnset.call(this, move, template, setSources, set);
if (lsetProblem) {
@ -524,7 +524,7 @@ export class TeamValidator {
);
if (eventProblems) problems.push(...eventProblems);
}
} else if (ruleTable.has('validatemisc') && template.eventOnly) {
} else if (ruleTable.has('obtainablemisc') && template.eventOnly) {
const eventTemplate = !template.eventPokemon && template.baseSpecies !== template.species ?
dex.getTemplate(template.baseSpecies) : template;
const eventPokemon = eventTemplate.eventPokemon;
@ -560,11 +560,11 @@ export class TeamValidator {
if (eventProblems) problems.push(...eventProblems);
}
}
if (ruleTable.has('validatemisc') && set.level < (template.evoLevel || 0)) {
if (ruleTable.has('obtainablemisc') && set.level < (template.evoLevel || 0)) {
// FIXME: Event pokemon given at a level under what it normally can be attained at gives a false positive
problems.push(`${name} must be at least level ${template.evoLevel} to be evolved.`);
}
if (ruleTable.has('validatemoves') && template.id === 'keldeo' && set.moves.includes('secretsword') &&
if (ruleTable.has('obtainablemoves') && template.id === 'keldeo' && set.moves.includes('secretsword') &&
(format.requirePlus || format.requirePentagon)) {
problems.push(`${name} has Secret Sword, which is only compatible with Keldeo-Ordinary obtained from Gen 5.`);
}
@ -634,8 +634,8 @@ export class TeamValidator {
const allowEVs = dex.currentMod !== 'letsgo';
const allowAVs = ruleTable.has('allowavs');
const capEVs = dex.gen > 2 && (ruleTable.has('validatemisc') || dex.gen === 6);
const canBottleCap = dex.gen >= 7 && (set.level === 100 || !ruleTable.has('validatemisc'));
const capEVs = dex.gen > 2 && (ruleTable.has('obtainablemisc') || dex.gen === 6);
const canBottleCap = dex.gen >= 7 && (set.level === 100 || !ruleTable.has('obtainablemisc'));
if (!set.evs) set.evs = TeamValidator.fillStats(null, allowEVs && !capEVs ? 252 : 0);
if (!set.ivs) set.ivs = TeamValidator.fillStats(null, 31);
@ -652,12 +652,12 @@ export class TeamValidator {
if (move.id === 'hiddenpower' && move.type !== 'Normal') {
if (!set.hpType) {
set.hpType = move.type;
} else if (set.hpType !== move.type && ruleTable.has('validatemisc')) {
} else if (set.hpType !== move.type && ruleTable.has('obtainablemisc')) {
problems.push(`${name}'s Hidden Power type ${set.hpType} is incompatible with Hidden Power ${move.type}`);
}
}
}
if (set.hpType && maxedIVs && ruleTable.has('validatemisc')) {
if (set.hpType && maxedIVs && ruleTable.has('obtainablemisc')) {
if (dex.gen <= 2) {
const HPdvs = dex.getType(set.hpType).HPdvs;
set.ivs = {hp: 30, atk: 30, def: 30, spa: 30, spd: 30, spe: 30};
@ -680,7 +680,7 @@ export class TeamValidator {
const diancieException = template.species === 'Diancie' && set.shiny;
const has3PerfectIVs = setSources.minSourceGen() >= 6 && isLegendary && !diancieException;
if (set.hpType === 'Fighting' && ruleTable.has('validatemisc')) {
if (set.hpType === 'Fighting' && ruleTable.has('obtainablemisc')) {
if (has3PerfectIVs) {
// Legendary Pokemon must have at least 3 perfect IVs in gen 6+
problems.push(`${name} must not have Hidden Power Fighting because it starts with 3 perfect IVs because it's a gen 6+ legendary.`);
@ -1259,7 +1259,7 @@ export class TeamValidator {
}
// Event-related ability restrictions only matter if we care about illegal abilities
const ruleTable = this.ruleTable;
if (ruleTable.has('validateabilities')) {
if (ruleTable.has('obtainableabilities')) {
if (dex.gen <= 5 && eventData.abilities && eventData.abilities.length === 1 && !eventData.isHidden) {
if (template.species === eventTemplate.species) {
// has not evolved, abilities must match