Skip to content

Commit

Permalink
Fix etro import level
Browse files Browse the repository at this point in the history
  • Loading branch information
xpdota committed Jul 19, 2024
1 parent 950d83f commit 3586fde
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions packages/core/src/external/etro_import.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {EquipSlotKey, ItemSlotExport, SetExport} from "@xivgear/xivmath/geartypes";
import {JobName, MATERIA_SLOTS_MAX} from "@xivgear/xivmath/xivconstants";
import {JobName, MATERIA_SLOTS_MAX, SupportedLevel} from "@xivgear/xivmath/xivconstants";
import {queryBaseParams} from "../datamanager";
import {BaseParamToStatKey, RelevantBaseParam} from "./xivapitypes";

Expand Down Expand Up @@ -32,6 +32,7 @@ type EtroOtherData = {
name: string,
food: number | null,
materia: { [slot: (number | string)]: EtroMateria },
level: SupportedLevel
}

type EtroRelicsData = {
Expand Down Expand Up @@ -148,7 +149,8 @@ export async function getSetFromEtro(etroSetId: string) {
name: response.name,
job: response.jobAbbrev,
food: food,
items: items
items: items,
level: response.level
};
return setImport;
}
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/sheet.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */ // TODO: get back to fixing this at some point
import {
CURRENT_MAX_LEVEL,
defaultItemDisplaySettings,
DefaultMateriaFillPrio,
getClassJobStats,
Expand Down Expand Up @@ -173,7 +174,7 @@ export class GearPlanSheet {
this._importedData = importedData;
this._saveKey = sheetKey;
this._sheetName = importedData.name;
this.level = importedData.level ?? 90;
this.level = importedData.level ?? CURRENT_MAX_LEVEL;
this._race = importedData.race;
this._partyBonus = importedData.partyBonus ?? 0;
this.classJobName = importedData.job ?? 'WHM';
Expand Down

0 comments on commit 3586fde

Please sign in to comment.