Skip to content

Improve mod creation #48

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.

Sign up for GitHub

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

Open
lonevox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve mod creation #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions sim/sim/dex.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ type DeepPartial<T> = {
: DeepPartial<T[P]>
};

export type ModData = DeepPartial<ModdedDex['data']>;
export type ModData = DeepPartial<ModdedDex['data']> & {Formats?: FormatList};

export const toID = Data.toID;

Expand Down Expand Up @@ -217,7 +217,7 @@ export class ModdedDex {
return dexes;
}

mod(mod: string | undefined, modData?: DeepPartial<ModdedDex['data']> & {Formats?: FormatList}): ModdedDex {
mod(mod: string | undefined, modData?: ModData): ModdedDex {
if (!mod) return dexes['base'];
const modid = toID(mod);
if (modData?.Types && !modData.TypeChart) modData.TypeChart = modData.Types;
Expand Down Expand Up @@ -325,10 +325,10 @@ export class ModdedDex {
const typeData = this.types.get(targetTyping);
if (!typeData) return 0;
switch (typeData.damageTaken[sourceType]) {
case 1: return 1; // super-effective
case 2: return -1; // resist
// in case of weird situations like Gravity, immunity is handled elsewhere
default: return 0;
case 1: return 1; // super-effective
case 2: return -1; // resist
// in case of weird situations like Gravity, immunity is handled elsewhere
default: return 0;
}
}

Expand Down Expand Up @@ -427,7 +427,7 @@ export class ModdedDex {
loadDataFile(
mod: string,
dataType: DataType,
modData?: DeepPartial<ModdedDex['data']>
modData?: ModData
): AnyObject | void {
if (modData) return modData[dataType];
return (dexData as any)[mod === 'base' ? BASE_MOD : mod][dataType];
Expand Down Expand Up @@ -464,7 +464,7 @@ export class ModdedDex {
return this;
}

loadData(modData?: DeepPartial<ModdedDex['data']>): DexTableData {
loadData(modData?: ModData): DexTableData {
if (this.dataCache) return this.dataCache;
const dataCache: {[k in keyof DexTableData]?: any} = {};

Expand Down