adyxax/spacetraders
1
0
Fork 0
Code Issues Activity

[node] waypoints usage refactoring

Browse source
This commit is contained in:
Julien Dessaux 2024-04-06 10:55:11 +02:00
parent 234770b611
commit eeaa64b5ed
Signed by: adyxax
GPG key ID: F92E51B86E07177E
5 changed files with 43 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nodejs/lib/ships.ts
View file

@ -18,6 +18,7 @@ import {
Fuel,
Nav,
Registration,
Waypoint,
} from './types.ts';
import * as dbAgents from '../database/agents.ts';
@ -96,14 +97,13 @@ export class Ship {
isFull(): boolean {
return this.cargo.units >= this.cargo.capacity * 0.9;
}
async navigate(waypointSymbol: string): Promise<void> {
if (this.nav.waypointSymbol === waypointSymbol) return;
const d =
async navigate(waypoint: Waypoint): Promise<void> {
if (this.nav.waypointSymbol === waypoint.symbol) return;
// TODO compute fuel consumption and refuel if we do not have enough OR if the destination does not sell fuel?
await this.refuel();
await this.orbit();
// TODO if we do not have enough fuel, make a stop to refuel along the way or drift to the destination
const response = await send<{fuel: Fuel, nav: Nav}>({endpoint: `/my/ships/${this.symbol}/navigate`, method: 'POST', payload: { waypointSymbol: waypointSymbol }}); // TODO events field
const response = await send<{fuel: Fuel, nav: Nav}>({endpoint: `/my/ships/${this.symbol}/navigate`, method: 'POST', payload: { waypointSymbol: waypoint.symbol }}); // TODO events field
if (response.error) {
switch(response.error.code) {
case 4203: // not enough fuel
@ -117,7 +117,7 @@ export class Ship {
case 4214:
const sicite = response.error.data as ShipIsCurrentlyInTransitError;
await sleep(sicite.secondsToArrival * 1000);
return await this.navigate(waypointSymbol);
return await this.navigate(waypoint);
default: // yet unhandled error
debugLog(response);
throw response;

16
nodejs/lib/systems.ts
View file

@ -8,15 +8,15 @@ import * as dbSystems from '../database/systems.ts';
import {
Market,
System,
Waypoint
Waypoint,
} from './types.ts'
import { systemFromWaypoint } from './utils.ts';
export async function market(waypointSymbol: string): Promise<Market> {
const data = dbMarkets.getMarketAtWaypoint(waypointSymbol);
export async function market(waypoint: Waypoint): Promise<Market> {
const data = dbMarkets.getMarketAtWaypoint(waypoint.symbol);
if (data) { return data; }
const systemSymbol = systemFromWaypoint(waypointSymbol);
let response = await send<Market>({endpoint: `/systems/${systemSymbol}/waypoints/${waypointSymbol}/market`});
const systemSymbol = systemFromWaypoint(waypoint.symbol);
let response = await send<Market>({endpoint: `/systems/${systemSymbol}/waypoints/${waypoint.symbol}/market`});
if (response.error) {
debugLog(response);
throw response;
@ -55,6 +55,12 @@ export async function type(system: string, typeSymbol: string): Promise<Array<Wa
return ws.filter(s => s.type === typeSymbol);
}
export async function waypoint(waypointSymbol: string): Promise<Waypoint> {
const systemSymbol = systemFromWaypoint(waypointSymbol);
const w = await waypoints(systemSymbol);
return w.filter(w => w.symbol === waypointSymbol)[0];
}
export async function waypoints(systemSymbol: string): Promise<Array<Waypoint>> {
const s = await system(systemSymbol);
const updated = dbSystems.getSystemUpdated(systemSymbol);