From 48bc38d44c91cdeaeb1022b20879b7b99007c5ca Mon Sep 17 00:00:00 2001
From: Coolfeather2 <nathan.ogden+github@birdtronics.net>
Date: Tue, 9 Apr 2019 09:54:02 +0800
Subject: [PATCH 1/6] implement assimilation checks

---
 src/Overseer.ts                   | 7 ++++++-
 src/directives/colony/colonize.ts | 7 +++++++
 src/directives/colony/incubate.ts | 8 ++++++++
 src/directives/colony/outpost.ts  | 8 ++++++++
 src/strategy/Strategist.ts        | 9 ++++++++-
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/Overseer.ts b/src/Overseer.ts
index fd688b4aa..cb88010b0 100644
--- a/src/Overseer.ts
+++ b/src/Overseer.ts
@@ -23,6 +23,7 @@ import {Notifier} from './directives/Notifier';
 import {DirectiveColonize} from './directives/colony/colonize';
 import {CombatPlanner} from './strategy/CombatPlanner';
 import {DirectiveClearRoom} from './directives/colony/clearRoom';
+import { isString } from 'lodash';
 
 
 // export const DIRECTIVE_CHECK_FREQUENCY = 2;
@@ -272,7 +273,11 @@ export class Overseer implements IOverseer {
 				let sourcePositions = _.map(sourceCoords, src => derefCoords(src.c, roomName));
 				let sourceDistances = _.map(sourcePositions, pos => Pathing.distance(origin, pos));
 				if (_.any(sourceDistances, dist => dist == undefined
-												   || dist > Colony.settings.maxSourceDistance)) return false;
+					|| dist > Colony.settings.maxSourceDistance)) return false;
+				// Don't create outpost on-top of another Overmind user
+				if (isString(Game.rooms[roomName].owner) && Assimilator.isAssimilated(Game.rooms[roomName].owner!)) {
+					return false;
+				}
 				return _.sum(sourceDistances) / sourceDistances.length;
 			});
 
diff --git a/src/directives/colony/colonize.ts b/src/directives/colony/colonize.ts
index 1f0d4ec0b..16856aabd 100644
--- a/src/directives/colony/colonize.ts
+++ b/src/directives/colony/colonize.ts
@@ -8,6 +8,7 @@ import {log} from '../../console/log';
 import {Roles} from '../../creepSetups/setups';
 import {Cartographer, ROOMTYPE_CONTROLLER} from '../../utilities/Cartographer';
 import {printRoomName} from '../../utilities/utils';
+import { isString } from 'lodash';
 
 
 /**
@@ -65,6 +66,12 @@ export class DirectiveColonize extends Directive {
 			// Remove the directive
 			this.remove();
 		}
+		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
+		if (isString(Game.rooms[this.pos.roomName].owner) && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
+			//this.remove();
+		}
+
 		if (Game.time % 10 == 2 && this.room && !!this.room.owner && this.room.owner != MY_USERNAME) {
 			log.notify(`Removing Colonize directive in ${this.pos.roomName}: room already owned by another player.`);
 			this.remove();
diff --git a/src/directives/colony/incubate.ts b/src/directives/colony/incubate.ts
index d6d136bd5..9f2c86d05 100644
--- a/src/directives/colony/incubate.ts
+++ b/src/directives/colony/incubate.ts
@@ -3,6 +3,9 @@ import {Directive} from '../Directive';
 import {ClaimingOverlord} from '../../overlords/colonization/claimer';
 import {Colony} from '../../Colony';
 import {SpawnGroup} from '../../logistics/SpawnGroup';
+import { isString } from 'lodash';
+import { MY_USERNAME } from '../../~settings';
+import { log } from '../../console/log';
 
 
 /**
@@ -43,5 +46,10 @@ export class DirectiveIncubate extends Directive {
 				this.remove();
 			}
 		}
+		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
+		if (isString(Game.rooms[this.pos.roomName].owner) && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
+			//this.remove();
+		}
 	}
 }
diff --git a/src/directives/colony/outpost.ts b/src/directives/colony/outpost.ts
index 4c4dc158b..1d3f9ba28 100644
--- a/src/directives/colony/outpost.ts
+++ b/src/directives/colony/outpost.ts
@@ -5,6 +5,8 @@ import {StationaryScoutOverlord} from '../../overlords/scouting/stationary';
 import {Cartographer, ROOMTYPE_CONTROLLER} from '../../utilities/Cartographer';
 import {RoomIntel} from '../../intel/RoomIntel';
 import {log} from '../../console/log';
+import { isString } from 'lodash'
+import { MY_USERNAME } from '~settings';
 
 /**
  * Claims a new room and incubates it from the nearest (or specified) colony
@@ -39,6 +41,12 @@ export class DirectiveOutpost extends Directive {
 			log.warning(`Removing ${this.print} since room is owned!`);
 			this.remove();
 		}
+		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
+		if (isString(Game.rooms[this.pos.roomName].owner) && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
+			//this.remove();
+		}
+
 		if (Game.time % 10 == 3 && this.room && this.room.controller
 			&& !this.pos.isEqualTo(this.room.controller.pos) && !this.memory.setPosition) {
 			this.setPosition(this.room.controller.pos);
diff --git a/src/strategy/Strategist.ts b/src/strategy/Strategist.ts
index 630b75da9..90d4367af 100644
--- a/src/strategy/Strategist.ts
+++ b/src/strategy/Strategist.ts
@@ -7,8 +7,9 @@ import {maxBy} from '../utilities/utils';
 import {log} from '../console/log';
 import {Pathing} from '../movement/Pathing';
 import {assimilationLocked} from '../assimilation/decorator';
-import {MAX_OWNED_ROOMS, SHARD3_MAX_OWNED_ROOMS} from '../~settings';
+import {MAX_OWNED_ROOMS, SHARD3_MAX_OWNED_ROOMS, MY_USERNAME} from '../~settings';
 import {profile} from '../profiler/decorator';
+import { isString } from 'lodash';
 
 
 const CHECK_EXPANSION_FREQUENCY = 1000;
@@ -114,6 +115,12 @@ export class Strategist implements IStrategist {
 				if (_.any(adjacentRooms, roomName => Memory.rooms[roomName][_RM.AVOID])) {
 					continue;
 				}
+
+				// Are there other Overmind users nearby?
+				if (_.any(adjacentRooms, roomName => isString(Game.rooms[roomName].owner) && Game.rooms[roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[roomName].owner!))) {
+					score -= TOO_CLOSE_PENALTY;
+				}
+
 				// Reward new minerals and catalyst rooms
 				let mineralType = Memory.rooms[roomName][_RM.MINERAL]
 								  ? Memory.rooms[roomName][_RM.MINERAL]![_RM_MNRL.MINERALTYPE]

From 7594932cd5df4482f58569e7ce40c3d199f3c52f Mon Sep 17 00:00:00 2001
From: Coolfeather2 <nathan.ogden+github@birdtronics.net>
Date: Tue, 9 Apr 2019 10:11:05 +0800
Subject: [PATCH 2/6] =?UTF-8?q?Fix=20depreciated=20function=20=F0=9F=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Overseer.ts                   | 54 +++++++++++++++----------------
 src/directives/colony/colonize.ts | 23 +++++++------
 src/directives/colony/incubate.ts | 15 ++++-----
 src/directives/colony/outpost.ts  | 17 +++++-----
 src/strategy/Strategist.ts        | 26 +++++++--------
 5 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/src/Overseer.ts b/src/Overseer.ts
index cb88010b0..b0d535f09 100644
--- a/src/Overseer.ts
+++ b/src/Overseer.ts
@@ -1,29 +1,28 @@
-import {DirectiveGuard} from './directives/defense/guard';
-import {DirectiveBootstrap} from './directives/situational/bootstrap';
-import {profile} from './profiler/decorator';
-import {Colony, ColonyStage} from './Colony';
-import {Overlord} from './overlords/Overlord';
-import {Directive} from './directives/Directive';
-import {log} from './console/log';
-import {Pathing} from './movement/Pathing';
-import {DirectiveInvasionDefense} from './directives/defense/invasionDefense';
-import {DirectiveNukeResponse} from './directives/situational/nukeResponse';
-import {DirectiveTerminalEvacuateState} from './directives/terminalState/terminalState_evacuate';
-import {bodyCost} from './creepSetups/CreepSetup';
-import {LogisticsNetwork} from './logistics/LogisticsNetwork';
-import {Cartographer, ROOMTYPE_CONTROLLER, ROOMTYPE_SOURCEKEEPER} from './utilities/Cartographer';
-import {derefCoords, hasJustSpawned, minBy, onPublicServer} from './utilities/utils';
-import {DirectiveOutpost} from './directives/colony/outpost';
-import {Autonomy, getAutonomyLevel, Mem} from './memory/Memory';
-import {RoomIntel} from './intel/RoomIntel';
-import {Roles} from './creepSetups/setups';
-import {MUON, MY_USERNAME, USE_TRY_CATCH} from './~settings';
-import {DirectiveOutpostDefense} from './directives/defense/outpostDefense';
-import {Notifier} from './directives/Notifier';
-import {DirectiveColonize} from './directives/colony/colonize';
-import {CombatPlanner} from './strategy/CombatPlanner';
-import {DirectiveClearRoom} from './directives/colony/clearRoom';
-import { isString } from 'lodash';
+import { Colony, ColonyStage } from './Colony';
+import { log } from './console/log';
+import { bodyCost } from './creepSetups/CreepSetup';
+import { Roles } from './creepSetups/setups';
+import { Directive } from './directives/Directive';
+import { Notifier } from './directives/Notifier';
+import { DirectiveClearRoom } from './directives/colony/clearRoom';
+import { DirectiveColonize } from './directives/colony/colonize';
+import { DirectiveOutpost } from './directives/colony/outpost';
+import { DirectiveGuard } from './directives/defense/guard';
+import { DirectiveInvasionDefense } from './directives/defense/invasionDefense';
+import { DirectiveOutpostDefense } from './directives/defense/outpostDefense';
+import { DirectiveBootstrap } from './directives/situational/bootstrap';
+import { DirectiveNukeResponse } from './directives/situational/nukeResponse';
+import { DirectiveTerminalEvacuateState } from './directives/terminalState/terminalState_evacuate';
+import { RoomIntel } from './intel/RoomIntel';
+import { LogisticsNetwork } from './logistics/LogisticsNetwork';
+import { Autonomy, Mem, getAutonomyLevel } from './memory/Memory';
+import { Pathing } from './movement/Pathing';
+import { Overlord } from './overlords/Overlord';
+import { profile } from './profiler/decorator';
+import { CombatPlanner } from './strategy/CombatPlanner';
+import { Cartographer, ROOMTYPE_CONTROLLER, ROOMTYPE_SOURCEKEEPER } from './utilities/Cartographer';
+import { derefCoords, hasJustSpawned, minBy, onPublicServer } from './utilities/utils';
+import { MUON, MY_USERNAME, USE_TRY_CATCH } from './~settings';
 
 
 // export const DIRECTIVE_CHECK_FREQUENCY = 2;
@@ -275,7 +274,8 @@ export class Overseer implements IOverseer {
 				if (_.any(sourceDistances, dist => dist == undefined
 					|| dist > Colony.settings.maxSourceDistance)) return false;
 				// Don't create outpost on-top of another Overmind user
-				if (isString(Game.rooms[roomName].owner) && Assimilator.isAssimilated(Game.rooms[roomName].owner!)) {
+				if (typeof Game.rooms[this.pos.roomName].owner === 'string' && Assimilator.isAssimilated(Game.rooms[roomName].owner!)) {
+					log.debug(`Strategist triggered no outpost on overmind user ${Game.rooms[roomName].owner} for ${roomName}`)
 					return false;
 				}
 				return _.sum(sourceDistances) / sourceDistances.length;
diff --git a/src/directives/colony/colonize.ts b/src/directives/colony/colonize.ts
index 16856aabd..9faea3b41 100644
--- a/src/directives/colony/colonize.ts
+++ b/src/directives/colony/colonize.ts
@@ -1,14 +1,13 @@
-import {profile} from '../../profiler/decorator';
-import {Directive} from '../Directive';
-import {ClaimingOverlord} from '../../overlords/colonization/claimer';
-import {Colony} from '../../Colony';
-import {PioneerOverlord} from '../../overlords/colonization/pioneer';
-import {MY_USERNAME} from '../../~settings';
-import {log} from '../../console/log';
-import {Roles} from '../../creepSetups/setups';
-import {Cartographer, ROOMTYPE_CONTROLLER} from '../../utilities/Cartographer';
-import {printRoomName} from '../../utilities/utils';
-import { isString } from 'lodash';
+import { Colony } from '../../Colony';
+import { log } from '../../console/log';
+import { Roles } from '../../creepSetups/setups';
+import { ClaimingOverlord } from '../../overlords/colonization/claimer';
+import { PioneerOverlord } from '../../overlords/colonization/pioneer';
+import { profile } from '../../profiler/decorator';
+import { Cartographer, ROOMTYPE_CONTROLLER } from '../../utilities/Cartographer';
+import { printRoomName } from '../../utilities/utils';
+import { MY_USERNAME } from '../../~settings';
+import { Directive } from '../Directive';
 
 
 /**
@@ -67,7 +66,7 @@ export class DirectiveColonize extends Directive {
 			this.remove();
 		}
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (isString(Game.rooms[this.pos.roomName].owner) && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+		if (typeof Game.rooms[this.pos.roomName].owner === 'string' && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
 			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
 			//this.remove();
 		}
diff --git a/src/directives/colony/incubate.ts b/src/directives/colony/incubate.ts
index 9f2c86d05..54be5aeb6 100644
--- a/src/directives/colony/incubate.ts
+++ b/src/directives/colony/incubate.ts
@@ -1,11 +1,10 @@
-import {profile} from '../../profiler/decorator';
-import {Directive} from '../Directive';
-import {ClaimingOverlord} from '../../overlords/colonization/claimer';
-import {Colony} from '../../Colony';
-import {SpawnGroup} from '../../logistics/SpawnGroup';
-import { isString } from 'lodash';
-import { MY_USERNAME } from '../../~settings';
+import { Colony } from '../../Colony';
 import { log } from '../../console/log';
+import { SpawnGroup } from '../../logistics/SpawnGroup';
+import { ClaimingOverlord } from '../../overlords/colonization/claimer';
+import { profile } from '../../profiler/decorator';
+import { MY_USERNAME } from '../../~settings';
+import { Directive } from '../Directive';
 
 
 /**
@@ -47,7 +46,7 @@ export class DirectiveIncubate extends Directive {
 			}
 		}
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (isString(Game.rooms[this.pos.roomName].owner) && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+		if (typeof Game.rooms[this.pos.roomName].owner === 'string' && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
 			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
 			//this.remove();
 		}
diff --git a/src/directives/colony/outpost.ts b/src/directives/colony/outpost.ts
index 1d3f9ba28..7155af1c1 100644
--- a/src/directives/colony/outpost.ts
+++ b/src/directives/colony/outpost.ts
@@ -1,12 +1,11 @@
-import {Directive} from '../Directive';
-import {profile} from '../../profiler/decorator';
-import {ReservingOverlord} from '../../overlords/colonization/reserver';
-import {StationaryScoutOverlord} from '../../overlords/scouting/stationary';
-import {Cartographer, ROOMTYPE_CONTROLLER} from '../../utilities/Cartographer';
-import {RoomIntel} from '../../intel/RoomIntel';
-import {log} from '../../console/log';
-import { isString } from 'lodash'
 import { MY_USERNAME } from '~settings';
+import { log } from '../../console/log';
+import { RoomIntel } from '../../intel/RoomIntel';
+import { ReservingOverlord } from '../../overlords/colonization/reserver';
+import { StationaryScoutOverlord } from '../../overlords/scouting/stationary';
+import { profile } from '../../profiler/decorator';
+import { Cartographer, ROOMTYPE_CONTROLLER } from '../../utilities/Cartographer';
+import { Directive } from '../Directive';
 
 /**
  * Claims a new room and incubates it from the nearest (or specified) colony
@@ -42,7 +41,7 @@ export class DirectiveOutpost extends Directive {
 			this.remove();
 		}
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (isString(Game.rooms[this.pos.roomName].owner) && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+		if (typeof Game.rooms[this.pos.roomName].owner === 'string' && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
 			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
 			//this.remove();
 		}
diff --git a/src/strategy/Strategist.ts b/src/strategy/Strategist.ts
index 90d4367af..d99d4395e 100644
--- a/src/strategy/Strategist.ts
+++ b/src/strategy/Strategist.ts
@@ -1,15 +1,14 @@
-import {Autonomy, getAutonomyLevel, Mem} from '../memory/Memory';
-import {Colony, getAllColonies} from '../Colony';
-import {DirectiveColonize} from '../directives/colony/colonize';
-import {Cartographer} from '../utilities/Cartographer';
-import {MIN_EXPANSION_DISTANCE} from './ExpansionPlanner';
-import {maxBy} from '../utilities/utils';
-import {log} from '../console/log';
-import {Pathing} from '../movement/Pathing';
-import {assimilationLocked} from '../assimilation/decorator';
-import {MAX_OWNED_ROOMS, SHARD3_MAX_OWNED_ROOMS, MY_USERNAME} from '../~settings';
-import {profile} from '../profiler/decorator';
-import { isString } from 'lodash';
+import { Colony, getAllColonies } from '../Colony';
+import { assimilationLocked } from '../assimilation/decorator';
+import { log } from '../console/log';
+import { DirectiveColonize } from '../directives/colony/colonize';
+import { Autonomy, Mem, getAutonomyLevel } from '../memory/Memory';
+import { Pathing } from '../movement/Pathing';
+import { profile } from '../profiler/decorator';
+import { Cartographer } from '../utilities/Cartographer';
+import { maxBy } from '../utilities/utils';
+import { MAX_OWNED_ROOMS, MY_USERNAME, SHARD3_MAX_OWNED_ROOMS } from '../~settings';
+import { MIN_EXPANSION_DISTANCE } from './ExpansionPlanner';
 
 
 const CHECK_EXPANSION_FREQUENCY = 1000;
@@ -117,8 +116,9 @@ export class Strategist implements IStrategist {
 				}
 
 				// Are there other Overmind users nearby?
-				if (_.any(adjacentRooms, roomName => isString(Game.rooms[roomName].owner) && Game.rooms[roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[roomName].owner!))) {
+				if (_.any(adjacentRooms, roomName => typeof Game.rooms[roomName].owner === 'string' && Game.rooms[roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[roomName].owner!))) {
 					score -= TOO_CLOSE_PENALTY;
+					log.debug(`Strategist triggered too close to overmind user ${Game.rooms[roomName].owner} for ${roomName}`)
 				}
 
 				// Reward new minerals and catalyst rooms

From 60e777c708f5baef0ebbbac6321ddb97a418df9b Mon Sep 17 00:00:00 2001
From: Coolfeather2 <nathan.ogden+github@birdtronics.net>
Date: Tue, 9 Apr 2019 10:46:21 +0800
Subject: [PATCH 3/6] fixed undefined issue

---
 src/directives/colony/colonize.ts | 3 ++-
 src/directives/colony/incubate.ts | 4 ++--
 src/directives/colony/outpost.ts  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/directives/colony/colonize.ts b/src/directives/colony/colonize.ts
index 9faea3b41..c4ccfac1e 100644
--- a/src/directives/colony/colonize.ts
+++ b/src/directives/colony/colonize.ts
@@ -1,6 +1,7 @@
 import { Colony } from '../../Colony';
 import { log } from '../../console/log';
 import { Roles } from '../../creepSetups/setups';
+import { RoomIntel } from '../../intel/RoomIntel';
 import { ClaimingOverlord } from '../../overlords/colonization/claimer';
 import { PioneerOverlord } from '../../overlords/colonization/pioneer';
 import { profile } from '../../profiler/decorator';
@@ -66,7 +67,7 @@ export class DirectiveColonize extends Directive {
 			this.remove();
 		}
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (typeof Game.rooms[this.pos.roomName].owner === 'string' && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+		if (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!) || RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!)) {
 			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
 			//this.remove();
 		}
diff --git a/src/directives/colony/incubate.ts b/src/directives/colony/incubate.ts
index 54be5aeb6..24f8658ae 100644
--- a/src/directives/colony/incubate.ts
+++ b/src/directives/colony/incubate.ts
@@ -1,9 +1,9 @@
 import { Colony } from '../../Colony';
 import { log } from '../../console/log';
+import { RoomIntel } from '../../intel/RoomIntel';
 import { SpawnGroup } from '../../logistics/SpawnGroup';
 import { ClaimingOverlord } from '../../overlords/colonization/claimer';
 import { profile } from '../../profiler/decorator';
-import { MY_USERNAME } from '../../~settings';
 import { Directive } from '../Directive';
 
 
@@ -46,7 +46,7 @@ export class DirectiveIncubate extends Directive {
 			}
 		}
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (typeof Game.rooms[this.pos.roomName].owner === 'string' && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+		if (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!) || RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!)) {
 			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
 			//this.remove();
 		}
diff --git a/src/directives/colony/outpost.ts b/src/directives/colony/outpost.ts
index 7155af1c1..8d3882ba8 100644
--- a/src/directives/colony/outpost.ts
+++ b/src/directives/colony/outpost.ts
@@ -41,7 +41,7 @@ export class DirectiveOutpost extends Directive {
 			this.remove();
 		}
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (typeof Game.rooms[this.pos.roomName].owner === 'string' && Game.rooms[this.pos.roomName].owner != MY_USERNAME && Assimilator.isAssimilated(Game.rooms[this.pos.roomName].owner!)) {
+		if (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!) || RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!)) {
 			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
 			//this.remove();
 		}

From cd024b7a3f734d6a37245a0af352e77a8fcfdc8b Mon Sep 17 00:00:00 2001
From: Coolfeather2 <nathan.ogden+github@birdtronics.net>
Date: Tue, 9 Apr 2019 16:22:41 +0800
Subject: [PATCH 4/6] bugfixing directives

---
 src/directives/colony/colonize.ts | 12 ++++++++++--
 src/directives/colony/incubate.ts | 13 +++++++++++--
 src/directives/colony/outpost.ts  | 13 +++++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/directives/colony/colonize.ts b/src/directives/colony/colonize.ts
index c4ccfac1e..1334cb761 100644
--- a/src/directives/colony/colonize.ts
+++ b/src/directives/colony/colonize.ts
@@ -66,9 +66,17 @@ export class DirectiveColonize extends Directive {
 			// Remove the directive
 			this.remove();
 		}
+
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!) || RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!)) {
-			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
+		let AssimilatedRoomOwner = (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && RoomIntel.roomOwnedBy(this.pos.roomName) != MY_USERNAME && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!))
+		let AssimilatedRoomReserved = (typeof RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && RoomIntel.roomReservedBy(this.pos.roomName) != MY_USERNAME && Assimilator.isAssimilated(RoomIntel.roomReservedBy(this.pos.roomName)!))
+		//log.debug(`${this.print} Owned by: ${RoomIntel.roomOwnedBy(this.pos.roomName)}, who is ${AssimilatedRoomOwner} Assimilated. Reserved by: ${RoomIntel.roomReservedBy(this.pos.roomName)}, who is ${AssimilatedRoomReserved} Assimilated`)
+		if (Game.time % 10 == 2 && AssimilatedRoomOwner) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user ${RoomIntel.roomOwnedBy(this.pos.roomName)}!`)
+			//this.remove();
+		}
+		else if (Game.time % 10 == 2 && AssimilatedRoomReserved) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user ${RoomIntel.roomReservedBy(this.pos.roomName)}!`)
 			//this.remove();
 		}
 
diff --git a/src/directives/colony/incubate.ts b/src/directives/colony/incubate.ts
index 24f8658ae..24f759e9d 100644
--- a/src/directives/colony/incubate.ts
+++ b/src/directives/colony/incubate.ts
@@ -5,6 +5,7 @@ import { SpawnGroup } from '../../logistics/SpawnGroup';
 import { ClaimingOverlord } from '../../overlords/colonization/claimer';
 import { profile } from '../../profiler/decorator';
 import { Directive } from '../Directive';
+import { MY_USERNAME } from '../../~settings';
 
 
 /**
@@ -45,9 +46,17 @@ export class DirectiveIncubate extends Directive {
 				this.remove();
 			}
 		}
+
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!) || RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!)) {
-			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
+		let AssimilatedRoomOwner = (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && RoomIntel.roomOwnedBy(this.pos.roomName) != MY_USERNAME && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!))
+		let AssimilatedRoomReserved = (typeof RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && RoomIntel.roomReservedBy(this.pos.roomName) != MY_USERNAME && Assimilator.isAssimilated(RoomIntel.roomReservedBy(this.pos.roomName)!))
+		//log.debug(`${this.print} Owned by: ${RoomIntel.roomOwnedBy(this.pos.roomName)}, who is ${AssimilatedRoomOwner} Assimilated. Reserved by: ${RoomIntel.roomReservedBy(this.pos.roomName)}, who is ${AssimilatedRoomReserved} Assimilated`)
+		if (Game.time % 10 == 2 && AssimilatedRoomOwner) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user ${RoomIntel.roomOwnedBy(this.pos.roomName)}!`)
+			//this.remove();
+		}
+		else if (Game.time % 10 == 2 && AssimilatedRoomReserved) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user ${RoomIntel.roomReservedBy(this.pos.roomName)}!`)
 			//this.remove();
 		}
 	}
diff --git a/src/directives/colony/outpost.ts b/src/directives/colony/outpost.ts
index 8d3882ba8..e8818ce17 100644
--- a/src/directives/colony/outpost.ts
+++ b/src/directives/colony/outpost.ts
@@ -6,6 +6,7 @@ import { StationaryScoutOverlord } from '../../overlords/scouting/stationary';
 import { profile } from '../../profiler/decorator';
 import { Cartographer, ROOMTYPE_CONTROLLER } from '../../utilities/Cartographer';
 import { Directive } from '../Directive';
+import { MY_USERNAME } from '../../~settings';
 
 /**
  * Claims a new room and incubates it from the nearest (or specified) colony
@@ -40,9 +41,17 @@ export class DirectiveOutpost extends Directive {
 			log.warning(`Removing ${this.print} since room is owned!`);
 			this.remove();
 		}
+
 		// if reserved or owned by Overmind user - throw warning but don't remove? Included code to remove, just commented out.
-		if (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!) || RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!)) {
-			log.warning(`${this.print} is in a room controlled by another Overmind user!`)
+		let AssimilatedRoomOwner = (typeof RoomIntel.roomOwnedBy(this.pos.roomName) === 'string' && RoomIntel.roomOwnedBy(this.pos.roomName) != MY_USERNAME && Assimilator.isAssimilated(RoomIntel.roomOwnedBy(this.pos.roomName)!))
+		let AssimilatedRoomReserved = (typeof RoomIntel.roomReservedBy(this.pos.roomName) === 'string' && RoomIntel.roomReservedBy(this.pos.roomName) != MY_USERNAME && Assimilator.isAssimilated(RoomIntel.roomReservedBy(this.pos.roomName)!))
+		//log.debug(`${this.print} Owned by: ${RoomIntel.roomOwnedBy(this.pos.roomName)}, who is ${AssimilatedRoomOwner} Assimilated. Reserved by: ${RoomIntel.roomReservedBy(this.pos.roomName)}, who is ${AssimilatedRoomReserved} Assimilated`)
+		if (Game.time % 10 == 2 && AssimilatedRoomOwner) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user ${RoomIntel.roomOwnedBy(this.pos.roomName)}!`)
+			//this.remove();
+		}
+		else if (Game.time % 10 == 2 && AssimilatedRoomReserved) {
+			log.warning(`${this.print} is in a room controlled by another Overmind user ${RoomIntel.roomReservedBy(this.pos.roomName)}!`)
 			//this.remove();
 		}
 

From 7f4ad0b3c5746e7ba5dd7be99c0502dea90123fd Mon Sep 17 00:00:00 2001
From: Coolfeather2 <nathan.ogden+github@birdtronics.net>
Date: Wed, 10 Apr 2019 10:40:53 +0800
Subject: [PATCH 5/6] Removed duplicate import

---
 src/directives/colony/outpost.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/directives/colony/outpost.ts b/src/directives/colony/outpost.ts
index e8818ce17..4627ddd92 100644
--- a/src/directives/colony/outpost.ts
+++ b/src/directives/colony/outpost.ts
@@ -1,4 +1,4 @@
-import { MY_USERNAME } from '~settings';
+import { MY_USERNAME } from '../../~settings';
 import { log } from '../../console/log';
 import { RoomIntel } from '../../intel/RoomIntel';
 import { ReservingOverlord } from '../../overlords/colonization/reserver';
@@ -6,7 +6,6 @@ import { StationaryScoutOverlord } from '../../overlords/scouting/stationary';
 import { profile } from '../../profiler/decorator';
 import { Cartographer, ROOMTYPE_CONTROLLER } from '../../utilities/Cartographer';
 import { Directive } from '../Directive';
-import { MY_USERNAME } from '../../~settings';
 
 /**
  * Claims a new room and incubates it from the nearest (or specified) colony

From fc203a48a0a7018f796e2b7f12907da0db0d6282 Mon Sep 17 00:00:00 2001
From: Coolfeather2 <nathan.ogden+github@birdtronics.net>
Date: Wed, 10 Apr 2019 11:34:36 +0800
Subject: [PATCH 6/6] Revert changes to Overseer

---
 src/Overseer.ts | 57 ++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/Overseer.ts b/src/Overseer.ts
index b0d535f09..fd688b4aa 100644
--- a/src/Overseer.ts
+++ b/src/Overseer.ts
@@ -1,28 +1,28 @@
-import { Colony, ColonyStage } from './Colony';
-import { log } from './console/log';
-import { bodyCost } from './creepSetups/CreepSetup';
-import { Roles } from './creepSetups/setups';
-import { Directive } from './directives/Directive';
-import { Notifier } from './directives/Notifier';
-import { DirectiveClearRoom } from './directives/colony/clearRoom';
-import { DirectiveColonize } from './directives/colony/colonize';
-import { DirectiveOutpost } from './directives/colony/outpost';
-import { DirectiveGuard } from './directives/defense/guard';
-import { DirectiveInvasionDefense } from './directives/defense/invasionDefense';
-import { DirectiveOutpostDefense } from './directives/defense/outpostDefense';
-import { DirectiveBootstrap } from './directives/situational/bootstrap';
-import { DirectiveNukeResponse } from './directives/situational/nukeResponse';
-import { DirectiveTerminalEvacuateState } from './directives/terminalState/terminalState_evacuate';
-import { RoomIntel } from './intel/RoomIntel';
-import { LogisticsNetwork } from './logistics/LogisticsNetwork';
-import { Autonomy, Mem, getAutonomyLevel } from './memory/Memory';
-import { Pathing } from './movement/Pathing';
-import { Overlord } from './overlords/Overlord';
-import { profile } from './profiler/decorator';
-import { CombatPlanner } from './strategy/CombatPlanner';
-import { Cartographer, ROOMTYPE_CONTROLLER, ROOMTYPE_SOURCEKEEPER } from './utilities/Cartographer';
-import { derefCoords, hasJustSpawned, minBy, onPublicServer } from './utilities/utils';
-import { MUON, MY_USERNAME, USE_TRY_CATCH } from './~settings';
+import {DirectiveGuard} from './directives/defense/guard';
+import {DirectiveBootstrap} from './directives/situational/bootstrap';
+import {profile} from './profiler/decorator';
+import {Colony, ColonyStage} from './Colony';
+import {Overlord} from './overlords/Overlord';
+import {Directive} from './directives/Directive';
+import {log} from './console/log';
+import {Pathing} from './movement/Pathing';
+import {DirectiveInvasionDefense} from './directives/defense/invasionDefense';
+import {DirectiveNukeResponse} from './directives/situational/nukeResponse';
+import {DirectiveTerminalEvacuateState} from './directives/terminalState/terminalState_evacuate';
+import {bodyCost} from './creepSetups/CreepSetup';
+import {LogisticsNetwork} from './logistics/LogisticsNetwork';
+import {Cartographer, ROOMTYPE_CONTROLLER, ROOMTYPE_SOURCEKEEPER} from './utilities/Cartographer';
+import {derefCoords, hasJustSpawned, minBy, onPublicServer} from './utilities/utils';
+import {DirectiveOutpost} from './directives/colony/outpost';
+import {Autonomy, getAutonomyLevel, Mem} from './memory/Memory';
+import {RoomIntel} from './intel/RoomIntel';
+import {Roles} from './creepSetups/setups';
+import {MUON, MY_USERNAME, USE_TRY_CATCH} from './~settings';
+import {DirectiveOutpostDefense} from './directives/defense/outpostDefense';
+import {Notifier} from './directives/Notifier';
+import {DirectiveColonize} from './directives/colony/colonize';
+import {CombatPlanner} from './strategy/CombatPlanner';
+import {DirectiveClearRoom} from './directives/colony/clearRoom';
 
 
 // export const DIRECTIVE_CHECK_FREQUENCY = 2;
@@ -272,12 +272,7 @@ export class Overseer implements IOverseer {
 				let sourcePositions = _.map(sourceCoords, src => derefCoords(src.c, roomName));
 				let sourceDistances = _.map(sourcePositions, pos => Pathing.distance(origin, pos));
 				if (_.any(sourceDistances, dist => dist == undefined
-					|| dist > Colony.settings.maxSourceDistance)) return false;
-				// Don't create outpost on-top of another Overmind user
-				if (typeof Game.rooms[this.pos.roomName].owner === 'string' && Assimilator.isAssimilated(Game.rooms[roomName].owner!)) {
-					log.debug(`Strategist triggered no outpost on overmind user ${Game.rooms[roomName].owner} for ${roomName}`)
-					return false;
-				}
+												   || dist > Colony.settings.maxSourceDistance)) return false;
 				return _.sum(sourceDistances) / sourceDistances.length;
 			});