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

Fix hub not accepting all itmes

Browse Source
This commit is contained in:
tobspr 2020-05-18 11:47:17 +02:00
parent 8dd4e63b3c
commit 65529cce1a
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res_raw/atlas.tps
View File

@ -345,6 +345,7 @@
<key type="filename">sprites/blueprints/miner.png</key> <key type="filename">sprites/blueprints/miner.png</key>
<key type="filename">sprites/blueprints/rotater-ccw.png</key> <key type="filename">sprites/blueprints/rotater-ccw.png</key>
<key type="filename">sprites/blueprints/rotater.png</key> <key type="filename">sprites/blueprints/rotater.png</key>
<key type="filename">sprites/blueprints/splitter-compact-inverse.png</key>
<key type="filename">sprites/blueprints/splitter-compact.png</key> <key type="filename">sprites/blueprints/splitter-compact.png</key>
<key type="filename">sprites/blueprints/trash.png</key> <key type="filename">sprites/blueprints/trash.png</key>
<key type="filename">sprites/blueprints/underground_belt_entry-tier2.png</key> <key type="filename">sprites/blueprints/underground_belt_entry-tier2.png</key>
@ -353,6 +354,7 @@
<key type="filename">sprites/blueprints/underground_belt_exit.png</key> <key type="filename">sprites/blueprints/underground_belt_exit.png</key>
<key type="filename">sprites/buildings/miner-chainable.png</key> <key type="filename">sprites/buildings/miner-chainable.png</key>
<key type="filename">sprites/buildings/rotater-ccw.png</key> <key type="filename">sprites/buildings/rotater-ccw.png</key>
<key type="filename">sprites/buildings/splitter-compact-inverse.png</key>
<key type="filename">sprites/buildings/splitter-compact.png</key> <key type="filename">sprites/buildings/splitter-compact.png</key>
<key type="filename">sprites/buildings/underground_belt_entry-tier2.png</key> <key type="filename">sprites/buildings/underground_belt_entry-tier2.png</key>
<key type="filename">sprites/buildings/underground_belt_entry.png</key> <key type="filename">sprites/buildings/underground_belt_entry.png</key>

2
src/js/core/config.js
View File

@ -76,7 +76,7 @@ export const globalConfig = {
debug: { debug: {
/* dev:start */ /* dev:start */
// fastGameEnter: true, fastGameEnter: true,
noArtificialDelays: true, noArtificialDelays: true,
// disableSavegameWrite: true, // disableSavegameWrite: true,
showEntityBounds: false, showEntityBounds: false,

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

@ -197,10 +197,11 @@ export class BeltSystem extends GameSystemWithFilter {
const speedMultiplier = this.root.hubGoals.getBeltBaseSpeed(); const speedMultiplier = this.root.hubGoals.getBeltBaseSpeed();
// SYNC with systems/item_processor.js:drawEntityUnderlays! // SYNC with systems/item_acceptor.js:drawEntityUnderlays!
// 126 / 42 is the exact animation speed of the png animation // 126 / 42 is the exact animation speed of the png animation
const animationIndex = Math.floor( const animationIndex = Math.floor(
(this.root.time.now() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42 ((this.root.time.now() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
globalConfig.itemSpacingOnBelts
); );
const contents = chunk.contents; const contents = chunk.contents;
for (let y = 0; y < globalConfig.mapChunkSize; ++y) { for (let y = 0; y < globalConfig.mapChunkSize; ++y) {

5
src/js/game/systems/item_acceptor.js
View File

@ -97,11 +97,12 @@ export class ItemAcceptorSystem extends GameSystemWithFilter {
// SYNC with systems/belt.js:drawSingleEntity! // SYNC with systems/belt.js:drawSingleEntity!
const animationIndex = Math.floor( const animationIndex = Math.floor(
(this.root.time.now() * ((this.root.time.now() *
this.root.hubGoals.getBeltBaseSpeed() * this.root.hubGoals.getBeltBaseSpeed() *
this.underlayBeltSprites.length * this.underlayBeltSprites.length *
126) / 126) /
42 42) *
globalConfig.itemSpacingOnBelts
); );
drawRotatedSprite({ drawRotatedSprite({

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

@ -311,12 +311,14 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
// HUB // HUB
case enumItemProcessorTypes.hub: { case enumItemProcessorTypes.hub: {
const shapeItem = /** @type {ShapeItem} */ (items[0].item);
const hubComponent = entity.components.Hub; const hubComponent = entity.components.Hub;
assert(hubComponent, "Hub item processor has no hub component"); assert(hubComponent, "Hub item processor has no hub component");
hubComponent.queueShapeDefinition(shapeItem.definition); for (let i = 0; i < items.length; ++i) {
const shapeItem = /** @type {ShapeItem} */ (items[i].item);
hubComponent.queueShapeDefinition(shapeItem.definition);
}
break; break;
} }