From 17059f600e225d8f15bd4cb0b3f92d1a059fc594 Mon Sep 17 00:00:00 2001
From: isaisstillalive <isaisstillalive@gmail.com>
Date: Sun, 28 Jun 2020 07:14:14 +0900
Subject: [PATCH] Add Stored in Storage Tab to Statistics

---
 src/css/ingame_hud/statistics.scss         | 3 ++-
 src/js/game/hud/parts/statistics.js        | 7 +++++--
 src/js/game/hud/parts/statistics_handle.js | 3 ++-
 translations/base-en.yaml                  | 3 +++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/css/ingame_hud/statistics.scss b/src/css/ingame_hud/statistics.scss
index e53a80d1..ab478e50 100644
--- a/src/css/ingame_hud/statistics.scss
+++ b/src/css/ingame_hud/statistics.scss
@@ -111,7 +111,8 @@
         &[data-displaymode="icons"] .displayIcons,
         &[data-datasource="produced"] .modeProduced,
         &[data-datasource="delivered"] .modeDelivered,
-        &[data-datasource="stored"] .modeStored {
+        &[data-datasource="stored"] .modeStored,
+        &[data-datasource="deliveredToStorage"] .modeDeliveredtostorage {
             opacity: 1;
         }
 
diff --git a/src/js/game/hud/parts/statistics.js b/src/js/game/hud/parts/statistics.js
index 4a3b75f5..05f5661e 100644
--- a/src/js/game/hud/parts/statistics.js
+++ b/src/js/game/hud/parts/statistics.js
@@ -27,6 +27,7 @@ export class HUDStatistics extends BaseHUDPart {
             enumAnalyticsDataSource.produced,
             enumAnalyticsDataSource.delivered,
             enumAnalyticsDataSource.stored,
+            enumAnalyticsDataSource.deliveredToStorage,
         ];
 
         for (let i = 0; i < dataSources.length; ++i) {
@@ -168,7 +169,8 @@ export class HUDStatistics extends BaseHUDPart {
                 break;
             }
             case enumAnalyticsDataSource.produced:
-            case enumAnalyticsDataSource.delivered: {
+            case enumAnalyticsDataSource.delivered:
+            case enumAnalyticsDataSource.deliveredToStorage: {
                 entries = Object.entries(this.root.productionAnalytics.getCurrentShapeRates(this.dataSource));
                 break;
             }
@@ -181,10 +183,11 @@ export class HUDStatistics extends BaseHUDPart {
         for (let i = 0; i < Math.min(entries.length, 200); ++i) {
             const entry = entries[i];
             const shapeKey = entry[0];
+            const shape = shapeKey.split(",")[1] || shapeKey;
 
             let handle = this.activeHandles[shapeKey];
             if (!handle) {
-                const definition = this.root.shapeDefinitionMgr.getShapeFromShortKey(shapeKey);
+                const definition = this.root.shapeDefinitionMgr.getShapeFromShortKey(shape);
                 handle = this.activeHandles[shapeKey] = new HUDShapeStatisticsHandle(
                     this.root,
                     definition,
diff --git a/src/js/game/hud/parts/statistics_handle.js b/src/js/game/hud/parts/statistics_handle.js
index d5c60d3b..85928081 100644
--- a/src/js/game/hud/parts/statistics_handle.js
+++ b/src/js/game/hud/parts/statistics_handle.js
@@ -82,7 +82,8 @@ export class HUDShapeStatisticsHandle {
                 break;
             }
             case enumAnalyticsDataSource.delivered:
-            case enumAnalyticsDataSource.produced: {
+            case enumAnalyticsDataSource.produced:
+            case enumAnalyticsDataSource.deliveredToStorage: {
                 let rate =
                     (this.root.productionAnalytics.getCurrentShapeRate(dataSource, this.definition) /
                         globalConfig.analyticsSliceDurationSeconds) *
diff --git a/translations/base-en.yaml b/translations/base-en.yaml
index db806a09..e789f692 100644
--- a/translations/base-en.yaml
+++ b/translations/base-en.yaml
@@ -363,6 +363,9 @@ ingame:
             delivered:
                 title: Delivered
                 description: Displaying shapes which are delivered to your central building.
+            deliveredToStorage:
+                title: Storage
+                description: Displaying shapes which are delivered to your storages.
         noShapesProduced: No shapes have been produced so far.
 
         # Displays the shapes per minute, e.g. '523 / m'