Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert VGC 2020's mod to a pre-DLC2 mod #7564

Merged
merged 3 commits into from
Oct 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/formats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ export const Formats: FormatList = [
`&bullet; <a href="https://www.smogon.com/forums/threads/3657818/">VGC 2020 Sample Teams</a>`,
],

mod: 'vgc20',
mod: 'gen8dlc1',
gameType: 'doubles',
forcedLevel: 50,
teamLength: {
Expand Down
30 changes: 30 additions & 0 deletions data/mods/gen8dlc1/abilities.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
export const Abilities: {[k: string]: ModdedAbilityData} = {
asoneglastrier: {
inherit: true,
isNonstandard: "Unobtainable",
},
asonespectrier: {
inherit: true,
isNonstandard: "Unobtainable",
},
chillingneigh: {
inherit: true,
isNonstandard: "Unobtainable",
},
curiousmedicine: {
inherit: true,
isNonstandard: "Unobtainable",
},
dragonsmaw: {
inherit: true,
isNonstandard: "Unobtainable",
},
grimneigh: {
inherit: true,
isNonstandard: "Unobtainable",
},
transistor: {
inherit: true,
isNonstandard: "Unobtainable",
},
};
File renamed without changes.
50 changes: 50 additions & 0 deletions data/mods/gen8dlc1/items.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
export const Items: {[k: string]: ModdedItemData} = {
adamantorb: {
inherit: true,
isNonstandard: "Unobtainable",
},
burndrive: {
inherit: true,
isNonstandard: "Unobtainable",
},
chilldrive: {
inherit: true,
isNonstandard: "Unobtainable",
},
custapberry: {
inherit: true,
isNonstandard: "Unobtainable",
},
dousedrive: {
inherit: true,
isNonstandard: "Unobtainable",
},
enigmaberry: {
inherit: true,
isNonstandard: "Unobtainable",
},
griseousorb: {
inherit: true,
isNonstandard: "Unobtainable",
},
jabocaberry: {
inherit: true,
isNonstandard: "Unobtainable",
},
lustrousorb: {
inherit: true,
isNonstandard: "Unobtainable",
},
rowapberry: {
inherit: true,
isNonstandard: "Unobtainable",
},
shockdrive: {
inherit: true,
isNonstandard: "Unobtainable",
},
souldew: {
inherit: true,
isNonstandard: "Unobtainable",
},
};
File renamed without changes.
138 changes: 138 additions & 0 deletions data/mods/gen8dlc1/moves.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
export const Moves: {[k: string]: ModdedMoveData} = {
aeroblast: {
inherit: true,
isNonstandard: "Unobtainable",
},
astralbarrage: {
inherit: true,
isNonstandard: "Unobtainable",
},
coreenforcer: {
inherit: true,
isNonstandard: "Unobtainable",
},
crushgrip: {
inherit: true,
isNonstandard: "Unobtainable",
},
diamondstorm: {
inherit: true,
isNonstandard: "Unobtainable",
},
dragonascent: {
inherit: true,
isNonstandard: "Unobtainable",
},
dragonenergy: {
inherit: true,
isNonstandard: "Unobtainable",
},
eeriespell: {
inherit: true,
isNonstandard: "Unobtainable",
},
fierywrath: {
inherit: true,
isNonstandard: "Unobtainable",
},
freezingglare: {
inherit: true,
isNonstandard: "Unobtainable",
},
geomancy: {
inherit: true,
isNonstandard: "Unobtainable",
},
glaciallance: {
inherit: true,
isNonstandard: "Unobtainable",
},
landswrath: {
inherit: true,
isNonstandard: "Unobtainable",
},
lovelykiss: {
inherit: true,
isNonstandard: "Unobtainable",
},
lunardance: {
inherit: true,
isNonstandard: "Unobtainable",
},
lusterpurge: {
inherit: true,
isNonstandard: "Unobtainable",
},
magmastorm: {
inherit: true,
isNonstandard: "Unobtainable",
},
mindblown: {
inherit: true,
isNonstandard: "Unobtainable",
},
mistball: {
inherit: true,
isNonstandard: "Unobtainable",
},
naturesmadness: {
inherit: true,
isNonstandard: "Unobtainable",
},
oblivionwing: {
inherit: true,
isNonstandard: "Unobtainable",
},
originpulse: {
inherit: true,
isNonstandard: "Unobtainable",
},
precipiceblades: {
inherit: true,
isNonstandard: "Unobtainable",
},
roaroftime: {
inherit: true,
isNonstandard: "Unobtainable",
},
sacredfire: {
inherit: true,
isNonstandard: "Unobtainable",
},
searingshot: {
inherit: true,
isNonstandard: "Unobtainable",
},
shadowforce: {
inherit: true,
isNonstandard: "Unobtainable",
},
spacialrend: {
inherit: true,
isNonstandard: "Unobtainable",
},
steameruption: {
inherit: true,
isNonstandard: "Unobtainable",
},
technoblast: {
inherit: true,
isNonstandard: "Unobtainable",
},
thousandarrows: {
inherit: true,
isNonstandard: "Unobtainable",
},
thousandwaves: {
inherit: true,
isNonstandard: "Unobtainable",
},
thundercage: {
inherit: true,
isNonstandard: "Unobtainable",
},
thunderouskick: {
inherit: true,
isNonstandard: "Unobtainable",
},
};
File renamed without changes.
File renamed without changes.
9 changes: 5 additions & 4 deletions sim/team-validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ export class TeamValidator {
// Ability Capsule allows this in Gen 6+
problems.push(`${name} has a Gen 4 ability and isn't evolved - it can't use moves from Gen 3.`);
}
if (setSources.maxSourceGen() < 5 && setSources.isHidden && dex.gen <= 7) {
if (setSources.maxSourceGen() < 5 && setSources.isHidden && (dex.gen <= 7 || format.mod === 'gen8dlc1')) {
problems.push(`${name} has a Hidden Ability - it can't use moves from before Gen 5.`);
}
if (
Expand Down Expand Up @@ -1627,7 +1627,8 @@ export class TeamValidator {
if (species.abilities['H']) {
const isHidden = (set.ability === species.abilities['H']);

if ((!isHidden && eventData.isHidden) || (isHidden && !eventData.isHidden && dex.gen <= 7)) {
if ((!isHidden && eventData.isHidden) ||
(isHidden && !eventData.isHidden && (dex.gen <= 7 || this.format.mod === 'gen8dlc1'))) {
if (fastReturn) return true;
problems.push(`${name} must ${eventData.isHidden ? 'have' : 'not have'} its Hidden Ability${etc}.`);
}
Expand Down Expand Up @@ -1688,7 +1689,7 @@ export class TeamValidator {
source => parseInt(source.charAt(0)) >= 5
);
if (setSources.sourcesBefore < 5) setSources.sourcesBefore = 0;
if (!setSources.sourcesBefore && !setSources.sources.length && dex.gen <= 7) {
if (!setSources.sourcesBefore && !setSources.sources.length && (dex.gen <= 7 || this.format.mod === 'gen8dlc1')) {
problems.push(`${name} has a hidden ability - it can't have moves only learned before gen 5.`);
return problems;
}
Expand Down Expand Up @@ -1844,7 +1845,7 @@ export class TeamValidator {
if (learnedGen <= moveSources.sourcesBefore) continue;

if (
learnedGen < 7 && setSources.isHidden && dex.gen <= 7 &&
learnedGen < 7 && setSources.isHidden && (dex.gen <= 7 || format.mod === 'gen8dlc1') &&
!dex.mod('gen' + learnedGen).getSpecies(baseSpecies.name).abilities['H']
) {
// check if the Pokemon's hidden ability was available
Expand Down