Added gcl/rclPerTick difference

screepers · Feb 16, 2024 · 402b7cb · 402b7cb
1 parent 94151f9
commit 402b7cb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/src/data/converter/manage/ownedRoom.js b/src/data/converter/manage/ownedRoom.js
@@ -300,8 +300,12 @@ export default async function handleObjects(data, opts) {
   // #region Controller
 
   if (controller) {
-    actions.push(ActionProcessor.CreateAction('controller.rclPerTick', controller._upgraded || 0,
+    actions.push(ActionProcessor.CreateAction('controller.gclPerTick', controller._upgraded || 0,
       ActionProcessor.ActionType.Divide100))
+    if (controller.level < 8) {
+      actions.push(ActionProcessor.CreateAction('controller.rclPerTick', controller._upgraded || 0,
+        ActionProcessor.ActionType.Divide100))
+    }
   }
 
   // #endregion

diff --git a/src/data/converter/prepare/object.js b/src/data/converter/prepare/object.js
@@ -15,6 +15,7 @@ export default async function prepareObject(object, originalObject) {
 
   switch (object.type) {
     case 'controller':
+      object.level = originalObject.level;
       if (object._upgraded || object._upgraded === null) {
         originalObject._upgraded = object._upgraded;
         if (object._upgraded === null) object._upgraded = 0;

diff --git a/tests/dataTypes/owned.spec.js b/tests/dataTypes/owned.spec.js
@@ -693,7 +693,7 @@ describe("Owned data type process check", () => {
     })
   })
   describe("Every tick", () => {
-    describe('should handle controller rclPerTick correctly', () => {
+    describe('should handle controller gcl/rclPerTick correctly', () => {
       it('should handle static non changing values', async () => {
         for (let i = 1; i <= 10; i += 1) {
           const settings = [{
@@ -706,7 +706,7 @@ describe("Owned data type process check", () => {
 
           const data = await testHelper1.process(settings)
           const base = data.stats.users[data.opts.username].stats.combined.shards[data.opts.shard]
-          expect(base.controller.rclPerTick).toBe(Math.round(i * 0.99 * 100) / 100)
+          expect(base.controller.gclPerTick).toBe(Math.round(i * 0.99 * 100) / 100)
         }
       })
       it('should handle fluctuating values', async () => {
@@ -730,7 +730,32 @@ describe("Owned data type process check", () => {
 
           const data = await testHelper1.process(settings)
           const base = data.stats.users[data.opts.username].stats.combined.shards[data.opts.shard]
-          expect(base.controller.rclPerTick).toBe(i * 0.5625)
+          expect(base.controller.gclPerTick).toBe(i * 0.5625)
+        }
+      })
+      it('should handle controller level rclPerTick correctly', async () => {
+        for (let i = 1; i <= 8; i += 1) {
+          const settings = [{
+            type: TestHelper.dataTypes.controller, data: {
+              0: {
+                level: i,
+                _upgraded: 1
+              },
+              25: {
+                _upgraded: 0.75
+              },
+              50: {
+                _upgraded: 0.5
+              },
+              75: {
+                _upgraded: null
+              }
+            }
+          }]
+
+          const data = await testHelper1.process(settings)
+          const base = data.stats.users[data.opts.username].stats.combined.shards[data.opts.shard]
+          expect(base.controller.rclPerTick).toBe(i < 8 ? 0.5625 : 0)
         }
       })
     })