fix: end mining

mindrunner · Jul 14, 2024 · 6c86241 · 6c86241
1 parent 007890c
commit 6c86241
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 64 deletions.
diff --git a/src/main/basedbot/basedbot.ts b/src/main/basedbot/basedbot.ts
@@ -169,6 +169,14 @@ export const start = async (): Promise<void> => {
                       'Tortoise Fleet',
                       createMiningStrategy(mineTitaniumOre(map), player),
                   ],
+                  [
+                      'Cotton Rat Fleet',
+                      createMiningStrategy(mineIronOre(map), player),
+                  ],
+                  [
+                      'Greenland Shark Fleet',
+                      createMiningStrategy(mineHydrogen(map), player),
+                  ],
               ])
             : new Map([
                   [

diff --git a/src/main/basedbot/fsm/info.ts b/src/main/basedbot/fsm/info.ts
@@ -22,7 +22,7 @@ const transition = async (fleetInfo: FleetInfo): Promise<void> => {
         }
         case 'StarbaseLoadingBay':
             logger.info(
-                `Fleet: ${fleetInfo.fleetName} is in the loading bay at ${getName(fleetInfo.fleetState.data.starbase)}`,
+                `${fleetInfo.fleetName} is in the loading bay at ${getName(fleetInfo.fleetState.data.starbase)}`,
             )
             break
         case 'MoveWarp': {
@@ -31,7 +31,7 @@ const transition = async (fleetInfo: FleetInfo): Promise<void> => {
 
             if (warpFinish.isBefore(now())) {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} has arrived at ${fleetInfo.fleetState.data.toSector}`,
+                    `${fleetInfo.fleetName} has arrived at ${fleetInfo.fleetState.data.toSector}`,
                 )
             } else {
                 logger.info(
@@ -46,7 +46,7 @@ const transition = async (fleetInfo: FleetInfo): Promise<void> => {
 
             if (arrivalTime.isBefore(now())) {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} has arrived at ${fleetInfo.fleetState.data.toSector}`,
+                    `${fleetInfo.fleetName} has arrived at ${fleetInfo.fleetState.data.toSector}`,
                 )
             } else {
                 logger.info(
@@ -61,20 +61,20 @@ const transition = async (fleetInfo: FleetInfo): Promise<void> => {
 
             if (end.isBefore(now())) {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} has finished mining ${getName(mineItem)} for ${amountMined}`,
+                    `${fleetInfo.fleetName} has finished mining ${getName(mineItem)} for ${amountMined}`,
                 )
             } else {
                 const log = endReason === 'FULL' ? logger.info : logger.warn
 
                 log(
-                    `Fleet: ${fleetInfo.fleetName} mining ${getName(mineItem)} for ${amountMined}. Time remaining: ${dayjs.duration(end.diff(now())).humanize(false)} until ${endReason}`,
+                    `${fleetInfo.fleetName} mining ${getName(mineItem)} for ${amountMined}. Time remaining: ${dayjs.duration(end.diff(now())).humanize(false)} until ${endReason}`,
                 )
             }
             break
         }
         default:
             logger.info(
-                `Fleet: ${fleetInfo.fleetName} is ${fleetInfo.fleetState.type}`,
+                `${fleetInfo.fleetName} is ${fleetInfo.fleetState.type}`,
             )
     }
 

diff --git a/src/main/basedbot/fsm/mine.ts b/src/main/basedbot/fsm/mine.ts
@@ -62,63 +62,61 @@ const transition = async (
 
             if (!currentStarbase && cargoLevelFuel < 1) {
                 logger.warn(
-                    `Fleet: ${fleetName} is out of fuel and not at a starbase, need self destruction`,
+                    `${fleetName} is out of fuel and not at a starbase, need self destruction`,
                 )
 
                 return Promise.resolve()
             }
             if (isAtHomeBase) {
-                logger.info(`Fleet: ${fleetName} is at home base`)
+                logger.info(`${fleetName} is at home base`)
                 if (hasCargo) {
                     logger.info(
-                        `Fleet: ${fleetName} has ${cargoLoad} ${resourceName}, docking to unload`,
+                        `${fleetName} has ${cargoLoad} ${resourceName}, docking to unload`,
                     )
 
                     return dock(fleetInfo, location, player)
                 }
                 if (!hasEnoughFood || !hasEnoughFuel || !hasEnoughAmmo) {
                     logger.info(
-                        `Fleet: ${fleetName} doesn't have enough resources, docking to resupply`,
+                        `${fleetName} doesn't have enough resources, docking to resupply`,
                     )
 
                     return dock(fleetInfo, location, player)
                 }
                 if (isSameBase) {
-                    logger.info(
-                        `Fleet: ${fleetName} is at home/target base, mining`,
-                    )
+                    logger.info(`${fleetName} is at home/target base, mining`)
 
                     return mine(fleetInfo, player, resource)
                 }
                 logger.info(
-                    `Fleet: ${fleetName} is at home base, moving to target base`,
+                    `${fleetName} is at home base, moving to target base`,
                 )
 
                 return move(fleetInfo, targetBase, player, warpMode)
             }
 
             if (isAtTargetBase && !isSameBase) {
-                logger.info(`Fleet: ${fleetName} is at target base`)
+                logger.info(`${fleetName} is at target base`)
                 if (hasCargo) {
                     logger.info(
-                        `Fleet: ${fleetName} has ${cargoLoad} ${resourceName}, returning home`,
+                        `${fleetName} has ${cargoLoad} ${resourceName}, returning home`,
                     )
 
                     return move(fleetInfo, homeBase, player, warpMode)
                 }
                 if (hasEnoughFood) {
-                    logger.info(`Fleet: ${fleetName} has enough food, mining`)
+                    logger.info(`${fleetName} has enough food, mining`)
 
                     return mine(fleetInfo, player, resource)
                 }
                 logger.info(
-                    `Fleet: ${fleetName} doesn't have enough food, returning home`,
+                    `${fleetName} doesn't have enough food, returning home`,
                 )
 
                 return move(fleetInfo, homeBase, player, warpMode)
             }
 
-            logger.info(`Fleet: ${fleetName} is at ${location}`)
+            logger.info(`${fleetName} is at ${location}`)
 
             return move(
                 fleetInfo,
@@ -129,12 +127,12 @@ const transition = async (
         }
         case 'StarbaseLoadingBay': {
             logger.info(
-                `Fleet: ${fleetInfo.fleetName} is in the loading bay at ${getName(fleetInfo.fleetState.data.starbase)}`,
+                `${fleetInfo.fleetName} is in the loading bay at ${getName(fleetInfo.fleetState.data.starbase)}`,
             )
 
             if (hasCargo) {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} has ${cargoLoad} cargo, unloading`,
+                    `${fleetInfo.fleetName} has ${cargoLoad} cargo, unloading`,
                 )
 
                 return unloadAllCargo(
@@ -146,7 +144,7 @@ const transition = async (
             }
 
             if (!hasEnoughFuel) {
-                logger.info(`Fleet: ${fleetInfo.fleetName} is refueling`)
+                logger.info(`${fleetInfo.fleetName} is refueling`)
 
                 return loadCargo(
                     fleetInfo,
@@ -158,7 +156,7 @@ const transition = async (
             }
 
             if (!hasEnoughAmmo) {
-                logger.info(`Fleet: ${fleetInfo.fleetName} is rearming`)
+                logger.info(`${fleetInfo.fleetName} is rearming`)
 
                 return loadCargo(
                     fleetInfo,
@@ -171,7 +169,7 @@ const transition = async (
 
             if (!hasEnoughFood) {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} is loading ${desiredFood - cargoLevelFood} food`,
+                    `${fleetInfo.fleetName} is loading ${desiredFood - cargoLevelFood} food`,
                 )
 
                 return loadCargo(
@@ -191,7 +189,7 @@ const transition = async (
 
             if (warpFinish.isBefore(now())) {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} has arrived at ${fleetInfo.fleetState.data.toSector}`,
+                    `${fleetInfo.fleetName} has arrived at ${fleetInfo.fleetState.data.toSector}`,
                 )
             } else {
                 logger.info(
@@ -206,7 +204,7 @@ const transition = async (
 
             if (arrivalTime.isBefore(now())) {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} has arrived at ${fleetInfo.fleetState.data.toSector}`,
+                    `${fleetInfo.fleetName} has arrived at ${fleetInfo.fleetState.data.toSector}`,
                 )
             } else {
                 logger.info(
@@ -221,7 +219,7 @@ const transition = async (
 
             if (end.isBefore(now())) {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} has finished mining ${getName(mineItem)} for ${amountMined}`,
+                    `${fleetInfo.fleetName} has finished mining ${getName(mineItem)} for ${amountMined}`,
                 )
 
                 return endMine(fleetInfo, player, config.resource)
@@ -230,7 +228,7 @@ const transition = async (
             const log = endReason === 'FULL' ? logger.info : logger.warn
 
             log(
-                `Fleet: ${fleetInfo.fleetName} mining ${getName(mineItem)} for ${amountMined}. Time remaining: ${dayjs.duration(end.diff(now())).humanize(false)} until ${endReason}`,
+                `${fleetInfo.fleetName} mining ${getName(mineItem)} for ${amountMined}. Time remaining: ${dayjs.duration(end.diff(now())).humanize(false)} until ${endReason}`,
             )
 
             break
@@ -239,17 +237,17 @@ const transition = async (
             const { destructionTime, ETA } = fleetInfo.fleetState.data
 
             if (ETA.isBefore(now())) {
-                logger.info(`Fleet: ${fleetInfo.fleetName} has respawned`)
+                logger.info(`${fleetInfo.fleetName} has respawned`)
             } else {
                 logger.info(
-                    `Fleet: ${fleetInfo.fleetName} respawning at ${fleetInfo.fleetState.data.sector}. ETA: ${dayjs.duration(ETA.diff(now())).humanize(false)}. Destruction time: ${destructionTime}`,
+                    `${fleetInfo.fleetName} respawning at ${fleetInfo.fleetState.data.sector}. ETA: ${dayjs.duration(ETA.diff(now())).humanize(false)}. Destruction time: ${destructionTime}`,
                 )
             }
             break
         }
         default:
             logger.info(
-                `Fleet: ${fleetInfo.fleetName} is ${fleetInfo.fleetState.type}`,
+                `${fleetInfo.fleetName} is ${fleetInfo.fleetState.type}`,
             )
 
             return Promise.resolve()

diff --git a/src/main/basedbot/lib/sage/act/end-mine.ts b/src/main/basedbot/lib/sage/act/end-mine.ts
@@ -4,7 +4,6 @@ import {
 } from '@staratlas/data-source'
 
 import { logger } from '../../../../../logger'
-import { sleep } from '../../../../../service/sleep'
 import { sendAndConfirmInstructions } from '../../../../../service/sol/send-and-confirm-tx'
 import { programs } from '../../programs'
 import { miningHandlerIx } from '../ix/fleet-state-handler'
@@ -26,40 +25,41 @@ export const endMine = async (
         return
     }
 
-    const ix = []
+    const ix1 = []
+    const ix2 = []
 
     const foodTokenFromResult = createAssociatedTokenAccountIdempotent(
         player.game.data.mints.food,
         fleetInfo.fleet.data.cargoHold,
         true,
     )
 
-    ix.push(foodTokenFromResult.instructions)
+    ix1.push(foodTokenFromResult.instructions)
 
     const ammoTokenFromResult = createAssociatedTokenAccountIdempotent(
         player.game.data.mints.ammo,
         fleetInfo.fleet.data.ammoBank,
         true,
     )
 
-    ix.push(ammoTokenFromResult.instructions)
+    ix1.push(ammoTokenFromResult.instructions)
 
     const resourceTokenFromResult = createAssociatedTokenAccountIdempotent(
         mineable.mineItem.data.mint,
         mineable.resource.data.mineItem,
         true,
     )
 
-    ix.push(resourceTokenFromResult.instructions)
+    ix1.push(resourceTokenFromResult.instructions)
     const resourceTokenToResult = createAssociatedTokenAccountIdempotent(
         mineable.mineItem.data.mint,
         fleetInfo.fleet.data.cargoHold,
         true,
     )
 
-    ix.push(resourceTokenToResult.instructions)
+    ix1.push(resourceTokenToResult.instructions)
 
-    ix.push(
+    ix1.push(
         miningHandlerIx(
             fleetInfo,
             player,
@@ -71,17 +71,8 @@ export const endMine = async (
             programs,
         ),
     )
+    ix2.push(stopMiningIx(fleetInfo, player, mineable, programs))
 
-    const instructions = await ixReturnsToIxs(ix, player.signer)
-
-    await sendAndConfirmInstructions(instructions)
-
-    await sleep(2000)
-
-    await sendAndConfirmInstructions(
-        await ixReturnsToIxs(
-            stopMiningIx(fleetInfo, player, mineable, programs),
-            player.signer,
-        ),
-    )
+    await sendAndConfirmInstructions(await ixReturnsToIxs(ix1, player.signer))
+    await sendAndConfirmInstructions(await ixReturnsToIxs(ix2, player.signer))
 }
diff --git a/src/main/basedbot/lib/sage/act/mine.ts b/src/main/basedbot/lib/sage/act/mine.ts
@@ -28,14 +28,14 @@ export const mine = async (
 
     if (fleet.state.StarbaseLoadingBay) {
         logger.info(
-            `Fleet: ${fleetInfo.fleetName} is in the loading bay at ${fleet.state.StarbaseLoadingBay.starbase}, undocking...`,
+            `${fleetInfo.fleetName} is in the loading bay at ${fleet.state.StarbaseLoadingBay.starbase}, undocking...`,
         )
 
         await undock(fleet, fleetInfo.location, player)
     }
 
     if (fleet.state.MoveSubwarp || fleet.state.MoveWarp) {
-        logger.info(`Fleet: ${fleetInfo.fleetName} is moving, cannot mine`)
+        logger.info(`${fleetInfo.fleetName} is moving, cannot mine`)
 
         return
     }

diff --git a/src/main/basedbot/lib/sage/act/move.ts b/src/main/basedbot/lib/sage/act/move.ts
@@ -30,16 +30,14 @@ export const move = async (
 
     if (fleet.state.StarbaseLoadingBay) {
         logger.info(
-            `Fleet: ${fleetInfo.fleetName} is in the loading bay at ${fleet.state.StarbaseLoadingBay.starbase}, undocking...`,
+            `${fleetInfo.fleetName} is in the loading bay at ${fleet.state.StarbaseLoadingBay.starbase}, undocking...`,
         )
 
         await undock(fleet, fleetInfo.location, player)
     }
 
     if (fleet.state.MineAsteroid) {
-        logger.info(
-            `Fleet: ${fleetInfo.fleetName} is mining an asteroid, cannot move`,
-        )
+        logger.info(`${fleetInfo.fleetName} is mining an asteroid, cannot move`)
 
         return
     }

diff --git a/src/main/basedbot/lib/sage/state/settle-fleet.ts b/src/main/basedbot/lib/sage/state/settle-fleet.ts
@@ -58,7 +58,7 @@ export const settleFleet = async (
         }
         default:
             logger.info(
-                `Fleet: ${fleetInfo.fleetName} is ${fleetInfo.fleetState.type}`,
+                `${fleetInfo.fleetName} is ${fleetInfo.fleetState.type}`,
             )
     }
 }
diff --git a/src/main/basedbot/lib/sage/state/show-fleet-cargo-info.ts b/src/main/basedbot/lib/sage/state/show-fleet-cargo-info.ts
@@ -5,7 +5,7 @@ import { FleetInfo } from './user-fleets'
 export const showFleetCargoInfo = (fleetInfo: FleetInfo): void => {
     const { ammo, cargo, food, fuel, toolkit } = fleetInfo.cargoLevels
 
-    logger.info(`Fleet: ${fleetInfo.fleetName} cargo levels:`)
+    logger.info(`${fleetInfo.fleetName} cargo levels:`)
     logger.info(`Ammo: ${ammo}`)
     logger.info(`Food: ${food}`)
     logger.info(`Fuel: ${fuel}`)