Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge f6780b77d9 into 958d400ff5

Browse Source
This commit is contained in:
Emerald Block 2024-07-10 18:30:40 +08:00 committed by GitHub
commit c07221e537
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/js/game/systems/belt.js
View File

@ -501,26 +501,25 @@ export class BeltSystem extends GameSystem {
return; return;
} }
// SYNC with systems/belt_underlays.js:drawChunk!
// Limit speed to avoid belts going backwards // Limit speed to avoid belts going backwards
const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10); const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10);
// It takes 3 animation cycles for belt arrows to move 1 tile
// SYNC with systems/item_acceptor.js:drawEntityUnderlays!
// 126 / 42 is the exact animation speed of the png animation
const animationIndex = Math.floor( const animationIndex = Math.floor(
((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) * ((this.root.time.realtimeNow() * speedMultiplier * globalConfig.itemSpacingOnBelts * 3) % 1) *
globalConfig.itemSpacingOnBelts BELT_ANIM_COUNT
); );
const contents = chunk.containedEntitiesByLayer.regular;
const contents = chunk.containedEntitiesByLayer.regular;
if (this.root.app.settings.getAllSettings().simplifiedBelts) { if (this.root.app.settings.getAllSettings().simplifiedBelts) {
// POTATO Mode: Only show items when belt is hovered // POTATO Mode: Only show items when belt is hovered
let hoveredBeltPath = null; let hoveredBeltPath = null;
const mousePos = this.root.app.mousePosition; const mousePos = this.root.app.mousePosition;
if (mousePos && this.root.currentLayer === "regular") { if (mousePos && this.root.currentLayer === "regular") {
const tile = this.root.camera.screenToWorld(mousePos).toTileSpace(); const tile = this.root.camera.screenToWorld(mousePos).toTileSpace();
const contents = this.root.map.getLayerContentXY(tile.x, tile.y, "regular"); const entity = this.root.map.getLayerContentXY(tile.x, tile.y, "regular");
if (contents && contents.components.Belt) { if (entity && entity.components.Belt) {
hoveredBeltPath = contents.components.Belt.assignedPath; hoveredBeltPath = entity.components.Belt.assignedPath;
} }
} }

11
src/js/game/systems/belt_underlays.js
View File

@ -220,8 +220,14 @@ export class BeltUnderlaysSystem extends GameSystem {
* @param {MapChunkView} chunk * @param {MapChunkView} chunk
*/ */
drawChunk(parameters, chunk) { drawChunk(parameters, chunk) {
// SYNC with systems/belt.js:drawChunk!
// Limit speed to avoid belts going backwards // Limit speed to avoid belts going backwards
const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10); const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10);
// It takes 3 animation cycles for belt arrows to move 1 tile
const animationIndex = Math.floor(
((this.root.time.realtimeNow() * speedMultiplier * globalConfig.itemSpacingOnBelts * 3) % 1) *
BELT_ANIM_COUNT
);
const contents = chunk.containedEntitiesByLayer.regular; const contents = chunk.containedEntitiesByLayer.regular;
for (let i = 0; i < contents.length; ++i) { for (let i = 0; i < contents.length; ++i) {
@ -273,11 +279,6 @@ export class BeltUnderlaysSystem extends GameSystem {
const y = destY + globalConfig.halfTileSize; const y = destY + globalConfig.halfTileSize;
const angleRadians = Math.radians(angle); const angleRadians = Math.radians(angle);
// SYNC with systems/belt.js:drawSingleEntity!
const animationIndex = Math.floor(
((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
globalConfig.itemSpacingOnBelts
);
parameters.context.translate(x, y); parameters.context.translate(x, y);
parameters.context.rotate(angleRadians); parameters.context.rotate(angleRadians);
this.underlayBeltSprites[ this.underlayBeltSprites[