Finished migration to class based system

main.js

@@ -1,5 +1,4 @@
-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(spawn){
-		spawn.spawnCreep(this.body, this.name + Game.time,
-			memory : {role : this.name}
+	spawn(spawnPoint){
+		spawnPoint.spawnCreep(this.body, this.name + Game.time,
+			{memory : {role : this.name}
 		});
 	}
 };

role/builder.js

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

role/guard.js

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

role/harvester.js

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

role/upgrader.js

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