Implement a bit more autonomy for the ships

1 files changed, 12 insertions, 13 deletions

diff --git a/automation/contracting.js b/automation/contracting.js
index 4eff9d5..c76caff 100644
--- a/automation/contracting.js
+++ b/automation/contracting.js
@@ -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?`;