From 7008c91c6fb74f7106c4d9903849d3f1fc17b2f1 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Fri, 2 Jun 2023 00:00:09 +0200 Subject: Improved ships lib with ships db caching --- automation/contracting.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'automation/contracting.js') diff --git a/automation/contracting.js b/automation/contracting.js index b5c7292..4eff9d5 100644 --- a/automation/contracting.js +++ b/automation/contracting.js @@ -5,7 +5,7 @@ import * as ships from '../lib/ships.js'; import * as systems from '../lib/systems.js'; export async function auto(ctx) { - let ship = await ships.ship({ship: ctx.ship}); + let ship = await ships.ship({symbol: ctx.ship}); // Fetch our contracts in the system the ship currently is in let cs = await contracts.contracts(); cs = cs.data.filter(c => c.terms.deliver[0].destinationSymbol.startsWith(ship.data.nav.systemSymbol)); @@ -20,7 +20,7 @@ export async function auto(ctx) { const asteroidFields = await systems.type({symbol: ship.data.nav.systemSymbol, type: 'ASTEROID_FIELD'}); const asteroidField = asteroidFields[0].symbol; while (true) { - ship = await ships.ship({ship: ctx.ship}); // TODO we should not need to fetch this + ship = await ships.ship({symbol: ctx.ship}); // TODO we should not need to fetch this // If we are in transit, we wait until we arrive const delay = new Date(ship.data.nav.route.arrival) - new Date(); if (delay > 0) await api.sleep(delay); @@ -31,16 +31,16 @@ export async function auto(ctx) { case asteroidField: let response = await mining.mineUntilFullOf({good: good, ship: ctx.ship}); //console.log(`${ctx.ship}'s cargo is full with ${response.units} of ${good}!`); - await ships.navigate({ship: ctx.ship, waypoint: deliveryPoint}); + await ships.navigate({symbol: ctx.ship, waypoint: deliveryPoint}); break; case deliveryPoint: await ships.dock({symbol: ctx.ship}); - await ships.refuel({ship: ctx.ship}); + await ships.refuel({symbol: ctx.ship}); console.log(`delivering ${goodCargo.units} of ${good}`); await contracts.deliver({contract: contract.id, ship: ctx.ship, good: good, units: goodCargo.units }); - await ships.navigate({ship: ctx.ship, waypoint: asteroidField}); + await ships.navigate({symbol: ctx.ship, waypoint: asteroidField}); await ships.dock({symbol: ctx.ship}); - await ships.refuel({ship: ctx.ship}); + await ships.refuel({symbol: ctx.ship}); await ships.orbit({symbol: ctx.ship}); break; default: -- cgit v1.2.3