adyxax/spacetraders
1
0
Fork 0
Code Issues Activity

[node] fixed contracting and implemented renegotiation

Browse source
This commit is contained in:
Julien Dessaux 2024-03-30 14:22:59 +01:00
parent 719a9c1a77
commit 8819cf9c67
Signed by: adyxax
GPG key ID: F92E51B86E07177E
8 changed files with 103 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

54
nodejs/automation/contracting.ts
View file

@ -11,7 +11,7 @@ import * as systems from '../lib/systems.ts';
import * as utils from '../lib/utils.ts';
export async function init() {
const cs = dbContracts.getContracts();
const cs = dbContracts.getContracts().filter(c => !c.fulfilled);
cs.forEach(contract => run(contract));
}
@ -37,34 +37,34 @@ async function runProcurement(contract: Contract, ships: Array<Ship>) {
const asteroids = await systems.type(ships[0].nav.systemSymbol, 'ENGINEERED_ASTEROID');
const asteroidSymbol = asteroids[0].symbol;
ships.forEach(async function(ship) {
while (!contract.fulfilled) {
ship = dbShips.getShip(ship.symbol) as Ship;
let goodCargo = ship.cargo.inventory.filter(i => i.symbol === wantedCargo)[0]
// If we are in transit, we wait until we arrive
const delay = new Date(ship.nav.route.arrival).getTime() - new Date().getTime();
if (delay > 0) await api.sleep(delay);
// Then it depends on where we are
switch (ship.nav.waypointSymbol) {
case asteroidSymbol:
await mining.mineUntilFullOf(wantedCargo, ship, asteroidSymbol);
await libShips.navigate(ship, deliveryPoint);
break;
case deliveryPoint:
if (goodCargo !== undefined) { // we could be here if a client restart happens right after selling before we navigate away
console.log(`delivering ${goodCargo.units} of ${wantedCargo}`);
contract = await contracts.deliver(contract, ship);
if (contract.fulfilled) break;
}
await libShips.navigate(ship, asteroidSymbol);
break;
default:
if (libShips.isFull(ship)) {
await selling.sell(ship, wantedCargo);
} else {
while (true) {
while (!contract.fulfilled) {
ship = dbShips.getShip(ship.symbol);
let goodCargo = ship.cargo.inventory.filter(i => i.symbol === wantedCargo)[0]
// If we are in transit, we wait until we arrive
const delay = new Date(ship.nav.route.arrival).getTime() - new Date().getTime();
if (delay > 0) await api.sleep(delay);
// Then it depends on where we are
switch (ship.nav.waypointSymbol) {
case asteroidSymbol:
await mining.mineUntilFullFor(contract, ship, asteroidSymbol);
await libShips.navigate(ship, deliveryPoint);
break;
case deliveryPoint:
if (goodCargo !== undefined) { // we could be here if a client restart happens right after selling before we navigate away
contract = await contracts.deliver(contract, ship);
if (contract.fulfilled) break;
}
await libShips.navigate(ship, asteroidSymbol);
}
break;
default:
if (await libShips.isFull(ship)) {
await selling.sell(ship, wantedCargo);
}
await libShips.navigate(ship, asteroidSymbol);
}
}
contract = await libShips.negotiate(ship); // TODO that's not correct, the procurement type can change
}
// TODO repurpose the ship
});
}

9
nodejs/automation/init.ts
View file

@ -29,8 +29,11 @@ export async function init(): Promise<void> {
if (json.error !== undefined) {
switch(json.error?.code) {
case 4111: // 4111 means the agent symbol has already been claimed so no server reset happened
await libContracts.contracts();
await libShips.ships();
// TODO await agents.agents();
const contracts = await libContracts.getContracts();
const ongoing = contracts.filter(c => !c.fulfilled);
const ships = await libShips.getShips();
if (ongoing.length === 0) libShips.negotiate(ships[0]);
return;
default:
throw json;
@ -42,5 +45,5 @@ export async function init(): Promise<void> {
dbContracts.setContract(json.data.contract);
dbShips.setShip(json.data.ship);
// Temporary fix to fetch the data on the startup probe
await libShips.ships();
await libShips.getShips();
}

17
nodejs/automation/mining.ts
View file

@ -1,21 +1,26 @@
import * as selling from './selling.js';
import * as dbContracts from '../database/contracts.js';
import * as dbShips from '../database/ships.js';
import * as api from '../lib/api.js';
import * as libShips from '../lib/ships.js';
import * as utils from '../lib/utils.js';
import { Contract } from '../model/contract.ts';
import { Ship } from '../model/ship.ts';
export async function mineUntilFullOf(good: string, ship: Ship, asteroidSymbol: string): Promise<void> {
export async function mineUntilFullFor(contract: Contract, ship: Ship, asteroidSymbol: string): Promise<void> {
// TODO find a good asteroid
while(true) {
await mineUntilFull(ship);
ship = dbShips.getShip(ship.symbol) as Ship;
const cargo = utils.categorizeCargo(ship.cargo, good);
contract = dbContracts.getContract(contract.id);
const deliver = contract.terms.deliver[0];
ship = dbShips.getShip(ship.symbol);
const cargo = utils.categorizeCargo(ship.cargo, deliver.tradeSymbol);
const wantedUnits = Object.values(cargo.wanted).reduce((acc, e) => acc += e, 0);
// > 90% full of the valuable goods ?
if (wantedUnits >= ship.cargo.capacity * 0.9) return ship;
// > 90% full of the valuable goods ? Or just have enough for the contract?
if (wantedUnits >= ship.cargo.capacity * 0.9
|| cargo.wanted[deliver.tradeSymbol] >= deliver.unitsRequired - deliver.unitsFulfilled) return;
// we are full but need to sell junk
await selling.sell(ship, good);
await selling.sell(ship, deliver.tradeSymbol);
await libShips.navigate(ship, asteroidSymbol);
}
}