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

Merge 4857d33cbf into 5f0a95ba11

Browse Source
This commit is contained in:
Sense101 2021-04-19 13:22:09 +00:00 committed by GitHub
commit 2b10e1f8c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/game/components/belt_reader.js
View File

@ -40,5 +40,11 @@ export class BeltReaderComponent extends Component {
* @type {number}
*/
this.lastThroughputComputation = 0;
/**
* Stores the entry time of the latest removed item
* @type {number}
*/
this.lastRemovedItemTime = 0;
}
}

49
src/js/game/systems/belt_reader.js
View File

@ -11,44 +11,53 @@ export class BeltReaderSystem extends GameSystemWithFilter {
update() {
const now = this.root.time.now();
const minimumTime = now - globalConfig.readerAnalyzeIntervalSeconds;
const minimumTimeForThroughput = now - 1;
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
const readerComp = entity.components.BeltReader;
const lastItemTimes = readerComp.lastItemTimes;
const pinsComp = entity.components.WiredPins;
// Remove outdated items
while (readerComp.lastItemTimes[0] < minimumTime) {
readerComp.lastItemTimes.shift();
// Remove outdated items and set lastRemovedItemTime
while (lastItemTimes[0] < minimumTime) {
readerComp.lastRemovedItemTime = lastItemTimes.shift();
}
pinsComp.slots[1].value = readerComp.lastItem;
pinsComp.slots[0].value =
(readerComp.lastItemTimes[readerComp.lastItemTimes.length - 1] || 0) >
minimumTimeForThroughput
? BOOL_TRUE_SINGLETON
: BOOL_FALSE_SINGLETON;
if (now - readerComp.lastThroughputComputation > 0.5) {
// Compute throughput
readerComp.lastThroughputComputation = now;
//if only one item is in the list, use the time from the last removed item
//to allow for much lower numbers to be correctly calculated
const oneItem = lastItemTimes.length == 1;
let throughput = 0;
if (readerComp.lastItemTimes.length < 2) {
throughput = 0;
} else {
let averageSpacing = 0;
let averageSpacingNum = 0;
for (let i = 0; i < readerComp.lastItemTimes.length - 1; ++i) {
averageSpacing += readerComp.lastItemTimes[i + 1] - readerComp.lastItemTimes[i];
if (lastItemTimes.length > 0) {
let averageSpacing = oneItem ? lastItemTimes[0] - readerComp.lastRemovedItemTime : 0;
let averageSpacingNum = oneItem ? 1 : 0;
for (let i = 0; i < lastItemTimes.length - 1; ++i) {
averageSpacing += lastItemTimes[i + 1] - lastItemTimes[i];
++averageSpacingNum;
}
throughput = 1 / (averageSpacing / averageSpacingNum);
throughput = 1 / (averageSpacing / averageSpacingNum) + 0.01;
}
readerComp.lastThroughput = Math.min(globalConfig.beltSpeedItemsPerSecond * 23.9, throughput);
readerComp.lastThroughput = Math.min(
globalConfig.beltSpeedItemsPerSecond * this.root.hubGoals.upgradeImprovements.belt,
throughput
);
}
// Set the pins value - shape output consistent with the boolean output
if (readerComp.lastThroughput > 0) {
pinsComp.slots[0].value = BOOL_TRUE_SINGLETON;
pinsComp.slots[1].value = readerComp.lastItem;
} else {
pinsComp.slots[0].value = BOOL_FALSE_SINGLETON;
if (entity.components.ItemProcessor.ongoingCharges.length < 2) {
pinsComp.slots[1].value = null;
}
}
}
}

2
src/js/webworkers/tsconfig.json
View File

@ -1,6 +1,6 @@
{
"compilerOptions": {
"lib": ["ES2018","WebWorker"]
"lib": ["ES2018", "WebWorker"]
},
"exclude": [],
"extends": "../tsconfig",