diff --git a/Role_Worker.js b/Role_Worker.js index 6896ffd..9ceca48 100644 --- a/Role_Worker.js +++ b/Role_Worker.js @@ -49,7 +49,7 @@ module.exports = ({ creep.room.memory.moveResource = null; } else if (actionResult != OK) { logger.info(`[${creep}]存储结果出错：${actionResult}`); - logger.info(`[${creep.name}]当前目标：${creep.room.memory.moveResource}`); + logger.info(`[${creep.name}]当前被指派搬运物品：${creep.room.memory.moveResource}`); } } else { logger.info(`[${creep.name}]缺失存储货物目标`); diff --git a/Room_Extension.js b/Room_Extension.js index 9913640..231552a 100644 --- a/Room_Extension.js +++ b/Room_Extension.js @@ -1,4 +1,3 @@ -// 引入 creep 配置项 const logger = require('utils.log').getLogger("Room_Extension"); //自定义的 Room 的拓展 @@ -37,6 +36,9 @@ const roomExtension = { }, getRatioOfEnergy() { return this.energyAvailable / this.energyCapacityAvailable; + }, + factory: function (){ + return global.roomData.get(this.name).factory; } } diff --git a/config.creep.js b/config.creep.js index ef0e9ec..9bdba5c 100644 --- a/config.creep.js +++ b/config.creep.js @@ -48,15 +48,18 @@ module.exports = { Mover_E8S25: mover, Mover_E9S23: mover, Mover_E8S26: mover, + Mover_E7S22: mover, Upgrader_E6S22_1: upgrader, Upgrader_E9S21_1: upgrader, Upgrader_E8S23_1: upgrader, Upgrader_E8S25_1: upgrader, Upgrader_E9S23_1: upgrader, - //Upgrader_E8S26_1: upgrader, + Upgrader_E9S23_2: upgrader, + Upgrader_E8S26_1: upgrader, Upgrader_E8S26_2: upgrader, - Upgrader_E7S22_2: upgrader, + Upgrader_E7S22_1: upgrader, + //Upgrader_E7S22_2: upgrader, Builder_E6S22: builder, Builder_E9S21: builder, @@ -66,8 +69,8 @@ module.exports = { Builder_E8S26: builder, Builder_E7S22: builder, - // Worker_E6S22: worker, - // Worker_E9S21: worker, + Worker_E6S22: worker, + Worker_E9S21: worker, Worker_E8S23: worker, Worker_E8S25: worker, @@ -79,6 +82,7 @@ module.exports = { Miner_03: miner, Miner_04: miner, Miner_05: miner, + Miner_06: miner, //Dismantler_01: dismantler({targetId: '5ee80ec2125ddf483806c850', targetRoom: 'E7S25'}), @@ -94,10 +98,7 @@ module.exports = { * pathFinderPoint:辅助寻路点位，尚在开发功能 */ OuterClaimer_E6S22_1: claimer({ - targetRoomName: ['E5S22', 'E5S21'], - }), - OuterClaimer_E6S22_2: claimer({ - targetRoomName: ['E6S23', 'E5S22'], + targetRoomName: ['E5S22', 'E5S21', 'E6S23'], }), // OuterClaimer_E9S21_1: claimer({ // targetRoomName: ['E9S22', 'E8S21'], @@ -117,30 +118,30 @@ module.exports = { * targetId:能量储存点 * pathFinderPoint:辅助寻路点位，尚在开发功能 */ - // OuterHarvester_E5S21_01: outerharvester({ - // sourceId: OUTERWORLD_CONFIG.E5S21[0][0], - // targetRoomName: "E5S21", - // targetId: OUTERWORLD_CONFIG.E5S21[0][1], - // pathFinderPoint: [[49, 21]] - // }), - // OuterHarvester_E5S21_02: outerharvester({ - // sourceId: OUTERWORLD_CONFIG.E5S21[1][0], - // targetRoomName: "E5S21", - // targetId: OUTERWORLD_CONFIG.E5S21[1][1], - // pathFinderPoint: [[38, 0]] - // }), + OuterHarvester_E5S21_01: outerharvester({ + sourceId: OUTERWORLD_CONFIG.E5S21[0][0], + targetRoomName: "E5S21", + targetId: OUTERWORLD_CONFIG.E5S21[0][1], + pathFinderPoint: [[49, 21]] + }), + OuterHarvester_E5S21_02: outerharvester({ + sourceId: OUTERWORLD_CONFIG.E5S21[1][0], + targetRoomName: "E5S21", + targetId: OUTERWORLD_CONFIG.E5S21[1][1], + pathFinderPoint: [[38, 0]] + }), OuterHarvester_E5S22: outerharvester({ sourceId: OUTERWORLD_CONFIG.E5S22[0][0], targetRoomName: "E5S22", targetId: OUTERWORLD_CONFIG.E5S22[0][1], pathFinderPoint: [[38, 0]] }), - // OuterHarvester_E6S23: outerharvester({ - // sourceId: OUTERWORLD_CONFIG.E6S23[0][0], - // targetRoomName: "E6S23", - // targetId: OUTERWORLD_CONFIG.E6S23[0][1], - // pathFinderPoint: [[38, 0]] - // }), + OuterHarvester_E6S23: outerharvester({ + sourceId: OUTERWORLD_CONFIG.E6S23[0][0], + targetRoomName: "E6S23", + targetId: OUTERWORLD_CONFIG.E6S23[0][1], + pathFinderPoint: [[38, 0]] + }), OuterHarvester_E8S24: outerharvester({ sourceId: OUTERWORLD_CONFIG.E8S24[0][0], targetRoomName: "E8S24", @@ -185,8 +186,8 @@ module.exports = { * targetRoomName:所要去的房间名称 * pathFinderPoint:辅助寻路点位，尚在开发功能 */ - OuterBuilder_E6S22_1: outbuilder({sourceId: "5eb929deb5f373e902a1d7d7", targetRoomName: "E5S22"}), - // OuterBuilder_E6S22_2: outbuilder({sourceId: CONFIG.STORAGE.E6S22, targetRoomName: "E5S21"}), + //OuterBuilder_E6S22_1: outbuilder({sourceId: "5eb929deb5f373e902a1d7d7", targetRoomName: "E6S23"}), + //OuterBuilder_E6S22_2: outbuilder({sourceId: "5eb929deb5f373e902a1d7d7", targetRoomName: "E5S21"}), // OuterBuilder_E6S22_3: outbuilder({sourceId: CONFIG.STORAGE.E6S22, targetRoomName: "E5S21"}), // OuterBuilder_E6S22_4: outbuilder({sourceId: CONFIG.STORAGE.E6S22, targetRoomName: "E5S21"}), //OuterBuilder_E9S21_1: outbuilder({sourceId: "", targetRoomName: "E7S22"}), @@ -200,22 +201,22 @@ module.exports = { * targetRoomName:所要去的外矿房间名称 * targetId:能量存储目标建筑 */ - // OuterMover_E5S21_1: outmover({ - // sourceId: OUTERWORLD_CONFIG.E5S21[0][1], - // targetRoomName: "E5S21", - // }), - // OuterMover_E5S21_2: outmover({ - // sourceId: OUTERWORLD_CONFIG.E5S21[1][1], - // targetRoomName: "E5S21", - // }), + OuterMover_E5S21_1: outmover({ + sourceId: OUTERWORLD_CONFIG.E5S21[0][1], + targetRoomName: "E5S21", + }), + OuterMover_E5S21_2: outmover({ + sourceId: OUTERWORLD_CONFIG.E5S21[1][1], + targetRoomName: "E5S21", + }), OuterMover_E5S22: outmover({ sourceId: OUTERWORLD_CONFIG.E5S22[0][1], targetRoomName: "E5S22", }), - // OuterMover_E6S23: outmover({ - // sourceId: OUTERWORLD_CONFIG.E6S23[0][1], - // targetRoomName: "E6S23", - // }), + OuterMover_E6S23: outmover({ + sourceId: OUTERWORLD_CONFIG.E6S23[0][1], + targetRoomName: "E6S23", + }), OuterMover_E9S24: outmover({ sourceId: OUTERWORLD_CONFIG.E9S24[0][1], targetRoomName: "E9S24", @@ -262,7 +263,6 @@ module.exports = { //Colonist: colonist({ targetRoomName: "E7S22"}), - // SpecialMover_E9S21: specialMover({ // sourceId: CONFIG.FACTORY.E9S21, // targetRoomName: "E9S21", @@ -277,13 +277,13 @@ module.exports = { // resourceType: RESOURCE_ENERGY, // targetAmount: 0 // }), - // SpecialMover_E8S23_1: specialMover({ - // sourceId: "5ed350c046178209ed85ec18", - // targetRoomName: "E8S23", - // targetId: "5ee356fc9902b64ce072c67f", - // resourceType: RESOURCE_ENERGY, - // targetAmount: 300000 - // }), + SpecialMover_E8S23_1: specialMover({ + sourceId: "5ed350c046178209ed85ec18", + targetRoomName: "E8S23", + targetId: "5ee356fc9902b64ce072c67f", + resourceType: RESOURCE_ENERGY, + targetAmount: 300000 + }), // SpecialMover_E8S25: specialMover({ // sourceId: "5f06846679f58420cb17ed04", // targetRoomName: "E8S25", @@ -291,6 +291,13 @@ module.exports = { // resourceType: RESOURCE_ENERGY, // targetAmount: 240000 // }), + SpecialMover_E8S26: specialMover({ + sourceId: "5f34ad65f66708bbb31ab441", + targetRoomName: "E8S26", + targetId: "5f1ef584fa4dc302abc139f7", + resourceType: RESOURCE_ENERGY, + targetAmount: 0 + }), //RemoteUpgrader: remoteupgrader({targetRoomName: "E5S21"}), // RemoteUpgrader_E9S21_1: remoteupgrader({targetRoomName: "E7S22"}), diff --git a/config.creep.template.js b/config.creep.template.js index 2fc8e3d..c7eb91a 100644 --- a/config.creep.template.js +++ b/config.creep.template.js @@ -85,13 +85,13 @@ module.exports = { // Room 6 Harvester_E8S26_0: ({ genMode: "Config", - partsSet: [[WORK, 8], [MOVE, 8], [CARRY, 8]], + partsSet: [[WORK, 10], [MOVE, 6], [CARRY, 2]], spawnName: "SouthGuard", roomName: "E8S26" }), Harvester_E8S26_1: ({ genMode: "Config", - partsSet: [[WORK, 8], [MOVE, 8], [CARRY, 8]], + partsSet: [[WORK, 10], [MOVE, 6], [CARRY, 2]], spawnName: "SouthGuard", roomName: "E8S26" }), @@ -137,30 +137,43 @@ module.exports = { // Room 4 Upgrader_E8S25_1: ({ genMode: "Config", - partsSet: [[WORK, 14], [MOVE, 9], [CARRY, 4]], + partsSet: [[WORK, 16], [MOVE, 10], [CARRY, 4]], spawnName: "Downtown", roomName: "E8S25" }), // Room5 Upgrader_E9S23_1: ({ genMode: "Config", - partsSet: [[WORK, 10], [MOVE, 7], [CARRY, 4]], + partsSet: [[WORK, 12], [MOVE, 8], [CARRY, 4]], spawnName: "EastGuar", roomName: "E9S23" }), - // Room6 - Upgrader_E8S26_1: ({ + Upgrader_E9S23_2: ({ genMode: "Config", - partsSet: [[WORK, 8], [MOVE, 8], [CARRY, 8]], + partsSet: [[WORK, 12], [MOVE, 8], [CARRY, 4]], spawnName: "EastGuar", roomName: "E9S23" }), + // Room6 + Upgrader_E8S26_1: ({ + genMode: "Config", + partsSet: [[WORK, 12], [MOVE, 8], [CARRY, 4]], + spawnName: "SouthGuard", + roomName: "E8S26" + }), Upgrader_E8S26_2: ({ genMode: "Config", - partsSet: [[WORK, 10], [MOVE, 7], [CARRY, 4]], + partsSet: [[WORK, 12], [MOVE, 8], [CARRY, 4]], spawnName: "SouthGuard", roomName: "E8S26" }), + // Room7 + Upgrader_E7S22_1: ({ + genMode: "Config", + partsSet: [[WORK, 8], [MOVE, 8], [CARRY, 8]], + spawnName: "CenterRoom", + roomName: "E7S22" + }), Upgrader_E7S22_2: ({ genMode: "Config", partsSet: [[WORK, 8], [MOVE, 8], [CARRY, 8]], @@ -281,10 +294,16 @@ module.exports = { }), Mover_E8S26: ({ genMode: "Config", - partsSet: [[WORK, 0], [MOVE, 4], [CARRY, 4]], + partsSet: [[WORK, 0], [MOVE, 8], [CARRY, 8]], spawnName: "SouthGuard", roomName: "E8S26" }), + Mover_E7S22: ({ + genMode: "Config", + partsSet: [[WORK, 0], [MOVE, 8], [CARRY, 8]], + spawnName: "CenterRoom", + roomName: "E7S22" + }), /** * OuterHarvester模板文件 @@ -352,7 +371,7 @@ module.exports = { OuterClaimer_E6S22_1: ({ genMode: "Config", - partsSet: [[MOVE, 3], [CLAIM, 3]], + partsSet: [[MOVE, 4], [CLAIM, 4]], spawnName: "Home-Top", roomName: "E6S22" }), @@ -544,6 +563,12 @@ module.exports = { spawnName: "EastGuar", roomName: "E9S23" }), + Miner_06: ({ + genMode: "Config", + partsSet: [[WORK, 5], [MOVE, 10], [CARRY, 5]], + spawnName: "SouthGuard", + roomName: "E8S26" + }), SpecialMover_E9S21: ({ genMode: "Config", @@ -569,6 +594,12 @@ module.exports = { spawnName: "Downtown", roomName: "E8S25" }), + SpecialMover_E8S26: ({ + genMode: "Config", + partsSet: [[MOVE, 3], [CARRY, 6]], + spawnName: "SouthGuard", + roomName: "E8S26" + }), RemoteUpgrader: ({ genMode: "Config", diff --git a/config.js b/config.js index 1dd41fa..298c5c1 100644 --- a/config.js +++ b/config.js @@ -25,14 +25,15 @@ module.exports = { E9S21: [['5bbcb32440062e4259e9411f'], ['Miner_02']], E8S23: [['5bbcb31940062e4259e940b5'], ['Miner_03']], E8S25: [['5bbcb31940062e4259e940b7'], ['Miner_04']], - E9S23: [['5bbcb32440062e4259e94121'], ['Miner_05']] + E9S23: [['5bbcb32440062e4259e94121'], ['Miner_05']], + E8S26: [['5bbcb31940062e4259e940b8'], ['Miner_06']], }), // External Rooms 外矿房间列表与对应镇守的 Creeps EXTERNAL_ROOMS: ({ E6S22: [["E6S23", "E5S22", "E5S21"], ["ResidentDefender_E6S22"]], E9S21: [["E8S21", "E9S22"], ["ResidentDefender_E9S21"]], - E8S23: [["E9S23", "E8S24", "E7S23"], ["ResidentDefender_E8S23"]] + E8S23: [["E9S24", "E8S24", "E7S23"], ["ResidentDefender_E8S23"]] }), //需要远程监控的房间 diff --git a/config.outerworld.js b/config.outerworld.js index 7065fb5..ffbedae 100644 --- a/config.outerworld.js +++ b/config.outerworld.js @@ -1,9 +1,9 @@ // 外矿 id 与其对应 Container module.exports = { // [n][0]为矿物 id ,[n][1]为 Container id - E5S21: [['5bbcad3a9099fc012e636e4b', '5ef8326d892531028bb766f6'], ['5bbcad3a9099fc012e636e49', '5efbfa18b538e73bbc590522']], + E5S21: [['5bbcad3a9099fc012e636e4b', '5f32189eaa388b61a790cc30'], ['5bbcad3a9099fc012e636e49', '5f322ebf61a3e70e4708467b']], E5S22: [['5bbcad3a9099fc012e636e4e', '5f31ffe8a26934d40b958c87']], - E6S23: [['5bbcad489099fc012e637092', '5efc728edfe2ff7e2bf91dda']], + E6S23: [['5bbcad489099fc012e637092', '5f32306519ce9e6a7942607d']], E8S21: [['5bbcad6c9099fc012e6373e9', '5efc583406bba53517a919a3']], E9S22: [['5bbcad7a9099fc012e637578', '5efc97da8d54b262e821777f'], ['5bbcad7a9099fc012e63757a', '5efc91c98d54b2a402217578']], E9S23: [['5bbcad7b9099fc012e63757d', '5ef83746c1b8855715d312f6'], ['5bbcad7b9099fc012e63757e', '5ef8412473c213159115edc6']], diff --git a/main.js b/main.js index 89b482a..65afe43 100644 --- a/main.js +++ b/main.js @@ -35,7 +35,8 @@ module.exports.loop = function () { const result = Game.cpu.generatePixel(); - //Game.market.changeOrderPrice('5f028c760de21e2368f00c31', 0.65); + //logger.info(Game.market.changeOrderPrice('5f316d477e0cdd524ac85843', 0.99)) + //Game.market.cancelOrder('5f1fc4e464b6561cae9fb6a5'); diff --git a/utils.mount.js b/utils.mount.js index 1f19041..880e135 100644 --- a/utils.mount.js +++ b/utils.mount.js @@ -32,16 +32,16 @@ function createOrder() { logger.info("正在创建订单...") Game.market.createOrder({ type: ORDER_SELL, - resourceType: RESOURCE_LEMERGIUM_BAR, - price: 0.99, + resourceType: RESOURCE_ZYNTHIUM_BAR, + price: 0.449, totalAmount: 100000, - roomName: "E8S25" + roomName: "E6S22" }); } function sendJob(){ logger.info("正在执行传输任务...") - Game.rooms['E8S23'].terminal.send(RESOURCE_ENERGY, 130000, 'E6S22'); + Game.rooms['E8S23'].terminal.send(RESOURCE_ENERGY, 100000, 'E8S26'); } module.exports = function () { @@ -54,6 +54,6 @@ module.exports = function () { //createOrder(); - //sendJob(); + sendJob(); } } \ No newline at end of file