From 48a635d5a04cca69071fedc5428ff58de24318d3 Mon Sep 17 00:00:00 2001
From: Pieter <pieterbrandsen2@gmail.com>
Date: Mon, 18 Mar 2024 15:04:12 +0000
Subject: [PATCH] Correct income calcuators

---
 src/data/converter/helper.js     | 10 ++++------
 tests/dataTypes/owned.spec.js    |  3 +++
 tests/dataTypes/reserved.spec.js |  3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/data/converter/helper.js b/src/data/converter/helper.js
index f1110ac..119b391 100644
--- 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
index 53cc97d..65ec3dd 100644
--- 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
index f4df854..5d627e1 100644
--- 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: {
                 },