Minor changes
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
const jobBuilder = require("JobBuilder");
|
const jobBuilder = require("JobBuilder");
|
||||||
|
const jobCleaner = require("JobCleaner");
|
||||||
const jobMiner = require("JobMiner");
|
const jobMiner = require("JobMiner");
|
||||||
const jobSupplier = require("JobSupplier");
|
const jobSupplier = require("JobSupplier");
|
||||||
const jobUpgrader = require("JobUpgrader");
|
const jobUpgrader = require("JobUpgrader");
|
||||||
@@ -12,9 +13,10 @@ module.exports = {
|
|||||||
|
|
||||||
const Role = {
|
const Role = {
|
||||||
BUILDER: 0,
|
BUILDER: 0,
|
||||||
MINER: 1,
|
CLEANER: 1,
|
||||||
SUPPLIER: 2,
|
MINER: 2,
|
||||||
UPGRADER: 3
|
SUPPLIER: 3,
|
||||||
|
UPGRADER: 4
|
||||||
}
|
}
|
||||||
|
|
||||||
class _Creep extends Creep {
|
class _Creep extends Creep {
|
||||||
@@ -22,6 +24,7 @@ class _Creep extends Creep {
|
|||||||
if(!this.memory.job) this.memory.job = { role: Role.HARVESTER };
|
if(!this.memory.job) this.memory.job = { role: Role.HARVESTER };
|
||||||
switch (this.memory.job.role) {
|
switch (this.memory.job.role) {
|
||||||
case Role.BUILDER: jobBuilder.begin(this); break;
|
case Role.BUILDER: jobBuilder.begin(this); break;
|
||||||
|
case Role.CLEANER: jobCleaner.begin(this); break;
|
||||||
case Role.MINER: jobMiner.begin(this); break;
|
case Role.MINER: jobMiner.begin(this); break;
|
||||||
case Role.SUPPLIER: jobSupplier.begin(this); break;
|
case Role.SUPPLIER: jobSupplier.begin(this); break;
|
||||||
case Role.UPGRADER: jobUpgrader.begin(this); break;
|
case Role.UPGRADER: jobUpgrader.begin(this); break;
|
||||||
@@ -33,6 +36,7 @@ class _Creep extends Creep {
|
|||||||
if(!this.memory.init) this.begin();
|
if(!this.memory.init) this.begin();
|
||||||
switch (this.memory.job.role) {
|
switch (this.memory.job.role) {
|
||||||
case Role.BUILDER: jobBuilder.tick(this); break;
|
case Role.BUILDER: jobBuilder.tick(this); break;
|
||||||
|
case Role.CLEANER: jobCleaner.tick(this); break;
|
||||||
case Role.MINER: jobMiner.tick(this); break;
|
case Role.MINER: jobMiner.tick(this); break;
|
||||||
case Role.SUPPLIER: jobSupplier.tick(this); break;
|
case Role.SUPPLIER: jobSupplier.tick(this); break;
|
||||||
case Role.UPGRADER: jobUpgrader.tick(this); break;
|
case Role.UPGRADER: jobUpgrader.tick(this); break;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ module.exports = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function GetEnergy(creep){
|
function GetEnergy(creep){
|
||||||
if(!creep.memory.target) findWithdrawTarget(creep);
|
if(!creep.memory.target) findEnergyTarget(creep);
|
||||||
const target = Game.getObjectById(creep.memory.target);
|
const target = Game.getObjectById(creep.memory.target);
|
||||||
if(!target) creep.memory.target = undefined;
|
if(!target) creep.memory.target = undefined;
|
||||||
if(creep.pos.isNearTo(target)) {
|
if(creep.pos.isNearTo(target)) {
|
||||||
@@ -53,8 +53,16 @@ function energyEmptyCheck(creep){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function findWithdrawTarget(creep){
|
function findEnergyTarget(creep){
|
||||||
var target = creep.pos.findClosestByRange(FIND_DROPPED_RESOURCES, {
|
var target;
|
||||||
|
if(creep.room.storage.store.getUsedCapacity(RESOURCE_ENERGY) > creep.store.getFreeCapacity(RESOURCE_ENERGY))
|
||||||
|
target = creep.room.storage;
|
||||||
|
if(!target) target = creep.pos.findClosestByRange(FIND_STRUCTURES, {
|
||||||
|
filter: (st)=>{
|
||||||
|
return st.structureType == STRUCTURE_CONTAINER && st.store.getUsedCapacity(RESOURCE_ENERGY) > creep.store.getFreeCapacity(RESOURCE_ENERGY);
|
||||||
|
}});
|
||||||
|
|
||||||
|
if(!target) target = creep.pos.findClosestByRange(FIND_DROPPED_RESOURCES, {
|
||||||
filter: (r)=>{
|
filter: (r)=>{
|
||||||
return r.resourceType == RESOURCE_ENERGY && r.amount > creep.store.getFreeCapacity(RESOURCE_ENERGY);
|
return r.resourceType == RESOURCE_ENERGY && r.amount > creep.store.getFreeCapacity(RESOURCE_ENERGY);
|
||||||
}});
|
}});
|
||||||
@@ -66,10 +74,7 @@ function findWithdrawTarget(creep){
|
|||||||
filter: (t)=>{
|
filter: (t)=>{
|
||||||
return t.store.getUsedCapacity(RESOURCE_ENERGY) > creep.store.getFreeCapacity(RESOURCE_ENERGY);
|
return t.store.getUsedCapacity(RESOURCE_ENERGY) > creep.store.getFreeCapacity(RESOURCE_ENERGY);
|
||||||
}});
|
}});
|
||||||
if(!target) target = creep.pos.findClosestByRange(FIND_STRUCTURES, {
|
|
||||||
filter: (st)=>{
|
|
||||||
return st.structureType == STRUCTURE_CONTAINER && st.store.getUsedCapacity(RESOURCE_ENERGY) > creep.store.getFreeCapacity(RESOURCE_ENERGY);
|
|
||||||
}});
|
|
||||||
if(target) creep.memory.target = target.id;
|
if(target) creep.memory.target = target.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
begin(creep){
|
begin(creep){
|
||||||
if(!creep.memory.collecting) creep.memory.collecting = false;
|
if(!creep.memory.collecting) creep.memory.collecting = false;
|
||||||
if(!creep.memory.counter) creep.memory.counter = 0;
|
|
||||||
},
|
},
|
||||||
|
|
||||||
tick(creep){
|
tick(creep){
|
||||||
@@ -71,27 +70,21 @@ function findWithdrawTarget(creep){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function findTransferTarget(creep) {
|
function findTransferTarget(creep) {
|
||||||
var target;
|
var target = creep.pos.findClosestByRange(FIND_MY_STRUCTURES, {
|
||||||
switch (creep.memory.counter%3) {
|
|
||||||
case 0: target = creep.pos.findClosestByRange(FIND_MY_STRUCTURES, {
|
|
||||||
filter:(s)=> {
|
filter:(s)=> {
|
||||||
return (s.structureType == STRUCTURE_EXTENSION)
|
return (s.structureType == STRUCTURE_EXTENSION)
|
||||||
&& s.store.getFreeCapacity(RESOURCE_ENERGY) > 0;
|
&& s.store.getFreeCapacity(RESOURCE_ENERGY) > 0;
|
||||||
}});
|
}});
|
||||||
if(!target) target = creep.pos.findClosestByRange(FIND_MY_STRUCTURES, {
|
if(!target) target = creep.pos.findClosestByRange(FIND_MY_STRUCTURES, {
|
||||||
filter:(s)=> {
|
filter:(s)=> {
|
||||||
return (s.structureType == STRUCTURE_SPAWN)
|
return (s.structureType == STRUCTURE_SPAWN)
|
||||||
&& s.store.getFreeCapacity(RESOURCE_ENERGY) > 0;
|
&& s.store.getFreeCapacity(RESOURCE_ENERGY) > 0;
|
||||||
}});
|
}});
|
||||||
break;
|
if(!target) target = creep.pos.findClosestByRange(FIND_STRUCTURES, {
|
||||||
case 1: target = creep.pos.findClosestByRange(FIND_STRUCTURES, {
|
|
||||||
filter:(s)=> {
|
filter:(s)=> {
|
||||||
return s.structureType == STRUCTURE_CONTAINER
|
return s.structureType == STRUCTURE_CONTAINER
|
||||||
&& s.store.getFreeCapacity(RESOURCE_ENERGY) > 1000;
|
&& s.store.getFreeCapacity(RESOURCE_ENERGY) > 1000;
|
||||||
}});
|
}})
|
||||||
break;
|
if(!target) target = creep.room.storage;
|
||||||
case 2: target = creep.room.storage; break;
|
|
||||||
}
|
|
||||||
if(target) creep.memory.target = target.id;
|
if(target) creep.memory.target = target.id;
|
||||||
creep.memory.counter++;
|
|
||||||
}
|
}
|
||||||
@@ -43,14 +43,15 @@ function getJobName(role){
|
|||||||
function getBodyByJob(role, energyAvailability){
|
function getBodyByJob(role, energyAvailability){
|
||||||
const body = [];
|
const body = [];
|
||||||
switch (role) {
|
switch (role) {
|
||||||
|
case Role.BUILDER: body.push(WORK); energyAvailability -= 100; break;
|
||||||
case Role.UPGRADER: body.push(CARRY); body.push(MOVE); energyAvailability -= 100; break;
|
case Role.UPGRADER: body.push(CARRY); body.push(MOVE); energyAvailability -= 100; break;
|
||||||
case Role.MINER: body.push(MOVE); energyAvailability -= 50; break;
|
case Role.MINER: body.push(MOVE); energyAvailability -= 100; break;
|
||||||
}
|
}
|
||||||
|
|
||||||
var unitEnergyCost = 0;
|
var unitEnergyCost = 0;
|
||||||
while(unitEnergyCost <= energyAvailability) {
|
while(unitEnergyCost <= energyAvailability) {
|
||||||
switch (role) {
|
switch (role) {
|
||||||
case Role.BUILDER: body.push(WORK); body.push(CARRY); body.push(MOVE); unitEnergyCost = 200; break;
|
case Role.BUILDER: body.push(MOVE); body.push(CARRY); unitEnergyCost = 100; break;
|
||||||
case Role.UPGRADER:
|
case Role.UPGRADER:
|
||||||
case Role.MINER:
|
case Role.MINER:
|
||||||
body.push(WORK); unitEnergyCost = 100;
|
body.push(WORK); unitEnergyCost = 100;
|
||||||
|
|||||||
Reference in New Issue
Block a user