main.js

@@ -1,4 +1,5 @@
-var roleDispatcher = require('role_dispatcher');
+var roleDispatcher = require('role.dispatcher');
+
 
 module.exports.loop = function () {
     

role.base.js

@@ -5,9 +5,9 @@ class roleBase{
 	}
     /** @param {Creep} creep **/
     run(creep) { }
-	spawn(spawnPoint){
-		spawnPoint.spawnCreep(this.body, this.name + Game.time,
-			{memory : {role : this.name}
+	spawn(spawn){
+		spawn.spawnCreep(this.body, this.name + Game.time,
+			memory : {role : this.name}
 		});
 	}
 };

role.builder.js

@@ -1,13 +1,15 @@
-var energyUtils = require('util_energy');
-var roleBase = require('role_base');
+var energyUtils = require('utils.energy');
+
+const body = [
+	WORK, CARRY, MOVE
+];
+
+var roleBuilder = {
+	body,
 
-class roleBuilder extends roleBase{
     /** @param {Creep} creep **/
-	constructor(){
-		super()
-		this.name = 'Builder';
-	}
-    run(creep) {
+    run: function(creep) {
+
         if(creep.memory.building && creep.store[RESOURCE_ENERGY] == 0) {
             creep.memory.building = false;
         }

role.dispatcher.js

@@ -1,8 +1,8 @@
-var roleHarvester = require('role_harvester');
-var roleUpgrader = require('role_upgrader');
-var roleBuilder = require('role_builder');
-var roleRepairer = require('role_repairer');
-var roleGuard = require('role_guard');
+var roleHarvester = require('role.harvester');
+var roleUpgrader = require('role.upgrader');
+var roleBuilder = require('role.builder');
+var roleRepairer = require('role.repairer');
+var roleGuard = require('role.guard');
 
 const roleMap = {
     harvester: roleHarvester,

role.guard.js

@@ -1,12 +1,12 @@
-var roleBase = require('role_base');
+var energyUtils = require('utils.energy');
 
-class roleGuard extends roleBase{
+const body = [
+	MOVE, RANGED_ATTACK
+];
+
+var roleGuard = {
     /** @param {Creep} creep **/
-	constructor(){
-		this.body = [ MOVE, RANGED_ATTACK ];
-		this.name = 'Streltsy'
-	}
-    run(creep) {
+    run: function(creep) {
 		const target = creep.pos.findClosestByRange(FIND_HOSTILE_CREEPS);
 		if(target) {
 			if(creep.rangedAttack(target) == ERR_NOT_IN_RANGE) {
@@ -26,11 +26,6 @@ class roleGuard extends roleBase{
 			}
         }
     }
-	spawn(spawnPoint, newWaypoints){
-		spawnPoint.spawnCreep(this.body, this.name + Game.time,
-			{memory : {role : this.name, waypoints : newWaypoints}
-		});
-	}
 };
 
 module.exports = roleGuard;

role.harvester.js

@@ -1,13 +1,14 @@
-var energyUtils = require('util_energy');
-var roleBase = require('role_base');
+var energyUtils = require('utils.energy');
+
+const body = [
+	WORK, CARRY, MOVE
+];
+
+var roleHarvester = {
+	body,
 
-class roleHarvester extends roleBase{
     /** @param {Creep} creep **/
-	constructor(){
-		super();
-		this.name = 'Peasant'
-	}
-    run(creep) {
+    run: function(creep) {
         if(creep.store.getFreeCapacity() > 0) {
             var sources = creep.room.find(FIND_SOURCES);
             if(creep.harvest(sources[0]) == ERR_NOT_IN_RANGE) {

role.repairer.js

@@ -1,13 +1,15 @@
-var energyUtils = require('util_energy');
-var roleBase = require('role_base');
+var energyUtils = require('utils.energy');
+
+const body = [
+	WORK, CARRY, MOVE
+];
+
+var roleRepairer = {
+	body,
 
-class roleRepairer extends roleBase {
-	constructor(){
-		super();
-		this.name = 'Repairer';
-	}
     /** @param {Creep} creep **/
-    run(creep) {
+    run: function(creep) {
+
         if(creep.memory.building && creep.store[RESOURCE_ENERGY] == 0) {
             creep.memory.building = false;
         }

role.upgrader.js

@@ -1,13 +1,12 @@
-var roleBase = require('role_base');
+const body = [
+	WORK, CARRY, MOVE
+];
 
-class roleUpgrader extends roleBase {
-	constructor(){
-		super();
-		this.name = 'Upgrader';
-	}
+var roleUpgrader = {
+	body,
 
     /** @param {Creep} creep **/
-    run(creep) {
+    run: function(creep) {
 
         if(creep.memory.upgrading && creep.store[RESOURCE_ENERGY] == 0) {
             creep.memory.upgrading = false;