adyxax/spacetraders
1
0
Fork 0
Code Issues Activity

Implement a bit more autonomy for the ships

Browse source
This commit is contained in:
Julien Dessaux 2023-06-08 09:21:05 +02:00
parent 4d5384aa43
commit da567a11ee
Signed by: adyxax
GPG key ID: F92E51B86E07177E
5 changed files with 51 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
automation/contracting.js
View file

@ -5,11 +5,11 @@ import * as ships from '../lib/ships.js';
import * as systems from '../lib/systems.js';
export async function auto(ctx) {
let ship = await ships.ship({symbol: ctx.ship});
let ship = await ships.ship({symbol: ctx.symbol});
// 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));
if (cs === []) throw `No contract at ${ctx.ship}'s location`;
if (cs === []) throw `No contract at ${ctx.symbol}'s location`;
let contract = cs[0];
if (!contract.accepted) {
console.log(new Date(), `accepting contract ${contract.id}`);
@ -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({symbol: ctx.ship}); // TODO we should not need to fetch this
ship = await ships.ship({symbol: ctx.symbol}); // 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);
@ -29,19 +29,18 @@ export async function auto(ctx) {
// the switch makes this 'resumable'
switch (ship.data.nav.waypointSymbol) {
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({symbol: ctx.ship, waypoint: deliveryPoint});
let response = await mining.mineUntilFullOf({good: good, symbol: ctx.symbol});
await ships.navigate({symbol: ctx.symbol, waypoint: deliveryPoint});
break;
case deliveryPoint:
await ships.dock({symbol: ctx.ship});
await ships.refuel({symbol: ctx.ship});
await ships.dock({symbol: ctx.symbol});
await ships.refuel({symbol: ctx.symbol});
console.log(`delivering ${goodCargo.units} of ${good}`);
await contracts.deliver({contract: contract.id, ship: ctx.ship, good: good, units: goodCargo.units });
await ships.navigate({symbol: ctx.ship, waypoint: asteroidField});
await ships.dock({symbol: ctx.ship});
await ships.refuel({symbol: ctx.ship});
await ships.orbit({symbol: ctx.ship});
await contracts.deliver({contract: contract.id, symbol: ctx.symbol, good: good, units: goodCargo.units });
await ships.navigate({symbol: ctx.symbol, waypoint: asteroidField});
await ships.dock({symbol: ctx.symbol});
await ships.refuel({symbol: ctx.symbol});
await ships.orbit({symbol: ctx.symbol});
break;
default:
throw `where is the ship?`;

35
automation/mining.js
View file

@ -1,37 +1,32 @@
import * as dbShips from '../database/ships.js';
import * as api from '../lib/api.js';
import * as ships from '../lib/ships.js';
// example ctx { good: 'SILVER_ORE', ship: 'ADYXAX-2' }
// returns the number of units of the good the ship extracted
// example ctx { good: 'SILVER_ORE', symbol: 'ADYXAX-2' }
// returns the number of units of the good the ship holds
export async function mineUntilFullOf(ctx) {
while(true) {
let response = await mineUntilFull({ship: ctx.ship});
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];
if (good?.units + (antimatter?.units ?? 0) >= response.data.cargo.capacity * 0.9) { // > 90% full of the valuable goods
let cargo = await mineUntilFull({symbol: ctx.symbol});
let good = cargo.inventory.filter(i => i.symbol === ctx.good)[0];
const antimatter = cargo.inventory.filter(i => i.symbol === 'ANTIMATTER')[0];
const junk = cargo.inventory.filter(i => i.symbol !== ctx.good && i.symbol !== 'ANTIMATTER');
if ((good?.units ?? 0) + (antimatter?.units ?? 0) >= cargo.capacity * 0.9) { // > 90% full of the valuable goods
return good.units;
} else { // we are full but need to sell junk
await ships.dock({symbol: ctx.ship});
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({symbol: ctx.ship, good: inventory[i].symbol, units: inventory[i].units});
for (let i=0; i<junk.length; ++i) {
await ships.sell({symbol: ctx.symbol, good: junk[i].symbol, units: junk[i].units});
}
await ships.orbit({symbol: ctx.ship});
}
}
}
// example ctx { ship: 'ADYXAX-2' }
// returns the last ship's extract api response
// example ctx { symbol: 'ADYXAX-2' }
// extract the ship's cargo contents when more than 80% full then returns the ships cargo object
async function mineUntilFull(ctx) {
while(true) {
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;
const ship = dbShips.getShip(ctx.symbol);
if (ship.cargo.units >= ship.cargo.capacity * 0.8) return ship.cargo;
await ships.extract({symbol: ctx.symbol});
}
}

2
lib/contracts.js
View file

@ -10,7 +10,7 @@ export async function contracts() {
export async function deliver(ctx) {
return await api.send({ endpoint: `/my/contracts/${ctx.contract}/deliver`, method: 'POST', payload: {
shipSymbol: ctx.ship,
shipSymbol: ctx.symbol,
tradeSymbol: ctx.good,
units: ctx.units,
}});

25
lib/ships.js
View file

@ -1,11 +1,15 @@
import * as api from './api.js';
import * as dbConfig from '../database/config.js';
import * as dbShips from '../database/ships.js';
import * as systems from '../lib/systems.js';
export async function extract(ctx) {
// TODO check if our current waypoint has an asteroid field?
await orbit(ctx);
const ship = dbShips.getShip(ctx.symbol);
const asteroidFields = await systems.type({symbol: ship.nav.systemSymbol, type: 'ASTEROID_FIELD'});
// TODO if there are multiple fields, find the closest one?
await navigate({symbol: ctx.symbol, waypoint: asteroidFields[0].symbol});
await orbit(ctx);
// TODO handle surveying?
const response = await api.send({endpoint: `/my/ships/${ctx.symbol}/extract`, method: 'POST'});
if (response.error !== undefined) {
switch(response.error.code) {
@ -53,16 +57,27 @@ export async function jump(ctx) {
export async function navigate(ctx) {
const ship = dbShips.getShip(ctx.symbol);
if (ship.nav.waypointSymbol === ctx.waypoint) {
return null;
return await orbit(ctx);
}
await orbit(ctx);
// TODO if we do not have enough fuel, make a stop to refuel along the way or drift to the destination
const response = await api.send({endpoint: `/my/ships/${ctx.symbol}/navigate`, method: 'POST', payload: { waypointSymbol: ctx.waypoint }});
if (response.error !== undefined) {
switch(response.error.code) {
case 4214: // ship is in transit
await api.sleep(response.error.data.secondsToArrival * 1000);
return navigate(ctx);
default: // yet unhandled error
throw response;
}
}
dbShips.setShipFuel(ctx.symbol, response.data.fuel);
dbShips.setShipNav(ctx.symbol, response.data.nav);
const delay = new Date(response.data.nav.route.arrival) - new Date();
await api.sleep(delay);
response.data.nav.status = 'IN_ORBIT';
dbShips.setShipNav(ctx.symbol, response.data.nav);
await refuel(ctx);
return response;
}
@ -99,14 +114,15 @@ export async function purchase(ctx) {
throw response;
}
dbShips.setShip(response.data.ship);
return response.data;
}
export async function refuel(ctx) {
// TODO check if our current waypoint has a marketplace (and sells fuel)?
const ship = dbShips.getShip(ctx.symbol);
if (ship.fuel.current >= ship.fuel.capacity * 0.9) {
return null;
}
// TODO check if our current waypoint has a marketplace (and sells fuel)?
await dock(ctx);
const response = await api.send({endpoint: `/my/ships/${ctx.symbol}/refuel`, method: 'POST'});
if (response.error !== undefined) {
@ -118,6 +134,7 @@ export async function refuel(ctx) {
}
export async function sell(ctx) {
// TODO check if our current waypoint has a marketplace (and sells fuel)?
await dock(ctx);
const ship = dbShips.getShip(ctx.symbol);
const response = await api.send({endpoint: `/my/ships/${ctx.symbol}/sell`, method: 'POST', payload: { symbol: ctx.good, units: ctx.units }});

4
main.js
View file

@ -18,10 +18,10 @@ status Servers' status`);
switch(process.argv[2]) {
case 'autoContractForShip':
await autoContracting.auto({ship: process.argv[3]});
await autoContracting.auto({symbol: process.argv[3]});
break;
case 'autoMiningForShip':
await autoMining.mineUntilFullOf({ship: process.argv[3], good: 'NON_EXISTENT'});
await autoMining.mineUntilFullOf({symbol: process.argv[3], good: 'NON_EXISTENT'});
break;
case 'my-agent':
api.debugLog(await api.send({endpoint: '/my/agent'}));