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

Get shape rate with shape key

Browse Source
This commit is contained in:
isaisstillalive 2020-06-28 07:17:14 +09:00
parent 9f8c3086e3
commit 790e404556
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ export class HUDShapeStatisticsHandle {
case enumAnalyticsDataSource.produced: case enumAnalyticsDataSource.produced:
case enumAnalyticsDataSource.deliveredToStorage: { case enumAnalyticsDataSource.deliveredToStorage: {
let rate = let rate =
(this.root.productionAnalytics.getCurrentShapeRate(dataSource, this.definition) / (this.root.productionAnalytics.getCurrentShapeRate(dataSource, this.shapeKey) /
globalConfig.analyticsSliceDurationSeconds) * globalConfig.analyticsSliceDurationSeconds) *
60; 60;
this.counter.innerText = T.ingame.statistics.shapesPerMinute.replace( this.counter.innerText = T.ingame.statistics.shapesPerMinute.replace(
@ -136,7 +136,7 @@ export class HUDShapeStatisticsHandle {
for (let i = 0; i < globalConfig.statisticsGraphSlices - 2; ++i) { for (let i = 0; i < globalConfig.statisticsGraphSlices - 2; ++i) {
const value = this.root.productionAnalytics.getPastShapeRate( const value = this.root.productionAnalytics.getPastShapeRate(
dataSource, dataSource,
this.definition, this.shapeKey,
globalConfig.statisticsGraphSlices - i - 2 globalConfig.statisticsGraphSlices - i - 2
); );
if (value > maxValue) { if (value > maxValue) {

12
src/js/game/production_analytics.js
View File

@ -98,27 +98,27 @@ export class ProductionAnalytics extends BasicSerializableObject {
/** /**
* Returns the current rate of a given shape * Returns the current rate of a given shape
* @param {enumAnalyticsDataSource} dataSource * @param {enumAnalyticsDataSource} dataSource
* @param {ShapeDefinition} definition * @param {string} shapeKey
*/ */
getCurrentShapeRate(dataSource, definition) { getCurrentShapeRate(dataSource, shapeKey) {
const slices = this.history[dataSource]; const slices = this.history[dataSource];
return slices[slices.length - 2][definition.getHash()] || 0; return slices[slices.length - 2][shapeKey] || 0;
} }
/** /**
* Returns the rate of a given shape, <historyOffset> frames ago * Returns the rate of a given shape, <historyOffset> frames ago
* @param {enumAnalyticsDataSource} dataSource * @param {enumAnalyticsDataSource} dataSource
* @param {ShapeDefinition} definition * @param {string} shapeKey
* @param {number} historyOffset * @param {number} historyOffset
*/ */
getPastShapeRate(dataSource, definition, historyOffset) { getPastShapeRate(dataSource, shapeKey, historyOffset) {
assertAlways( assertAlways(
historyOffset >= 0 && historyOffset < globalConfig.statisticsGraphSlices - 1, historyOffset >= 0 && historyOffset < globalConfig.statisticsGraphSlices - 1,
"Invalid slice offset: " + historyOffset "Invalid slice offset: " + historyOffset
); );
const slices = this.history[dataSource]; const slices = this.history[dataSource];
return slices[slices.length - 2 - historyOffset][definition.getHash()] || 0; return slices[slices.length - 2 - historyOffset][shapeKey] || 0;
} }
/** /**