Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-03-02 03:39:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix statistics tab, 2

Browse Source
This commit is contained in:
tobspr
2020-05-14 10:25:00 +02:00
parent a30beb9883
commit d194b5ad86
4 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,13 @@ import { BaseHUDPart } from "../base_hud_part";
import { DynamicDomAttach } from "../dynamic_dom_attach";
import { enumDisplayMode, HUDShapeStatisticsHandle } from "./statistics_handle";
const enumDataSourceToText = {
[enumAnalyticsDataSource.stored]: "Displaying amount of stored shapes in your central building.",
[enumAnalyticsDataSource.produced]:
"Displaying all shapes your whole factory produces, including intermediate products.",
[enumAnalyticsDataSource.delivered]: "Displaying shapes which are delivered to your central building.",
};
export class HUDStatistics extends BaseHUDPart {
createElements(parent) {
this.background = makeDiv(parent, "ingame_HUD_Statistics", ["ingameDialog"]);
@@ -18,6 +25,7 @@ export class HUDStatistics extends BaseHUDPart {
this.trackClicks(this.closeButton, this.close);
this.filterHeader = makeDiv(this.dialogInner, null, ["filterHeader"]);
this.sourceExplanation = makeDiv(this.dialogInner, null, ["sourceExplanation"]);
this.filtersDataSource = makeDiv(this.filterHeader, null, ["filtersDataSource"]);
this.filtersDisplayMode = makeDiv(this.filterHeader, null, ["filtersDisplayMode"]);
@@ -45,6 +53,8 @@ export class HUDStatistics extends BaseHUDPart {
setDataSource(source) {
this.dataSource = source;
this.dialogInner.setAttribute("data-datasource", source);
this.sourceExplanation.innerText = enumDataSourceToText[source];
if (this.visible) {
this.rerenderFull();
}
@@ -146,7 +156,22 @@ export class HUDStatistics extends BaseHUDPart {
removeAllChildren(this.contentDiv);
// Now, attach new ones
const entries = Object.entries(this.root.hubGoals.storedShapes);
let entries = null;
switch (this.dataSource) {
case enumAnalyticsDataSource.stored: {
entries = Object.entries(this.root.hubGoals.storedShapes);
break;
}
case enumAnalyticsDataSource.produced:
case enumAnalyticsDataSource.delivered: {
entries = Object.entries(this.root.productionAnalytics.getCurrentShapeRates(this.dataSource));
break;
}
}
// const entries = Object.entries(this.root.hubGoals.storedShapes);
entries.sort((a, b) => b[1] - a[1]);
let rendered = new Set();
@@ -155,9 +180,6 @@ export class HUDStatistics extends BaseHUDPart {
const entry = entries[i];
const shapeKey = entry[0];
const amount = entry[1];
if (amount < 1) {
continue;
}
let handle = this.activeHandles[shapeKey];
if (!handle) {

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

@@ -116,16 +116,16 @@ export class HUDShapeStatisticsHandle {
this.graphContext.strokeStyle = "#66ccbc";
this.graphContext.lineWidth = 1.5;
const sliceWidth = w / globalConfig.statisticsGraphSlices;
const sliceWidth = w / (globalConfig.statisticsGraphSlices - 1);
let values = [];
let maxValue = 1;
for (let i = 0; i < globalConfig.statisticsGraphSlices - 1; ++i) {
for (let i = 0; i < globalConfig.statisticsGraphSlices - 2; ++i) {
const value = this.root.productionAnalytics.getPastShapeRate(
dataSource,
this.definition,
globalConfig.statisticsGraphSlices - i - 1
globalConfig.statisticsGraphSlices - i - 2
);
if (value > maxValue) {
maxValue = value;