SKoutpost directive and overload: improvements and fixes

package.json

@@ -31,14 +31,15 @@
     "rollup-plugin-node-resolve": "3.3.0",
     "rollup-plugin-progress": "^0.4.0",
     "rollup-plugin-screeps": "0.1.2",
-    "rollup-plugin-typescript2": "0.16.1",
+    "rollup-plugin-typescript2": "^0.21.1",
     "tslint": "^5.16.0",
     "typedoc": "^0.14.2",
     "typescript": "2.9.2"
   },
   "dependencies": {
     "@tensorflow/tfjs": "^1.1.2",
     "columnify": "1.5.4",
+    "lint": "^0.7.0",
     "onnxjs": "^0.1.6",
     "source-map": "0.7.3"
   }

src/directives/colony/outpostSK.ts

@@ -1,8 +1,11 @@
 import {SourceReaperOverlord} from '../../overlords/mining/sourceKeeperReeper';
 import {profile} from '../../profiler/decorator';
 import {Directive} from '../Directive';
+import {Cartographer, ROOMTYPE_SOURCEKEEPER} from '../../utilities/Cartographer';
 
-
+interface DirectiveSKOutpostMemory extends FlagMemory {
+	isCenterRoom?: boolean;
+}
 /**
  * Remote mining directive for source keeper rooms
  */
@@ -12,21 +15,74 @@ export class DirectiveSKOutpost extends Directive {
 	static directiveName = 'outpostSK';
 	static color = COLOR_PURPLE;
 	static secondaryColor = COLOR_YELLOW;
+	static containerRepairTheshold = 0.5;
+
+	memory: DirectiveSKOutpostMemory;
 
 	constructor(flag: Flag) {
 		super(flag, colony => colony.level >= 7);
 	}
+
+	isCenterRoom(): boolean {
+		const coords = Cartographer.getRoomCoordinates(this.pos.roomName);
+		if(coords.x % 10 != 0 && coords.x % 5 == 0 && coords.y % 10 != 0 && coords.y % 5== 0){
+			return true;
+		}
+		return false;
+	}
 
 	spawnMoarOverlords() {
-		this.overlords.sourceReaper = new SourceReaperOverlord(this);
+		if(this.memory.isCenterRoom == undefined){
+			this.memory.isCenterRoom = this.isCenterRoom();
+		}
+		//skip sourceReapoers for safe SKrooms
+		if(!this.memory.isCenterRoom){
+			this.overlords.sourceReaper = new SourceReaperOverlord(this);
+		}
+	}
+
+	getContainerConstructionSites(): ConstructionSite | undefined {
+		if (!this.pos.isVisible) {
+			return;
+		}
+		const ContainerConstructionSites = _.filter(this.room!.constructionSites, s => s.structureType == STRUCTURE_CONTAINER);
+
+		if(ContainerConstructionSites.length > 0){
+			return ContainerConstructionSites[0];	
+		}			
+		return;
+	}
+
+	getContainersToRepair(): Structure | undefined {
+		if (!this.pos.isVisible) {
+			return;
+		}
+		const containersTorepair = _.filter(this.room!.structures, s => s.structureType == STRUCTURE_CONTAINER && s.hits < DirectiveSKOutpost.containerRepairTheshold * s.hitsMax);
+
+		if(containersTorepair.length > 0){
+			return containersTorepair[0];	
+		}			
+		return;
 	}
 
 	init(): void {
+		// Add this structure/CS to worker overlord's build/repair list
+		if(Game.time % 150 == 0){
+			const containerNeedRepair = this.getContainersToRepair();
+			if (containerNeedRepair && !this.colony.overlords.work.repairStructures.includes(containerNeedRepair)) {
+				this.colony.overlords.work.repairStructures.push(containerNeedRepair);
+				return;
+			}
 
+			const containerToBuild = this.getContainerConstructionSites();
+			if (containerToBuild && !this.colony.overlords.work.constructionSites.includes(containerToBuild)) {
+				this.colony.overlords.work.constructionSites.push(containerToBuild);
+				return;
+			}
+		}
 	}
 
 	run(): void {
 
 	}
-}
-
+}

src/directives/resource/extract.ts

@@ -26,7 +26,7 @@ export class DirectiveExtract extends Directive {
 	}
 
 	spawnMoarOverlords() {
-		let priority: number;
+		let priority: number; 
 		if (this.room && this.room.my) {
 			if (this.colony.level == 8) {
 				priority = OverlordPriority.ownedRoom.mineralRCL8;
@@ -36,7 +36,10 @@ export class DirectiveExtract extends Directive {
 		} else {
 			priority = OverlordPriority.remoteSKRoom.mineral;
 		}
-		this.overlords.extract = new ExtractorOverlord(this, priority);
+		//Fix: Only spawn drones if there is a terminal or storage
+		if (!!this.colony.terminal || !!this.colony.storage){
+			this.overlords.extract = new ExtractorOverlord(this, priority);
+		}
 	}
 
 	init() {

src/overlords/mining/extractor.ts

@@ -105,6 +105,16 @@ export class ExtractorOverlord extends Overlord {
 	}
 
 	private handleDrone(drone: Zerg): void {
+		//fix: if there is no container, then transfer the minerals yourself!
+		if(!this.container && _.sum(drone.carry) == drone.carryCapacity ){
+            const dropoffPoints: (StructureTerminal | StructureStorage)[] = _.compact([this.colony.terminal!]);
+			const bestDropoffPoint = drone.pos.findClosestByMultiRoomRange(dropoffPoints);
+			if (bestDropoffPoint) {
+				drone.task = Tasks.transferAll(bestDropoffPoint);
+				return;
+			}
+        }
+
 		// Ensure you are in the assigned room
 		if (drone.room == this.room && !drone.pos.isEdge) {
 			if (_.sum(drone.carry) == 0) {

src/overlords/mining/sourceKeeperReeper.ts

@@ -95,7 +95,7 @@ export class SourceReaperOverlord extends CombatOverlord {
 				reaper.healSelfIfPossible();
 			}
 			// Kite around ranged invaders until a defender arrives
-			if (this.room.invaders.length > 2 && _.filter(this.defenders, def => def.room == this.room).length == 0) {
+			if (this.pos.findInRange(this.room.invaders,10).length > 2 && _.filter(this.defenders, def => def.room == this.room).length == 0) {
 				reaper.kite(_.filter(this.room.hostiles, hostile => hostile.getActiveBodyparts(RANGED_ATTACK) > 0));
 				reaper.healSelfIfPossible();
 			}