added creep config file

battle.js

@@ -1,5 +1,5 @@
 // usernames are all lowercase, we compare with to lower
-var USERNAME_WHITELIST = ['chrisinajar', 'ho0ber', 'fractaloop', 'n7-anthony', 'overra', 'tyrel', 'fervens'];
+var USERNAME_WHITELIST = ['chrisinajar', 'ho0ber', 'fractaloop', 'n7-anthony', 'overra', 'tyrel', 'fervens', 'devdaniel'];
 
 module.exports = {
     findEnemy: findEnemy,

creeps.config.js

@@ -0,0 +1,27 @@
+var roleHarvester = require('role.harvester');
+var roleUpgrader = require('role.upgrader');
+var roleBuilder = require('role.builder');
+var roleGuard = require('role.guard');
+
+module.exports = {
+    harvester: {
+        bodyParts: [WORK,WORK, CARRY,CARRY, MOVE, MOVE],
+        minimumCreeps: 4,
+        role: roleHarvester
+    },
+    builder: {
+        bodyParts: [WORK, CARRY, CARRY, CARRY, MOVE, MOVE],
+        minimumCreeps: 0,
+        role: roleBuilder
+    },
+    upgrader: {
+        bodyParts: [WORK, CARRY, WORK, MOVE,  CARRY, MOVE, MOVE],
+        minimumCreeps: 4,
+        role: roleUpgrader
+    },
+    guard: {
+        bodyParts: [TOUGH, MOVE, ATTACK, MOVE, ATTACK],
+        minimumCreeps: 0,
+        role: roleGuard,
+    }
+};

main.js

@@ -1,32 +1,7 @@
-var roleHarvester = require('role.harvester');
+var structureTower = require('structure.tower');
-var roleUpgrader = require('role.upgrader');
+var creepsConfig = require('creeps.config');
-var roleBuilder = require('role.builder');
-var roleGuard = require('role.guard');
 var helpers = require('helpers');
-
 var creepRolePriority = ['harvester', 'builder', 'upgrader', 'guard'];
-var creepsConfig = {
-    harvester: {
-        bodyParts: [WORK, CARRY, MOVE, MOVE, MOVE],
-        minimumCreeps: 4,
-        role: roleHarvester
-    },
-    builder: {
-        bodyParts: [WORK, CARRY, CARRY, MOVE],
-        minimumCreeps: 5,
-        role: roleBuilder
-    },
-    upgrader: {
-        bodyParts: [WORK, CARRY, CARRY, MOVE, MOVE],
-        minimumCreeps: 2,
-        role: roleUpgrader
-    },
-    guard: {
-        bodyParts: [TOUGH, MOVE, ATTACK, MOVE, ATTACK],
-        minimumCreeps: 4,
-        role: roleGuard,
-    }
-};
 
 
 module.exports.loop = function(){
@@ -37,7 +12,6 @@ module.exports.loop = function(){
             delete Memory.creeps[name];
             console.log('Cleaning non-existing creep memory:', name);
         }
-
     }
 
     // Refactor some similar behavior for all roles
@@ -58,6 +32,11 @@ module.exports.loop = function(){
         }
     }
     
+    var tower = Game.getObjectById('577683641404f96570a580d2');
+    if(tower) {
+       structureTower.run(tower);
+    }
+
     // Run stuff for each creep
     var roleCounts = {harvester: 0, builder: 0, upgrader: 0, guard: 0};
     var expected = _(creepsConfig).mapValues('minimumCreeps');

role.builder.js

@@ -1,3 +1,5 @@
+
+
 var BreakException= {};
 
 var roleBuilder = {
@@ -16,9 +18,10 @@ var roleBuilder = {
                 creep.moveTo(targets[0]);
             }
         } else {
-            var sources = creep.room.find(FIND_SOURCES);
+            var source = creep.pos.findClosestByPath(FIND_SOURCES);
-            if (creep.harvest(sources[0]) == ERR_NOT_IN_RANGE){
+            if(creep.harvest(source) == ERR_NOT_IN_RANGE) {
-                creep.moveTo(sources[0]);
+                console.log('\tmoving to', source);
+                creep.moveTo(source);
             }
         }
 
@@ -26,3 +29,4 @@ var roleBuilder = {
     }
 };
 module.exports = roleBuilder;
+

role.guard.js

@@ -17,7 +17,6 @@ var roleGuard = {
     run: function(creep){
         this.creep = creep;
         this.lastFlag = helpers.getLastFlag("patrol_");
-        console.log(creep, 'running Guard')
         creep.memory.patrolDestination = creep.memory.patrolDestination || 1;
     	var target = battle.findEnemy(creep);
     	if(target != creep.room.controller && creep.hits > creep.hitsMax - 500 /* no more attack */) {

role.harvester.js

@@ -4,7 +4,7 @@ var roleHarvester = {
     run: function(creep) {
         console.log(creep, 'running Harvest');
 	    if(creep.carry.energy < creep.carryCapacity) {
-            var source = creep.pos.findClosestByPath(FIND_SOURCES);
+	        var source = creep.pos.findClosestByPath(FIND_SOURCES);
             if(creep.harvest(source) == ERR_NOT_IN_RANGE) {
                 console.log('\tmoving to', source);
                 creep.moveTo(source);
@@ -13,7 +13,8 @@ var roleHarvester = {
         else {
             var targets = creep.room.find(FIND_STRUCTURES, {
                     filter: (structure) => {
-                        return (structure.structureType == STRUCTURE_EXTENSION 
+                        return (structure.structureType == STRUCTURE_CONTAINER
+                              || structure.structureType == STRUCTURE_EXTENSION 
                               || structure.structureType == STRUCTURE_SPAWN
                               || structure.structureType == STRUCTURE_TOWER
                             ) && structure.energy < structure.energyCapacity;
@@ -24,9 +25,13 @@ var roleHarvester = {
                     console.log('\tmoving to', targets[0]);
                     creep.moveTo(targets[0]);
                 }
+            } else {
+                creep.moveTo(Game.spawns.Spawn1);
             }
         }
 	}
 };
 
 module.exports = roleHarvester;
+
+

role.upgrader.js

@@ -4,22 +4,29 @@ var roleUpgrader = {
     run: function(creep) {
         if(creep.memory.upgrading && creep.carry.energy == 0) {
             creep.memory.upgrading = false;
-	    }
+        }
-	    if(!creep.memory.upgrading && creep.carry.energy == creep.carryCapacity) {
+        if(!creep.memory.upgrading && creep.carry.energy == creep.carryCapacity) {
 	        creep.memory.upgrading = true;
-	    }
+        }
 
-	    if(creep.memory.upgrading) {
+        if(creep.memory.upgrading) {
             if(creep.upgradeController(creep.room.controller) == ERR_NOT_IN_RANGE) {
                 creep.moveTo(creep.room.controller);
             }
         }
         else {
             var source = creep.pos.findClosestByPath(FIND_SOURCES);
+            console.log(source);
             if(creep.harvest(source) == ERR_NOT_IN_RANGE) {
                 creep.moveTo(source);
             }
         }
+
+
+
+
+
+
 	}
 };