Minor changes
This commit is contained in:
@@ -17,7 +17,7 @@ module.exports = {
|
||||
}
|
||||
|
||||
function GetEnergy(creep){
|
||||
if(!creep.memory.target) findWithdrawTarget(creep);
|
||||
if(!creep.memory.target) findEnergyTarget(creep);
|
||||
const target = Game.getObjectById(creep.memory.target);
|
||||
if(!target) creep.memory.target = undefined;
|
||||
if(creep.pos.isNearTo(target)) {
|
||||
@@ -53,8 +53,16 @@ function energyEmptyCheck(creep){
|
||||
}
|
||||
}
|
||||
|
||||
function findWithdrawTarget(creep){
|
||||
var target = creep.pos.findClosestByRange(FIND_DROPPED_RESOURCES, {
|
||||
function findEnergyTarget(creep){
|
||||
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)=>{
|
||||
return r.resourceType == RESOURCE_ENERGY && r.amount > creep.store.getFreeCapacity(RESOURCE_ENERGY);
|
||||
}});
|
||||
@@ -66,10 +74,7 @@ function findWithdrawTarget(creep){
|
||||
filter: (t)=>{
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user