Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity

Add Stored in Storage Tab to Statistics

Browse Source
This commit is contained in:
isaisstillalive 2020-06-28 07:14:14 +09:00
parent 6d17291f1e
commit 17059f600e
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/css/ingame_hud/statistics.scss
View File

@ -111,7 +111,8 @@
&[data-displaymode="icons"] .displayIcons, &[data-displaymode="icons"] .displayIcons,
&[data-datasource="produced"] .modeProduced, &[data-datasource="produced"] .modeProduced,
&[data-datasource="delivered"] .modeDelivered, &[data-datasource="delivered"] .modeDelivered,
&[data-datasource="stored"] .modeStored { &[data-datasource="stored"] .modeStored,
&[data-datasource="deliveredToStorage"] .modeDeliveredtostorage {
opacity: 1; opacity: 1;
} }

7
src/js/game/hud/parts/statistics.js
View File

@ -27,6 +27,7 @@ export class HUDStatistics extends BaseHUDPart {
enumAnalyticsDataSource.produced, enumAnalyticsDataSource.produced,
enumAnalyticsDataSource.delivered, enumAnalyticsDataSource.delivered,
enumAnalyticsDataSource.stored, enumAnalyticsDataSource.stored,
enumAnalyticsDataSource.deliveredToStorage,
]; ];
for (let i = 0; i < dataSources.length; ++i) { for (let i = 0; i < dataSources.length; ++i) {
@ -168,7 +169,8 @@ export class HUDStatistics extends BaseHUDPart {
break; break;
} }
case enumAnalyticsDataSource.produced: case enumAnalyticsDataSource.produced:
case enumAnalyticsDataSource.delivered: { case enumAnalyticsDataSource.delivered:
case enumAnalyticsDataSource.deliveredToStorage: {
entries = Object.entries(this.root.productionAnalytics.getCurrentShapeRates(this.dataSource)); entries = Object.entries(this.root.productionAnalytics.getCurrentShapeRates(this.dataSource));
break; break;
} }
@ -181,10 +183,11 @@ export class HUDStatistics extends BaseHUDPart {
for (let i = 0; i < Math.min(entries.length, 200); ++i) { for (let i = 0; i < Math.min(entries.length, 200); ++i) {
const entry = entries[i]; const entry = entries[i];
const shapeKey = entry[0]; const shapeKey = entry[0];
const shape = shapeKey.split(",")[1] || shapeKey;
let handle = this.activeHandles[shapeKey]; let handle = this.activeHandles[shapeKey];
if (!handle) { if (!handle) {
const definition = this.root.shapeDefinitionMgr.getShapeFromShortKey(shapeKey); const definition = this.root.shapeDefinitionMgr.getShapeFromShortKey(shape);
handle = this.activeHandles[shapeKey] = new HUDShapeStatisticsHandle( handle = this.activeHandles[shapeKey] = new HUDShapeStatisticsHandle(
this.root, this.root,
definition, definition,

3
src/js/game/hud/parts/statistics_handle.js
View File

@ -82,7 +82,8 @@ export class HUDShapeStatisticsHandle {
break; break;
} }
case enumAnalyticsDataSource.delivered: case enumAnalyticsDataSource.delivered:
case enumAnalyticsDataSource.produced: { case enumAnalyticsDataSource.produced:
case enumAnalyticsDataSource.deliveredToStorage: {
let rate = let rate =
(this.root.productionAnalytics.getCurrentShapeRate(dataSource, this.definition) / (this.root.productionAnalytics.getCurrentShapeRate(dataSource, this.definition) /
globalConfig.analyticsSliceDurationSeconds) * globalConfig.analyticsSliceDurationSeconds) *

3
translations/base-en.yaml
View File

@ -363,6 +363,9 @@ ingame:
delivered: delivered:
title: Delivered title: Delivered
description: Displaying shapes which are delivered to your central building. 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. noShapesProduced: No shapes have been produced so far.
# Displays the shapes per minute, e.g. '523 / m' # Displays the shapes per minute, e.g. '523 / m'