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 branch 'fixProcessorSpeed' into fixBeltLikeBuildingSpeed

Browse Source
This commit is contained in:
isaisstillalive 2020-07-10 21:20:01 +09:00
commit 44429b9ad6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/game/systems/item_processor.js
View File

@ -21,17 +21,15 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
if (processorComp.inputSlots.length >= processorComp.inputsPerCharge) { if (processorComp.inputSlots.length >= processorComp.inputsPerCharge) {
// First of all, process the current recipe // First of all, process the current recipe
processorComp.secondsUntilEject = Math.max( processorComp.secondsUntilEject =
0, processorComp.secondsUntilEject - this.root.dynamicTickrate.deltaSeconds;
processorComp.secondsUntilEject - this.root.dynamicTickrate.deltaSeconds
);
if (G_IS_DEV && globalConfig.debug.instantProcessors) { if (G_IS_DEV && globalConfig.debug.instantProcessors) {
processorComp.secondsUntilEject = 0; processorComp.secondsUntilEject = 0;
} }
if ( if (
processorComp.secondsUntilEject === 0 && // it was processed in time processorComp.secondsUntilEject <= 0 && // it was processed in time
processorComp.itemsToEject.length === 0 // Check if we have an empty queue and can start a new charge processorComp.itemsToEject.length === 0 // Check if we have an empty queue and can start a new charge
) { ) {
const energyConsumerComp = entity.components.EnergyConsumer; const energyConsumerComp = entity.components.EnergyConsumer;
@ -45,6 +43,10 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
this.startNewCharge(entity); this.startNewCharge(entity);
} }
} }
} else {
// Remove time carryover if processing is not continuous
const baseSpeed = this.root.hubGoals.getProcessorBaseSpeed(processorComp.type);
processorComp.secondsUntilEject = 1 / baseSpeed;
} }
// Check if we have any finished items we can eject // Check if we have any finished items we can eject
@ -104,7 +106,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
} }
const baseSpeed = this.root.hubGoals.getProcessorBaseSpeed(processorComp.type); const baseSpeed = this.root.hubGoals.getProcessorBaseSpeed(processorComp.type);
processorComp.secondsUntilEject = 1 / baseSpeed; processorComp.secondsUntilEject += 1 / baseSpeed;
/** @type {Array<{item: BaseItem, requiredSlot?: number, preferredSlot?: number}>} */ /** @type {Array<{item: BaseItem, requiredSlot?: number, preferredSlot?: number}>} */
const outItems = []; const outItems = [];