Compare commits

..

8 Commits

Author SHA1 Message Date
d314f52c66 add shortened variable for game.rooms[room] 2022-04-27 00:51:11 -05:00
a70c1f3ec1 add try catch in market check 2022-04-27 00:12:54 -05:00
df46136dbb fix again 2022-04-27 00:07:51 -05:00
9137f805da trying to fix terminal auto sell 2022-04-27 00:02:31 -05:00
1d54eae2a6 fix store to storage 2022-04-26 23:53:30 -05:00
f5c34b6abb fix 2022-04-26 23:52:08 -05:00
eab9643b84 Enable market selling globally 2022-04-26 23:51:44 -05:00
62419d54d8 catch up 2022-04-26 23:41:43 -05:00
5 changed files with 50 additions and 35 deletions

View File

@ -1,58 +1,72 @@
let Phase1 = { let Phase1 = {
run: function(room) { run: function(room) {
let myroom=Game.rooms[room]
require('assignsources').tick(room) require('assignsources').tick(room)
if(Game.time % 10 === 0){ if(Game.time % 1 === 0){
//console.log('processing spawn') //console.log('processing spawn')
let myspawns = Game.rooms[room].find(FIND_MY_SPAWNS)
let myspawns = myroom.find(FIND_MY_SPAWNS)
if(myspawns.length>0){ if(myspawns.length>0){
let myspawn = myspawns[0] let myspawn = myspawns[0]
let creepcount = Game.rooms[room].find(FIND_MY_CREEPS).length let creepcount = myroom.find(FIND_MY_CREEPS).length
creepcounts = _.countBy(Game.rooms[room].find(FIND_MY_CREEPS), c => c.memory.role) creepcounts = _.countBy(myroom.find(FIND_MY_CREEPS), c => c.memory.role)
Game.rooms[room].memory.movercount=creepcounts["mover"] myroom.memory.movercount=creepcounts["mover"]
let workerrolename = 'phase' + Game.rooms[room].memory.phase +'worker' let workerrolename = 'phase' + myroom.memory.phase +'worker'
let sources = Game.rooms[room].find(FIND_SOURCES ) let sources = myroom.find(FIND_SOURCES )
if(Game.rooms[room].controller.ticksToDowngrade < CONTROLLER_DOWNGRADE[Game.rooms[room].controller.level] * .2 ){ if(myroom.controller.ticksToDowngrade < CONTROLLER_DOWNGRADE[myroom.controller.level] * .2 ){
Game.rooms[room].memory.NeedsRecharge=1 myroom.memory.NeedsRecharge=1
console.log(room + " needs Recharge " + Game.rooms[room].memory.NeedsRecharge) console.log(room + " needs Recharge " + myroom.memory.NeedsRecharge)
} }
if(Game.rooms[room].controller.ticksToDowngrade > CONTROLLER_DOWNGRADE[Game.rooms[room].controller.level]*.8){ if(myroom.controller.ticksToDowngrade > CONTROLLER_DOWNGRADE[myroom.controller.level]*.8){
Game.rooms[room].memory.NeedsRecharge=0 myroom.memory.NeedsRecharge=0
} }
if(Game.flags.debug && Game.flags.debug.room == Game.rooms[room]){ if(Game.flags.debug && Game.flags.debug.room == myroom){
console.log(room) console.log(room)
console.log(workerrolename) console.log(workerrolename)
console.log(creepcounts[workerrolename]) console.log(creepcounts[workerrolename])
console.log(Game.rooms[room].energyAvailable + " of " + Game.rooms[room].energyCapacityAvailable) console.log(myroom.energyAvailable + " of " + myroom.energyCapacityAvailable)
} }
if(Game.rooms[room].memory.minablepositions >= 3 ||Game.rooms[room].memory.minablepositions==undefined ){ if(myroom.memory.minablepositions >= 3 ||myroom.memory.minablepositions==undefined ){
if((((creepcounts[workerrolename]< (Game.rooms[room].memory.minablepositions + 1) || creepcounts[workerrolename]==undefined) && Game.rooms[room].energyAvailable >= Game.rooms[room].energyCapacityAvailable) ) || ((creepcounts[workerrolename]==0 || creepcounts[workerrolename]==undefined ) && Game.rooms[room].energyAvailable>100)) { if((((creepcounts[workerrolename]< (myroom.memory.minablepositions + 1) || creepcounts[workerrolename]==undefined) && myroom.energyAvailable >= myroom.energyCapacityAvailable) ) || ((creepcounts[workerrolename]==0 || creepcounts[workerrolename]==undefined ) && myroom.energyAvailable>100)) {
console.log('Spawning worker in ' + room) console.log('Spawning worker in ' + room)
require('proc.spawning').spawnworker(room) require('proc.spawning').spawnworker(room)
} }
} else { } else {
if((((creepcounts['sourceminer']< Game.rooms[room].memory.minablepositions) || creepcounts['sourceminer']==undefined) && Game.rooms[room].energyAvailable >= Game.rooms[room].energyCapacityAvailable) || ((creepcounts['sourceminer']==0 || creepcounts['sourceminer']==undefined ) && Game.rooms[room].energyAvailable>100)) { if((((creepcounts['sourceminer']< myroom.memory.minablepositions) || creepcounts['sourceminer']==undefined) && myroom.energyAvailable >= myroom.energyCapacityAvailable) || ((creepcounts['sourceminer']==0 || creepcounts['sourceminer']==undefined ) && myroom.energyAvailable>100)) {
console.log('Spawning sourceminer in ' + room) console.log('Spawning sourceminer in ' + room)
require('proc.spawning').spawnsourceminer(room) require('proc.spawning').spawnsourceminer(room)
} }
if((((creepcounts[workerrolename]< (Game.rooms[room].memory.minablepositions+1) || creepcounts[workerrolename]==undefined) && Game.rooms[room].energyAvailable >= Game.rooms[room].energyCapacityAvailable) ) || ((creepcounts[workerrolename]==0 || creepcounts[workerrolename]==undefined ) && Game.rooms[room].energyAvailable>100)) { if((((creepcounts[workerrolename]< (myroom.memory.minablepositions+1) || creepcounts[workerrolename]==undefined) && myroom.energyAvailable >= myroom.energyCapacityAvailable) ) || ((creepcounts[workerrolename]==0 || creepcounts[workerrolename]==undefined ) && myroom.energyAvailable>100)) {
console.log('Spawning worker in ' + room) console.log('Spawning worker in ' + room)
require('proc.spawning').spawnworker(room) require('proc.spawning').spawnworker(room)
} }
} }
if((Game.rooms[room].storage || Game.rooms[room].terminal) && (creepcounts["mover"] < 2 || creepcounts["mover"]==undefined)){ if((myroom.storage || myroom.terminal) && (creepcounts["mover"] < 2 || creepcounts["mover"]==undefined)){
console.log("Spawning Mover in " + room) console.log("Spawning Mover in " + room)
require('proc.spawning').spawnmover(room) require('proc.spawning').spawnmover(room)
} }
if((Game.rooms[room].find(FIND_MY_STRUCTURES, {filter: {structureType: STRUCTURE_EXTRACTOR}}).length > 0)&&(creepcounts["miner"] < Game.rooms[room].memory.mineralminablepositions || creepcounts["miner"]==undefined)&&(Game.rooms[room].energyAvailable >= Game.rooms[room].energyCapacityAvailable)){ if((myroom.find(FIND_MY_STRUCTURES, {filter: {structureType: STRUCTURE_EXTRACTOR}}).length > 0)&&(creepcounts["miner"] < myroom.memory.mineralminablepositions || creepcounts["miner"]==undefined)&&(myroom.energyAvailable >= myroom.energyCapacityAvailable)){
if(Game.rooms[room].find(FIND_MINERALS)[0].ticksToRegeneration == undefined || Game.rooms[room].find(FIND_MINERALS)[0].ticksToRegeneration < 1000 ){ if(myroom.find(FIND_MINERALS)[0].ticksToRegeneration == undefined || myroom.find(FIND_MINERALS)[0].ticksToRegeneration < 1000 ){
console.log("Spawning Miner in " + room) console.log("Spawning Miner in " + room)
require('proc.spawning').spawnminer(room) require('proc.spawning').spawnminer(room)
} else { if(Game.flags.debug && Game.flags.debug.room == Game.rooms[room]){console.log("Not spawning miner in " + room + ", waiting for regen")}} } else { if(Game.flags.debug && Game.flags.debug.room == myroom){console.log("Not spawning miner in " + room + ", waiting for regen")}}
}
if(myroom.find(FIND_MY_STRUCTURES, {filter: {structureType: STRUCTURE_TERMINAL}}).length > 0){
console.log("starting market check for room " + room)
try{
let availtosell = myroom.terminal.store.getUsedCapacity([RESOURCE_ENERGY]) - 200000
if(availtosell > 1000){
require('proc.market').sellEnergy(room)
}
}catch{
console.log("Myroom" + myroom)
console.log("Room" + room)
}
} }
//require('proc.market').sellEnergy(room) //require('proc.market').sellEnergy(room)
} }
} }
if(Game.rooms[room].controller.level>2){ } if(myroom.controller.level>2){ }
} }
}; };
module.exports = Phase1; module.exports = Phase1;

View File

@ -21,7 +21,7 @@ let claim = {
if(!Game.flags.claim.room.controller.my){ if(!Game.flags.claim.room.controller.my){
//console.log('not my controller') //console.log('not my controller')
} }
console.log("CreepCount:"+creepcount+"| Lifetime:" + avglife + "|Request Time:" + Game.flags.claim.memory.requesttime ) console.log("Room: " + Game.flags.claim.room + "CreepCount:"+creepcount+"| Lifetime:" + avglife + "|Request Time:" + Game.flags.claim.memory.requesttime )
} }
} }

View File

@ -9,16 +9,16 @@
let gomarket={ let gomarket={
sellEnergy: function(myroom) { sellEnergy: function(myroom) {
try{ try{
let availtosell= Game.rooms[myroom].terminal.store[RESOURCE_ENERGY] let availtosell= Game.rooms[myroom].terminal.storage[RESOURCE_ENERGY]
if(availtosell>5000){ if(availtosell>200000){
console.log(myroom + ":" + availtosell) console.log(myroom + ":" + availtosell)
//console.log(JSON.stringify(Game.market.orders)) //console.log(JSON.stringify(Game.market.orders))
// if(Game.market.orders.length > 9){ // if(Game.market.orders.length > 9){
let myorders = Game.market.getAllOrders(order=>order.resourceType == RESOURCE_ENERGY && order.type == ORDER_BUY) let myorders = Game.market.getAllOrders(order=>order.resourceType == RESOURCE_ENERGY && order.type == ORDER_BUY)
//console.log(myorders.length) //console.log(myorders.length)
for(let i=0; i<myorders.length; i++){ for(let i=0; i<myorders.length; i++){
let recheckavailtosell= Game.rooms[myroom].terminal.store[RESOURCE_ENERGY] let recheckavailtosell= Game.rooms[myroom].terminal.storage[RESOURCE_ENERGY]
if(recheckavailtosell<1000){ if(recheckavailtosell<1000){
console.log("too little to mess with") console.log("too little to mess with")
} else { } else {

View File

@ -36,7 +36,7 @@ let mover={
creep.say('Putting Energy') creep.say('Putting Energy')
creep.travelTo(terminaltarget); creep.travelTo(terminaltarget);
} }
} else if ((creep.ticksToLive < 300 || creep.ticksToLive <= creep.memory.renewto) && (Game.rooms[creep.room.name].find(FIND_MY_SPAWNS, {filter: (r) =>{return ( r.store[RESOURCE_ENERGY]>1)}})) ) { } else if ((creep.ticksToLive < 300 || creep.ticksToLive <= creep.memory.renewto) && (Game.rooms[creep.room.name].find(FIND_MY_SPAWNS, {filter: (r) =>{return ( r.store[RESOURCE_ENERGY]>200)}})) ) {
if(creep.memory.renewto == undefined){ if(creep.memory.renewto == undefined){
creep.memory.renewto = 1200 creep.memory.renewto = 1200
} else { } else {
@ -53,8 +53,8 @@ let mover={
} }
} else { } else {
if(filllevel < creep.carryCapacity){ if(filllevel < creep.carryCapacity){
let storagetarget = creep.pos.findClosestByRange(FIND_STRUCTURES, {filter: (s) => {return ((s.structureType == STRUCTURE_STORAGE || s.structureType == STRUCTURE_CONTAINER) && _.sum(s.store) >= 500) ;}}); let storagetarget = creep.pos.findClosestByRange(FIND_STRUCTURES, {filter: (s) => {return ((s.structureType == STRUCTURE_STORAGE || s.structureType == STRUCTURE_CONTAINER) && _.sum(s.store) >= 10) ;}});
let droppedenergy = creep.pos.findClosestByRange(FIND_DROPPED_RESOURCES, {filter: (r) =>{return ( r.resourceType==RESOURCE_ENERGY&& r.amount>200)}}); let droppedenergy = creep.pos.findClosestByRange(FIND_DROPPED_RESOURCES, {filter: (r) =>{return ( r.resourceType==RESOURCE_ENERGY&& r.amount>10)}});
let tombstone = creep.pos.findClosestByRange(FIND_TOMBSTONES, {filter: (r) =>{return ( r.store[RESOURCE_ENERGY]>200)}}); let tombstone = creep.pos.findClosestByRange(FIND_TOMBSTONES, {filter: (r) =>{return ( r.store[RESOURCE_ENERGY]>200)}});
if((droppedenergy == undefined) && (tombstone==undefined)){ if((droppedenergy == undefined) && (tombstone==undefined)){
if(creep.withdraw(storagetarget,RESOURCE_ENERGY)== ERR_NOT_IN_RANGE) { if(creep.withdraw(storagetarget,RESOURCE_ENERGY)== ERR_NOT_IN_RANGE) {
@ -78,6 +78,9 @@ let mover={
} }
} }
} }
if(!storagetarget && (creep.carry > 0)){
creep.memory.working=true
}
} }
} }
creep.memory.lastpos=creep.pos creep.memory.lastpos=creep.pos

View File

@ -36,8 +36,7 @@ let Phase1Worker = {
let storagetargets = creep.pos.findClosestByRange(FIND_STRUCTURES, {filter: (s) => {return ((s.structureType == STRUCTURE_STORAGE || s.structureType == STRUCTURE_CONTAINER || s.structureType == STRUCTURE_TERMINAL ) && _.sum(s.store) < s.storeCapacity) ;}}); let storagetargets = creep.pos.findClosestByRange(FIND_STRUCTURES, {filter: (s) => {return ((s.structureType == STRUCTURE_STORAGE || s.structureType == STRUCTURE_CONTAINER || s.structureType == STRUCTURE_TERMINAL ) && _.sum(s.store) < s.storeCapacity) ;}});
if(creep.room.memory.NeedsRecharge==1){ if(creep.room.memory.NeedsRecharge==1){
if(creep.upgradeController(creep.room.controller) == ERR_NOT_IN_RANGE) { if(creep.upgradeController(creep.room.controller) == ERR_NOT_IN_RANGE) {
creep.say('!MTRC!') creep.say(creep.room.controller.ticksToDowngrade + " of " + CONTROLLER_DOWNGRADE[creep.room.controller.level] * .2)
creep.say(creep.room.controller.ticksToDowngrade)
creep.moveTo(creep.room.controller) creep.moveTo(creep.room.controller)
} }
} else if((creep.pos.findClosestByPath(FIND_STRUCTURES, {filter: (s) => {return ((([STRUCTURE_SPAWN, STRUCTURE_EXTENSION, STRUCTURE_TOWER].includes(s.structureType)) && s.energy < s.energyCapacity))}}))&& (creep.room.memory.movercount<1||creep.room.memory.movercount==undefined)){ } else if((creep.pos.findClosestByPath(FIND_STRUCTURES, {filter: (s) => {return ((([STRUCTURE_SPAWN, STRUCTURE_EXTENSION, STRUCTURE_TOWER].includes(s.structureType)) && s.energy < s.energyCapacity))}}))&& (creep.room.memory.movercount<1||creep.room.memory.movercount==undefined)){
@ -68,7 +67,7 @@ let Phase1Worker = {
creep.moveTo(Game.rooms[creep.memory.assignedroom].controller,{ignoreCreeps:ignorecreeps}) creep.moveTo(Game.rooms[creep.memory.assignedroom].controller,{ignoreCreeps:ignorecreeps})
} }
} }
} else if ((creep.ticksToLive < 300 || creep.ticksToLive <= creep.memory.renewto) && (Game.rooms[creep.room.name].find(FIND_MY_SPAWNS, {filter: (r) =>{return ( r.store[RESOURCE_ENERGY]>1)}})) ) { } else if ((creep.ticksToLive < 300 || creep.ticksToLive <= creep.memory.renewto) && (Game.rooms[creep.room.name].find(FIND_MY_SPAWNS, {filter: (r) =>{return ( r.store[RESOURCE_ENERGY]>200)}})) ) {
if(creep.memory.renewto == undefined){ if(creep.memory.renewto == undefined){
creep.memory.renewto = 1200 creep.memory.renewto = 1200
} else { } else {
@ -81,8 +80,7 @@ let Phase1Worker = {
let spawn = creep.pos.findClosestByRange(FIND_MY_SPAWNS) let spawn = creep.pos.findClosestByRange(FIND_MY_SPAWNS)
if(creep.room.memory.NeedsRecharge==1 && creep.carry.energy>0){ if(creep.room.memory.NeedsRecharge==1 && creep.carry.energy>0){
if(creep.upgradeController(creep.room.controller) == ERR_NOT_IN_RANGE) { if(creep.upgradeController(creep.room.controller) == ERR_NOT_IN_RANGE) {
creep.say('!MTRC!') creep.say(creep.room.controller.ticksToDowngrade + " of " + (CONTROLLER_DOWNGRADE[creep.room.controller.level] * .2))
creep.say(creep.room.controller.ticksToDowngrade)
creep.moveTo(creep.room.controller) creep.moveTo(creep.room.controller)
} }
} else { } else {