shoving additions

The-International-Screeps-Bot · May 28, 2024 · 5ce35d3 · 5ce35d3
1 parent 84b5180
commit 5ce35d3
Show file tree

Hide file tree

Showing 13 changed files with 266 additions and 242 deletions.
diff --git a/src/other/profilerRegister.ts b/src/other/profilerRegister.ts
@@ -26,7 +26,6 @@ import { CollectiveManager } from 'international/collective'
 import { MarketManager } from 'international/market/marketOrders'
 import { GarbageCollector } from 'international/garbageCollector'
 import { EndTickManager } from 'international/endTick'
-import { EndTickCreepManager } from 'room/creeps/endTickCreepManager'
 import { PowerCreepOrganizer } from 'international/powerCreepOrganizer'
 import { LinkManager } from 'room/commune/links'
 import { CombatRequestManager } from 'room/commune/combatRequest'
@@ -162,7 +161,6 @@ export function profilerRegister() {
   profiler.registerClass(ConstructionManager, 'ConstructionManager')
   profiler.registerClass(RemotesManager, 'RemotesManager')
   profiler.registerClass(HaulRequestManager, 'HaulRequestManager')
-  profiler.registerClass(EndTickCreepManager, 'EndTickCreepManager')
   profiler.registerClass(LinkManager, 'LinkManager')
   profiler.registerClass(DefenceProcs, 'DefenceProcs')
   profiler.registerClass(DefenceUtils, 'DefenceUtils')

diff --git a/src/room/commune/commune.ts b/src/room/commune/commune.ts
@@ -1,9 +1,10 @@
 import {
   findObjectWithID,
   getRange,
-  packAsNum, findLowestScore,
+  packAsNum,
+  findLowestScore,
   roundTo,
-  forCoordsAroundRange
+  forCoordsAroundRange,
 } from 'utils/utils'
 import './workRequest'
 import './combatRequest'

diff --git a/src/room/commune/communeOps.ts b/src/room/commune/communeOps.ts
@@ -27,6 +27,7 @@ import { HaulerNeedOps } from './haulerNeedOps'
 import { CommuneManager } from './commune'
 import { RoomOps } from 'room/roomOps'
 import { WorkRequestOps } from './workRequest'
+import { MyCreepServices } from 'room/creeps/myCreepServices'
 
 /**
  * Minor processes for communes
@@ -214,7 +215,8 @@ export class CommuneOps {
     SpawningStructureOps.tryRunSpawning(room)
 
     SpawningStructureOps.tryRegisterSpawningMovement(room)
-    room.roomManager.endTickCreepManager.run()
+    MyCreepServices.moveCreeps(room)
+    MyCreepServices.chant(room)
     room.roomManager.roomVisualsManager.run()
 
     this.test(room)

diff --git a/src/room/commune/spawning/spawningStructureOps.ts b/src/room/commune/spawning/spawningStructureOps.ts
@@ -408,13 +408,13 @@ export class SpawningStructureOps {
         })
       }
 
-      if (CreepMoveProcs.shove(creepAtPos, new Set([packedCoord]))) {
+      /* if (CreepMoveProcs.shove(creepAtPos, new Set([packedCoord]))) {
         creep.room.errorVisual(unpackCoord(creep.moveRequest))
 
         creep.moved = creep.moveRequest
         delete room.moveRequests[creep.moved]
         delete creep.moveRequest
-      }
+      } */
 
       continue
     }

diff --git a/src/room/construction/construction.ts b/src/room/construction/construction.ts
@@ -74,7 +74,9 @@ export class ConstructionManager {
       if (!creepName) continue
 
       const creep = Game.creeps[creepName]
-      CreepMoveProcs.shove(creep)
+
+      // Need an alternate solution
+      /* CreepMoveProcs.shove(creep) */
     }
   }
   private shouldPlace() {