Removing unneeded types.

This commit is contained in:
marley 2023-05-18 09:56:04 -07:00
parent 45533267ce
commit 7dec2bd445
2 changed files with 6 additions and 38 deletions

View file

@ -3,29 +3,6 @@ interface journalEntry<eventType = string> {
event: eventType, event: eventType,
} }
export interface discoveryHonk extends journalEntry<'FSSDiscoveryScan'> {
Progress: number,
BodyCount: number,
NonBodyCount: number,
SystemName: string,
SystemAddress: number,
}
export interface completedSystemFSSScan extends journalEntry<'FSSAllBodiesFound'> {
event: 'FSSAllBodiesFound',
SystemName: string,
SystemAddress: number,
Count: number,
}
export interface dssIndicator extends journalEntry<'SAAScanComplete'> {
BodyName: string,
SystemAddress: number,
BodyID: number,
ProbesUsed: number,
EfficiencyTarget: number,
}
interface bodyParent { interface bodyParent {
[index: string]: number, [index: string]: number,
} }
@ -131,18 +108,8 @@ export interface planetScan<scanType> extends journalEntry<'Scan'> {
WasMapped: boolean, WasMapped: boolean,
} }
export type autoScan = starScan<'AutoScan'> | asteroidScan<'AutoScan'> | planetScan<'AutoScan'> export type autoScan = starScan<'AutoScan'>|asteroidScan<'AutoScan'>|planetScan<'AutoScan'>
export type detailedScan = starScan<'Detailed'> & asteroidScan<'Detailed'> & planetScan<'Detailed'> export type detailedScan = starScan<'Detailed'>&asteroidScan<'Detailed'>&planetScan<'Detailed'>
export type discoveryScan = detailedScan
export type fssScan = detailedScan
export type dssScan = detailedScan
export interface startFsdJump extends journalEntry<'StartJump'> {
JumpType: 'Hyperspace',
StarSystem: string,
SystemAddress: number,
StarClass: string,
}
interface faction { interface faction {
Name: string, Name: string,

View file

@ -1,11 +1,12 @@
import { FSDJump } from '@kayahr/ed-journal'; import { FSDJump, ExtendedNavRoute, Location } from '@kayahr/ed-journal';
import type { location, navRouteSystem } from '../@types/journalLines';
import * as _ from 'lodash-es'; import * as _ from 'lodash-es';
import { Body } from './Body'; import { Body } from './Body';
import { EDSM } from './EDSM'; import { EDSM } from './EDSM';
type ExtendedNavRouteSystem = (ExtendedNavRoute)['Route'][0];
export class System { export class System {
name: string; name: string;
SystemAddress?: number; SystemAddress?: number;
@ -18,7 +19,7 @@ export class System {
estimatedValueMapped?: number; estimatedValueMapped?: number;
valuableBodies?: Body[]; valuableBodies?: Body[];
constructor(line?: navRouteSystem|FSDJump|location) { constructor(line?: ExtendedNavRouteSystem|FSDJump|Location) {
if (!line) { if (!line) {
this.name = 'Unknown'; this.name = 'Unknown';
} else { } else {