From a045d5955ccb20749f288fdc0e6dab886e878cbe Mon Sep 17 00:00:00 2001
From: logic <923132714@qq.com>
Date: Sat, 31 Jul 2021 11:52:12 +0800
Subject: [PATCH] =?UTF-8?q?FIX=20#35=20=E5=A6=82=E6=9E=9C=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E9=87=8F=E8=B6=85=E8=BF=87=E5=8F=AF=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E9=87=8F=E5=B0=B1=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

因为最后一次采集量超过可存储量，导致洒落
---
 src/role/base/harvester.ts          | 2 +-
 src/role/remote/depositHarvester.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/role/base/harvester.ts b/src/role/base/harvester.ts
index ebb8fc2f..51bd6726 100644
--- a/src/role/base/harvester.ts
+++ b/src/role/base/harvester.ts
@@ -226,7 +226,7 @@ const actionStrategy: ActionStrategy = {
       return creep.pos.isEqualTo(targetPos);
     },
     source: (creep, source) => {
-      if (creep.store.getFreeCapacity(RESOURCE_ENERGY) === 0) return true;
+      if (creep.store.getFreeCapacity(RESOURCE_ENERGY) < creep.getActiveBodyparts(WORK) * 2) return true;
 
       creep.getEnergyFrom(source);
 
diff --git a/src/role/remote/depositHarvester.ts b/src/role/remote/depositHarvester.ts
index 740b6c91..c192660d 100644
--- a/src/role/remote/depositHarvester.ts
+++ b/src/role/remote/depositHarvester.ts
@@ -34,7 +34,7 @@ export const depositHarvester: CreepConfig<"depositHarvester"> = {
 
     // 如果采集满了 / 冷却时间太长 / 自己快死了，就往家跑
     if (
-      creep.store.getFreeCapacity(creep.memory.depositType) <= 0 ||
+      creep.store.getFreeCapacity(RESOURCE_ENERGY) < creep.getActiveBodyparts(WORK) * 2 ||
       (targetFlag.memory.depositCooldown >= 100 && !creep.memory.working) ||
       creep.ticksToLive <= targetFlag.memory.travelTime * 2 + 20
     )