adyxax/spacetraders
1
0
Fork 0
Code Issues Activity

Improved ships lib with ships db caching

Browse source
This commit is contained in:
Julien Dessaux 2023-06-02 00:00:09 +02:00
parent 68c457964a
commit 7008c91c6f
Signed by: adyxax
GPG key ID: F92E51B86E07177E
10 changed files with 170 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
automation/automation.js
View file

@ -21,6 +21,6 @@ export async function register(symbol, faction) {
}
dbConfig.registerAgent(json.data);
exploration.init();
// TODO ship
dbShips.setShip(json.data.ship);
// TODO contract
}

12
automation/contracting.js
View file

@ -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:

6
automation/mining.js
View file

@ -6,7 +6,7 @@ import * as ships from '../lib/ships.js';
export async function mineUntilFullOf(ctx) {
while(true) {
let response = await mineUntilFull({ship: ctx.ship});
if (response === null) response = await ships.ship({ship: ctx.ship}); // TODO we should not need to fetch this
if (response === null) response = await ships.ship({symbol: ctx.ship}); // TODO we should not need to fetch this
let good = response.data.cargo.inventory.filter(i => i.symbol === ctx.good)[0];
const inventory = response.data.cargo.inventory.filter(i => i.symbol !== ctx.good);
const antimatter = response.data.cargo.inventory.filter(i => i.symbol === 'ANTIMATTER')[0];
@ -17,7 +17,7 @@ export async function mineUntilFullOf(ctx) {
for (let i=0; i<inventory.length; ++i) {
if (inventory[i].symbol === 'ANTIMATTER') continue;
//console.log(`selling ${inventory[i].units} of ${inventory[i].symbol}`);
await ships.sell({ship: ctx.ship, good: inventory[i].symbol, units: inventory[i].units});
await ships.sell({symbol: ctx.ship, good: inventory[i].symbol, units: inventory[i].units});
}
await ships.orbit({symbol: ctx.ship});
}
@ -28,7 +28,7 @@ export async function mineUntilFullOf(ctx) {
// returns the last ship's extract api response
async function mineUntilFull(ctx) {
while(true) {
const response = await ships.extract(ctx);
const response = await ships.extract({symbol: ctx.ship});
if (response === null) return null;
//console.log(`${ctx.ship}: extracted ${response.data.extraction.yield.units} of ${response.data.extraction.yield.symbol}`);
if (response.data.cargo.units >= response.data.cargo.capacity * 0.9) return response;