Refactoring

src/DashboardView/VillageStateList.vue

@@ -30,7 +30,7 @@
               <filling
                 :value="villageState.resources.lumber"
                 :warning="villageState.storageOptimumFullness.lumber"
-                :critical="villageState.upperCriticalLevel.lumber"
+                :critical="villageState.storageCriticalFullness.lumber"
                 :full="villageState.storage.capacity.lumber"
               ></filling>
             </td>
@@ -38,7 +38,7 @@
               <filling
                 :value="villageState.resources.clay"
                 :warning="villageState.storageOptimumFullness.clay"
-                :critical="villageState.upperCriticalLevel.clay"
+                :critical="villageState.storageCriticalFullness.clay"
                 :full="villageState.storage.capacity.clay"
               ></filling>
             </td>
@@ -46,7 +46,7 @@
               <filling
                 :value="villageState.resources.iron"
                 :warning="villageState.storageOptimumFullness.iron"
-                :critical="villageState.upperCriticalLevel.iron"
+                :critical="villageState.storageCriticalFullness.iron"
                 :full="villageState.storage.capacity.iron"
               ></filling>
             </td>
@@ -54,7 +54,7 @@
               <filling
                 :value="villageState.resources.crop"
                 :warning="villageState.storageOptimumFullness.crop"
-                :critical="villageState.upperCriticalLevel.crop"
+                :critical="villageState.storageCriticalFullness.crop"
                 :full="villageState.storage.capacity.crop"
               ></filling>
             </td>

src/VillageState.ts

@@ -53,10 +53,6 @@ interface VillageProductionQueueState {
     taskCount: number;
 }
 
-interface VillageProductionQueueStateDict {
-    [queue: string]: VillageProductionQueueState;
-}
-
 interface VillageOwnState {
     /**
      * Village id
@@ -72,24 +68,16 @@ interface VillageOwnState {
     resources: Resources;
     performance: Resources;
     storage: VillageStorageState;
-    upperCriticalLevel: Resources;
     storageOptimumFullness: Resources;
+    storageCriticalFullness: Resources;
     isOverflowing: boolean;
-    queues: VillageProductionQueueStateDict;
+    queues: Array<VillageProductionQueueState>;
     tasks: Array<Task>;
     firstReadyTask: Task | undefined;
     /**
      * Required resources for nearest task
      */
     required: ResourceLineState;
-    /**
-     * Required resources for first tasks in production queues
-     */
-    frontierRequired: ResourceLineState;
-    /**
-     * Required resources for all tasks
-     */
-    totalRequired: ResourceLineState;
     incomingResources: Resources;
     settings: VillageSettings;
 }
@@ -105,7 +93,7 @@ export interface VillageState extends VillageOwnState {
     commitments: Resources;
 }
 
-function makeResourceBalance(
+function makeResourceState(
     resources: Resources,
     current: Resources,
     performance: Resources
@@ -118,7 +106,7 @@ function makeResourceBalance(
     };
 }
 
-function makeStorageBalance(
+function makeStorageState(
     resources: Resources,
     storage: Resources,
     performance: Resources
@@ -185,8 +173,8 @@ function createProductionQueueState(
             taskEndingTimestamp ? taskEndingTimestamp - currentTimestamp : 0,
             0
         ),
-        firstTask: makeResourceBalance(firstTaskResources, resources, performance),
+        firstTask: makeResourceState(firstTaskResources, resources, performance),
-        allTasks: makeResourceBalance(allTaskResources, resources, performance),
+        allTasks: makeResourceState(allTaskResources, resources, performance),
         taskCount: tasks.length,
     };
 }
@@ -195,31 +183,30 @@ function createAllProductionQueueStates(
     storage: VillageStorage,
     taskCollection: VillageTaskCollection
 ) {
-    let result: VillageProductionQueueStateDict = {};
+    let result: Array<VillageProductionQueueState> = [];
     for (let taskQueueInfo of taskCollection.getGroupedByQueueTasks()) {
-        result[taskQueueInfo.queue] = createProductionQueueState(taskQueueInfo, storage);
+        result.push(createProductionQueueState(taskQueueInfo, storage));
     }
     return result;
 }
 
 function getReadyForProductionTask(
-    queues: VillageProductionQueueStateDict,
+    queues: ReadonlyArray<VillageProductionQueueState>,
     maxResourcesForTask: Resources
 ): Task | undefined {
-    const firstReadyGroup = Object.values(queues).find(group => group.isWaiting);
+    const firstReadyQueue = queues.find(queue => queue.isWaiting);
-    if (!firstReadyGroup) {
+    if (!firstReadyQueue) {
         return undefined;
     }
 
-    return firstReadyGroup.tasks.find(
+    return firstReadyQueue.tasks.find(
-        t =>
+        task =>
-            t.name === TrainTroopTask.name ||
+            task.name === TrainTroopTask.name ||
-            !t.args.resources ||
+            maxResourcesForTask.allGreaterOrEqual(getTaskResources(task))
-            maxResourcesForTask.allGreaterOrEqual(Resources.fromObject(t.args.resources))
     );
 }
 
-function getReadyTaskRequiredResources(task: Task | undefined): Resources {
+function getTaskResources(task: Task | undefined): Resources {
     if (task && task.args.resources) {
         return Resources.fromObject(task.args.resources);
     }
@@ -235,30 +222,26 @@ function createVillageOwnState(
     const resources = storage.getResources();
     const storageResources = Resources.fromStorage(storage.getResourceStorage());
     const performance = storage.getResourcesPerformance();
-    const upperCriticalLevel = storageResources.sub(performance.scale(1));
     const storageOptimumFullness = storageResources.sub(performance.scale(3));
-    const isOverflowing = upperCriticalLevel.anyLower(resources);
+    const storageCriticalFullness = storageResources.sub(performance.scale(1));
+    const isOverflowing = storageCriticalFullness.anyLower(resources);
     const queues = createAllProductionQueueStates(storage, taskCollection);
     const firstReadyTask = getReadyForProductionTask(queues, storageOptimumFullness);
-    const requiredResources = getReadyTaskRequiredResources(firstReadyTask);
+    const requiredResources = getTaskResources(firstReadyTask);
-    const frontierResources = taskCollection.getFrontierTaskResources();
-    const totalRequiredResources = taskCollection.getAllTasksResources();
 
     return {
         id: village.id,
         village,
         resources,
         performance,
-        storage: makeStorageBalance(resources, storageResources, performance),
+        storage: makeStorageState(resources, storageResources, performance),
-        required: makeResourceBalance(requiredResources, resources, performance),
+        required: makeResourceState(requiredResources, resources, performance),
-        upperCriticalLevel,
         storageOptimumFullness,
+        storageCriticalFullness,
         isOverflowing,
         queues,
         tasks: taskCollection.getTasks(),
         firstReadyTask,
-        frontierRequired: makeResourceBalance(frontierResources, resources, performance),
-        totalRequired: makeResourceBalance(totalRequiredResources, resources, performance),
         incomingResources: calcIncomingResources(storage),
         settings,
     };

src/VillageTaskCollection.ts

@@ -7,7 +7,6 @@ import { Resources } from './Core/Resources';
 import { ContractAttributes, ContractType } from './Core/Contract';
 import { UpgradeBuildingTask } from './Task/UpgradeBuildingTask';
 import { ForgeImprovementTask } from './Task/ForgeImprovementTask';
-import * as _ from 'underscore';
 
 export interface QueueTasks {
     queue: ProductionQueue;
@@ -114,21 +113,4 @@ export class VillageTaskCollection {
         }
         return result;
     }
-
-    getFrontierTaskResources(): Resources {
-        let result = Resources.zero();
-        const groups = this.getGroupedByQueueTasks();
-        for (let group of groups) {
-            const firstTask = _.first(group.tasks);
-            if (firstTask && firstTask.args.resources) {
-                result = result.add(Resources.fromObject(firstTask.args.resources));
-            }
-        }
-        return result;
-    }
-
-    getAllTasksResources(): Resources {
-        const tasks = this.storage.getTasks().filter(t => t.args.resources);
-        return tasks.reduce((acc, t) => acc.add(t.args.resources!), Resources.zero());
-    }
 }