refactored defenders and fixed issue that caused creeps to port back …

…on room exit
emin93 · Aug 3, 2019 · 5b8fc46 · 5b8fc46
1 parent f53a00c
commit 5b8fc46
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 54 deletions.
diff --git a/src/Creeps/Defenders/Defender.ts b/src/Creeps/Defenders/Defender.ts
@@ -0,0 +1,34 @@
+import { defenderMoveOpts, defenderMoveToEnemyOpts, BaseCreepMemory } from '../Base';
+
+export default (creep: Creep, attack: (target: Creep) => CreepActionReturnCode) => {
+  const memory = <BaseCreepMemory>creep.memory;
+  const flag = Game.flags['Flag1'];
+
+  if (!flag) {
+    return;
+  }
+
+  const closestEnemy = creep.pos.findClosestByRange(FIND_HOSTILE_CREEPS);
+  const isCloseToFlag = creep.pos.inRangeTo(flag, 5);
+
+  if (memory.job !== 'defending' && closestEnemy && isCloseToFlag) {
+    memory.job = 'defending';
+  }
+
+  if (memory.job !== 'patrolling' && !closestEnemy) {
+    memory.job = 'patrolling';
+  }
+
+  if (memory.job === 'patrolling') {
+    creep.moveTo(flag.pos, defenderMoveOpts);
+    return;
+  }
+
+  if (!closestEnemy) {
+    return;
+  }
+
+  if (attack(closestEnemy) === ERR_NOT_IN_RANGE) {
+    creep.moveTo(closestEnemy.pos, defenderMoveToEnemyOpts);
+  }
+};
diff --git a/src/Creeps/Defenders/Melee.ts b/src/Creeps/Defenders/Melee.ts
@@ -1,28 +1,3 @@
-import { defenderMoveOpts, defenderMoveToEnemyOpts, BaseCreepMemory } from '../Base';
+import defend from './Defender';
 
-export default (creep: Creep) => {
-  const memory = <BaseCreepMemory>creep.memory;
-  const closestEnemy = creep.pos.findClosestByRange(FIND_HOSTILE_CREEPS);
-
-  if (memory.job !== 'defending' && closestEnemy) {
-    memory.job = 'defending';
-  }
-
-  if (memory.job !== 'patrolling' && !closestEnemy) {
-    memory.job = 'patrolling';
-  }
-
-  if (memory.job === 'patrolling') {
-    const flag = creep.pos.findClosestByRange(FIND_FLAGS);
-    if (!flag) {
-      return;
-    }
-
-    creep.moveTo(flag, defenderMoveOpts);
-    return;
-  }
-
-  if (closestEnemy && creep.attack(closestEnemy) === ERR_NOT_IN_RANGE) {
-    creep.moveTo(closestEnemy, defenderMoveToEnemyOpts);
-  }
-};
+export default (creep: Creep) => defend(creep, creep.attack);
diff --git a/src/Creeps/Defenders/Ranger.ts b/src/Creeps/Defenders/Ranger.ts
@@ -1,28 +1,3 @@
-import { defenderMoveOpts, defenderMoveToEnemyOpts, BaseCreepMemory } from '../Base';
+import defend from './Defender';
 
-export default (creep: Creep) => {
-  const memory = <BaseCreepMemory>creep.memory;
-  const closestEnemy = creep.pos.findClosestByRange(FIND_HOSTILE_CREEPS);
-
-  if (memory.job !== 'defending' && closestEnemy) {
-    memory.job = 'defending';
-  }
-
-  if (memory.job !== 'patrolling' && !closestEnemy) {
-    memory.job = 'patrolling';
-  }
-
-  if (memory.job === 'patrolling') {
-    const flag = creep.pos.findClosestByRange(FIND_FLAGS);
-    if (!flag) {
-      return;
-    }
-
-    creep.moveTo(flag, defenderMoveOpts);
-    return;
-  }
-
-  if (closestEnemy && creep.rangedAttack(closestEnemy) === ERR_NOT_IN_RANGE) {
-    creep.moveTo(closestEnemy, defenderMoveToEnemyOpts);
-  }
-};
+export default (creep: Creep) => defend(creep, creep.rangedAttack);