From 5d2c81c372b24bbe364e7aca9ec06ffeb147188c Mon Sep 17 00:00:00 2001
From: alex <alexandazar@gmail.com>
Date: Tue, 23 Nov 2021 15:56:40 -0800
Subject: [PATCH] Use constants for movement fatigue

---
 src/game/rooms.js                    | 18 +++++++++---------
 src/processor/common/fake-runtime.js |  6 +++---
 src/processor/intents/movement.js    |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/game/rooms.js b/src/game/rooms.js
index f2bac2e1..1bd1d509 100644
--- a/src/game/rooms.js
+++ b/src/game/rooms.js
@@ -46,14 +46,14 @@ function makePathfindingGrid(id, opts, endNodesKey) {
     for(var y=0; y<50; y++) {
         rows[y] = new Array(50);
         for(var x=0; x<50; x++) {
-            rows[y][x] = x == 0 || y == 0 || x == 49 || y == 49 ? 11 : 2;
+            rows[y][x] = x == 0 || y == 0 || x == 49 || y == 49 ? 11 : C.MOVE_FATIGUE_PLAINS;
             //var terrainCode = register.terrainByRoom.spatial[id][y][x];
             var terrainCode = runtimeData.staticTerrainData[id][y*50+x];
             if(terrainCode & C.TERRAIN_MASK_WALL) {
                 rows[y][x] = 0;
             }
-            if ((terrainCode & C.TERRAIN_MASK_SWAMP) && rows[y][x] == 2) {
-                rows[y][x] = 10;
+            if ((terrainCode & C.TERRAIN_MASK_SWAMP) && rows[y][x] == C.MOVE_FATIGUE_PLAINS) {
+                rows[y][x] = C.MOVE_FATIGUE_SWAMP;
             }
         }
     }
@@ -183,11 +183,11 @@ function makePathfindingGrid2(id, opts) {
             }
 
             if (object.type == 'swamp' && costs.get(object.x, object.y) == 0) {
-                costs.set(object.x, object.y, opts.ignoreRoads ? 5 : 10);
+                costs.set(object.x, object.y, opts.ignoreRoads ? ~~(C.MOVE_FATIGUE_SWAMP / C.MOVE_FATIGUE_PLAINS) : C.MOVE_FATIGUE_SWAMP);
             }
 
             if (!opts.ignoreRoads && object.type == 'road' && costs.get(object.x, object.y) < 0xFF) {
-                costs.set(object.x, object.y, 1);
+                costs.set(object.x, object.y, C.MOVE_FATIGUE_ROAD);
             }
         });
     }
@@ -255,8 +255,8 @@ function _findPath2(id, fromPos, toPos, opts) {
         maxRooms: opts.maxRooms
     };
     if(!opts.ignoreRoads) {
-        searchOpts.plainCost = 2;
-        searchOpts.swampCost = 10;
+        searchOpts.plainCost = C.MOVE_FATIGUE_PLAINS;
+        searchOpts.swampCost = C.MOVE_FATIGUE_SWAMP;
     }
     if(opts.plainCost) {
         searchOpts.plainCost = opts.plainCost;
@@ -352,8 +352,8 @@ function _findClosestByPath2(fromPos, objects, opts) {
         maxRooms: 1
     };
     if(!opts.ignoreRoads) {
-        searchOpts.plainCost = 2;
-        searchOpts.swampCost = 10;
+        searchOpts.plainCost = C.MOVE_FATIGUE_PLAINS;
+        searchOpts.swampCost = C.MOVE_FATIGUE_SWAMP;
     }
     var ret = globals.PathFinder.search(fromPos, goals, searchOpts);
 
diff --git a/src/processor/common/fake-runtime.js b/src/processor/common/fake-runtime.js
index b40fdebc..96870c7d 100644
--- a/src/processor/common/fake-runtime.js
+++ b/src/processor/common/fake-runtime.js
@@ -129,7 +129,7 @@ const defaultCostMatrix = function defaultCostMatrix(roomId, opts, creep, roomOb
         }
 
         if (object.type == 'swamp' && costs.get(object.x, object.y) == 0) {
-            costs.set(object.x, object.y, opts.ignoreRoads ? 5 : 10);
+            costs.set(object.x, object.y, opts.ignoreRoads ? ~~(C.MOVE_FATIGUE_SWAMP / C.MOVE_FATIGUE_PLAINS) : C.MOVE_FATIGUE_SWAMP);
         }
 
         if (!opts.ignoreRoads && object.type == 'road' && costs.get(object.x, object.y) < Infinity) {
@@ -160,8 +160,8 @@ const findPath = function findPath(source, target, opts, scope) {
     searchOpts.maxRooms = 1;
     searchOpts.roomCallback = roomCallback;
     if(!searchOpts.ignoreRoads) {
-        searchOpts.plainCost = 2;
-        searchOpts.swampCost = 10;
+        searchOpts.plainCost = C.MOVE_FATIGUE_PLAINS;
+        searchOpts.swampCost = C.MOVE_FATIGUE_SWAMP;
     }
 
     const fromPos = new RoomPosition(source.x, source.y, source.room);
diff --git a/src/processor/intents/movement.js b/src/processor/intents/movement.js
index caf97029..ec4aa801 100644
--- a/src/processor/intents/movement.js
+++ b/src/processor/intents/movement.js
@@ -201,17 +201,17 @@ exports.execute = function(object, scope) {
 
     var cellObjects = _.filter(roomObjects, (i) => i.x == move.x && i.y == move.y);
 
-    var fatigueRate = 2;
+    var fatigueRate = C.MOVE_FATIGUE_PLAINS;
 
     if(_.any(cellObjects, {type: 'swamp'}) ||
         utils.checkTerrain(roomTerrain, move.x, move.y, C.TERRAIN_MASK_SWAMP)) {
-        fatigueRate = 10;
+        fatigueRate = C.MOVE_FATIGUE_SWAMP;
     }
 
     var road = _.find(cellObjects, {type: 'road'});
 
     if(road) {
-        fatigueRate = 1;
+        fatigueRate = C.MOVE_FATIGUE_ROAD;
         if(object.type == 'powerCreep') {
             road.nextDecayTime -= C.ROAD_WEAROUT_POWER_CREEP;
         }