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

Implement Gigantamaxing properly #408

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
8 changes: 5 additions & 3 deletions calc/bundle
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ const exports = {};
`;
bundled += bundler.read('util.js', 3, 1);
const species = bundler.read('data/species.js').split('\n');
bundled += species.slice(1, 64).join('\n'); // generator + iterator + spreadArray polyfill
bundled += species.slice(1, 39).join('\n'); // generator + iterator polyfill
bundled += '\nvar e_1, _a, e_2, _b;\nvar util_1 = exports;\n';
bundled += species.slice(68, -2).join('\n');
bundled += species.slice(43, -2).join('\n');

const types = bundler.read('data/types.js').split('\n');
bundled += types.slice(1, 12).join('\n'); // __assign polyfill
Expand All @@ -25,7 +25,9 @@ bundled += natures.slice(28, 44).join('\n'); // __read polyfill
bundled += natures.slice(47, -2).join('\n');
bundled += bundler.read('data/abilities.js', 43, 1);
bundled += bundler.read('data/moves.js', 43, 1);
bundled += bundler.read('data/items.js', 68, 1);
const items = bundler.read('data/items.js').split('\n');
bundled += items.slice(44, 53).join('\n'); // __spreadArray polyfill
bundled += items.slice(68, -2).join('\n');
bundled += `
var abilities_1 = exports;
var items_1 = exports;
Expand Down
1 change: 1 addition & 0 deletions calc/src/data/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ export interface Specie extends Data<SpeciesName> {
readonly nfe?: boolean;
readonly gender?: GenderName;
readonly otherFormes?: SpeciesName[];
readonly canGigantamax?: MoveName;
readonly baseSpecies?: SpeciesName;
readonly abilities?: {0: AbilityName | ''};
}
Expand Down
4 changes: 4 additions & 0 deletions calc/src/data/moves.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4750,6 +4750,10 @@ const SV_PATCH: {[name: string]: DeepPartial<MoveData>} = {

const SV: {[name: string]: MoveData} = extend(true, {}, SS, SV_PATCH);

for (const moveName in SV) {
if (moveName.startsWith('G-Max')) delete SV[moveName];
}

export const MOVES = [{}, RBY, GSC, ADV, DPP, BW, XY, SM, SS, SV];

export class Moves implements I.Moves {
Expand Down