Skip to content

Commit 281c52d

Browse files
fix: default to Varzia when trader name is undefined (#688)
1 parent 8046a0a commit 281c52d

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

lib/WorldState.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ export class WorldState {
463463

464464
this.steelPath = new SteelPathOffering(deps);
465465

466-
[this.vaultTrader] = parseArray(VoidTrader, data.PrimeVaultTraders, deps);
466+
[this.vaultTrader] = parseArray(VoidTrader, data.PrimeVaultTraders, {...deps, character: 'Varzia'});
467467

468468
[this.archonHunt] = parseArray(Sortie, data.LiteSorties, deps);
469469

lib/models/VoidTrader.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default class VoidTrader extends WorldstateObject {
4949
* The initial start date
5050
*/
5151
initialStart: Date;
52-
52+
5353
/**
5454
* Whether it's completed or not
5555
*/
@@ -61,15 +61,16 @@ export default class VoidTrader extends WorldstateObject {
6161
schedule: VoidTraderSchedule[];
6262

6363
/**
64-
* @param data The Void trader data
64+
* @param data The trader data
6565
* @param deps The dependencies object
6666
* @param deps.locale Locale to use for translations
67+
* @param deps.character The trader name
6768
*/
68-
constructor(data: RawVoidTrader, { locale = 'en' }: Dependency = { locale: 'en' }) {
69+
constructor(data: RawVoidTrader, { locale = 'en', character }: Dependency = { locale: 'en' }) {
6970
super(data);
7071
insist({ ...data }, 'Activation', 'Expiry');
7172

72-
this.character = data.Character ? data.Character.replace("Baro'Ki Teel", "Baro Ki'Teer") : '';
73+
this.character = data.Character ? data.Character.replace("Baro'Ki Teel", "Baro Ki'Teer") : character ?? '';
7374
this.location = node(data.Node, locale);
7475
this.inventory = data.Manifest ? data.Manifest.map((i) => new VoidTraderItem(i, { locale })) : [];
7576
this.psId = `${this.id}${this.inventory.length}`;

lib/supporting/Dependency.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default interface Dependency {
1919
/**
2020
* Generic logger to use if needed
2121
*/
22-
logger?: {debug: (message: string) => void};
22+
logger?: { debug: (message: string) => void };
2323

2424
/**
2525
* Sentint Data for parsing
@@ -30,4 +30,9 @@ export default interface Dependency {
3030
* Sortie data for parsing
3131
*/
3232
sortieData?: SortieData;
33+
34+
/**
35+
* Character name for traders
36+
*/
37+
character?: string;
3338
}

0 commit comments

Comments
 (0)