sorting by actionCoord if possible

The-International-Screeps-Bot · May 29, 2024 · 901be99 · 901be99
1 parent 52f0c6e
commit 901be99
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/room/creeps/creepMoveProcs.ts b/src/room/creeps/creepMoveProcs.ts
@@ -14,7 +14,7 @@ import {
 import { CustomPathFinderArgs, PathGoal, CustomPathFinder } from 'international/customPathFinder'
 import { packCoord, packPos, packPosList, unpackCoord, unpackPos, unpackPosAt } from 'other/codec'
 import {
-    Utils,
+  Utils,
   areCoordsEqual,
   arePositionsEqual,
   findAdjacentCoordsToCoord,
@@ -423,7 +423,6 @@ export class CreepMoveProcs {
 
       const creepInWay = Game.creeps[creepInWayName] || Game.powerCreeps[creepInWayName]
       if (creepInWay) {
-
         if (creepInWay.moveRequest === packedCoord) {
           potentialCost += 1
         }
@@ -509,7 +508,14 @@ export class CreepMoveProcs {
 
     // Consider sorting by range to action coord, where closer is more preferred
     moveOptions.push(...findAdjacentCoordsToCoord(creep.pos))
-    Utils.shuffleArray(moveOptions)
+
+    if (creep.actionCoord) {
+      moveOptions.sort((a, b) => {
+        return getRange(a, creep.actionCoord) - getRange(b, creep.actionCoord)
+      })
+    } else {
+      Utils.shuffleArray(moveOptions)
+    }
 
     creep.moveOptions = moveOptions
     return moveOptions