Correct income calcuators

screepers · Mar 18, 2024 · 48a635d · 48a635d
1 parent 394cc44
commit 48a635d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/data/converter/helper.js b/src/data/converter/helper.js
@@ -100,14 +100,12 @@ export function summarizeObjects(objects) {
 export function getIntentEffect(action, originalObject) {
   try {
     switch (action) {
-      case "harvest": {
-        const usableParts = Math.min(Math.floor(originalObject.store.energy / 2), originalObject.groupedBody.work);
+      case "harvest":
         return {
           action,
-          energy: usableParts * 2,
-          effect: (originalObject.groupedBodyEffect.harvest / originalObject.groupedBody.work) * usableParts
-        };
-      }
+          energy: originalObject.groupedBody.work * 2,
+          effect: originalObject.groupedBodyEffect.harvest
+        }
       case "build": {
         const usableParts = Math.min(Math.floor(originalObject.store.energy / 5), originalObject.groupedBody.work);
         return {

diff --git a/tests/dataTypes/owned.spec.js b/tests/dataTypes/owned.spec.js
@@ -765,6 +765,9 @@ describe("Owned data type process check", () => {
         settings.push({
           type: TestHelper.dataTypes.creep, data: {
             0: {
+              store: {
+                energy: 1000,
+              },
               actionLog: {
                 harvest: {
                 },

diff --git a/tests/dataTypes/reserved.spec.js b/tests/dataTypes/reserved.spec.js
@@ -400,6 +400,9 @@ describe("Reserved data type process check", () => {
         settings.push({
           type: TestHelper.dataTypes.creep, data: {
             0: {
+              store: {
+                energy: 1000,
+              },
               actionLog: {
                 harvest: {
                 },