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

half ejector progress

Browse Source
This commit is contained in:
Sense101 2022-01-22 19:18:40 +00:00
parent 132eff5f58
commit 3bd86aa6d0
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/js/game/systems/item_ejector.js
View File

@ -138,13 +138,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
update() { update() {
this.staleAreaDetector.update(); this.staleAreaDetector.update();
// Precompute effective belt speed
let progressGrowth = 2 * this.root.dynamicTickrate.deltaSeconds;
if (G_IS_DEV && globalConfig.debug.instantBelts) {
progressGrowth = 1;
}
// Go over all cache entries // Go over all cache entries
for (let i = 0; i < this.allEntities.length; ++i) { for (let i = 0; i < this.allEntities.length; ++i) {
const sourceEntity = this.allEntities[i]; const sourceEntity = this.allEntities[i];
@ -154,26 +147,27 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
for (let j = 0; j < slots.length; ++j) { for (let j = 0; j < slots.length; ++j) {
const sourceSlot = slots[j]; const sourceSlot = slots[j];
const item = sourceSlot.item; const item = sourceSlot.item;
const maxProgress = 0.5;
if (!item) { if (!item) {
// No item available to be ejected // No item available to be ejected
continue; continue;
} }
// Advance items on the slot if (sourceSlot.progress < maxProgress) {
sourceSlot.progress = Math.min( // Advance items on the slot
1, sourceSlot.progress +=
sourceSlot.progress + this.root.dynamicTickrate.deltaSeconds *
progressGrowth * this.root.hubGoals.getBeltBaseSpeed() *
this.root.hubGoals.getBeltBaseSpeed() * globalConfig.itemSpacingOnBelts;
globalConfig.itemSpacingOnBelts }
);
if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) { if (G_IS_DEV && globalConfig.debug.disableEjectorProcessing) {
sourceSlot.progress = 1.0; sourceSlot.progress = maxProgress;
} }
// Check if we are still in the process of ejecting, can't proceed then // Check if we are still in the process of ejecting, can't proceed then
if (sourceSlot.progress < 1.0) { if (sourceSlot.progress < maxProgress) {
continue; continue;
} }
@ -368,20 +362,11 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
^ ^ item @ 0.9 ^ ^ item @ 0.9
^ max progress = 0.3 ^ max progress = 0.3
Because now our range actually only goes to the end of the building, and not towards the center of the building, we need to multiply
all values by 2:
Building Belt
| X | X |
| 0.........1.........2 |
^ ^ item @ 1.8
^ max progress = 0.6
And that's it! If you summarize the calculations from above into a formula, you get the one below. And that's it! If you summarize the calculations from above into a formula, you get the one below.
*/ */
const maxProgress = const maxProgress =
(0.5 + nextBeltPath.spacingToFirstItem - globalConfig.itemSpacingOnBelts) * 2; 0.5 + nextBeltPath.spacingToFirstItem - globalConfig.itemSpacingOnBelts;
progress = Math.min(maxProgress, progress); progress = Math.min(maxProgress, progress);
} }
@ -399,8 +384,8 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
const realDirection = staticComp.localDirectionToWorld(slot.direction); const realDirection = staticComp.localDirectionToWorld(slot.direction);
const realDirectionVector = enumDirectionToVector[realDirection]; const realDirectionVector = enumDirectionToVector[realDirection];
const tileX = realPosition.x + 0.5 + realDirectionVector.x * 0.5 * progress; const tileX = realPosition.x + 0.5 + realDirectionVector.x * progress;
const tileY = realPosition.y + 0.5 + realDirectionVector.y * 0.5 * progress; const tileY = realPosition.y + 0.5 + realDirectionVector.y * progress;
const worldX = tileX * globalConfig.tileSize; const worldX = tileX * globalConfig.tileSize;
const worldY = tileY * globalConfig.tileSize; const worldY = tileY * globalConfig.tileSize;