diff --git a/artwork/thirdparty/iogames.space/thumb.png b/artwork/thirdparty/iogames.space/thumb.png index da5ee8c3..0885f98b 100644 Binary files a/artwork/thirdparty/iogames.space/thumb.png and b/artwork/thirdparty/iogames.space/thumb.png differ diff --git a/artwork/thirdparty/iogames.space/thumb.psd b/artwork/thirdparty/iogames.space/thumb.psd index 6f85243e..b7f476d4 100644 --- a/artwork/thirdparty/iogames.space/thumb.psd +++ b/artwork/thirdparty/iogames.space/thumb.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84ed53e2e72ef7c2bf7e590efb1253ff487515400f8d59506b870de54ad82d59 -size 9016895 +oid sha256:f1e029d2578801eaf3fa254424cb48fefebd644f1b7d0579243276c7a61a169d +size 9029705 diff --git a/artwork/ui/wires_overlay_tile.psd b/artwork/ui/wires_overlay_tile.psd index 11365563..87635bd4 100644 --- a/artwork/ui/wires_overlay_tile.psd +++ b/artwork/ui/wires_overlay_tile.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3817a1720617b4e30631c9a6b3532c4d3a003b285f20263746da4a035457ff0a -size 146014 +oid sha256:fc3cb708282fb2d52aee71c427a4fddd0ee7cfff1869d08ae3a9b3924d5f798b +size 146510 diff --git a/artwork/wires/items.psd b/artwork/wires/items.psd index 68fb5e39..aff2a772 100644 --- a/artwork/wires/items.psd +++ b/artwork/wires/items.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8ace4cd365be92bfec392bf9148dbc68eeecbeeab8da943ccb9911adafb14ac -size 70920 +oid sha256:af7d1113b0cb0bbcf626889fc242cc6eabb5a9b50e0eef9bf013334f7e3eb7fa +size 70769 diff --git a/artwork/wires/pins.psd b/artwork/wires/pins.psd index 7d6ee5b9..6f588a39 100644 --- a/artwork/wires/pins.psd +++ b/artwork/wires/pins.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d42d1a6d29ed6a5930d9c90313e991cc7f2b070150ba9c3263d1ec1f108814ab -size 5149412 +oid sha256:a1200717523a78bc2e98929a5d276458f9ce2041969fa54c40873ba08340b219 +size 5196595 diff --git a/gulp/webpack.production.config.js b/gulp/webpack.production.config.js index 2294e1b2..1b89283f 100644 --- a/gulp/webpack.production.config.js +++ b/gulp/webpack.production.config.js @@ -232,7 +232,6 @@ module.exports = ({ pattern: /globalConfig\.beltSpeedItemsPerSecond/g, replacement: () => "2.0", }, - { pattern: /globalConfig\.itemSpacingOnBelts/g, replacement: () => "0.63" }, { pattern: /globalConfig\.debug/g, replacement: () => "''" }, ], }), diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index 36c20fa8..fe4f158b 100644 --- a/res_built/atlas/atlas0_10.json +++ b/res_built/atlas/atlas0_10.json @@ -874,7 +874,7 @@ }, "sprites/blueprints/wire_left.png": { - "frame": {"x":599,"y":87,"w":11,"h":11}, + "frame": {"x":615,"y":37,"w":11,"h":11}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":11,"h":11}, @@ -882,7 +882,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":611,"y":70,"w":11,"h":11}, + "frame": {"x":617,"y":20,"w":11,"h":11}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":11,"h":11}, @@ -890,7 +890,7 @@ }, "sprites/blueprints/wire_top.png": { - "frame": {"x":617,"y":20,"w":9,"h":13}, + "frame": {"x":620,"y":3,"w":9,"h":13}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":9,"h":13}, @@ -1106,7 +1106,7 @@ }, "sprites/buildings/wire_left.png": { - "frame": {"x":614,"y":85,"w":11,"h":11}, + "frame": {"x":587,"y":105,"w":11,"h":11}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":11,"h":11}, @@ -1114,7 +1114,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":614,"y":100,"w":11,"h":11}, + "frame": {"x":599,"y":87,"w":11,"h":11}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":11,"h":11}, @@ -1122,7 +1122,7 @@ }, "sprites/buildings/wire_top.png": { - "frame": {"x":618,"y":53,"w":9,"h":13}, + "frame": {"x":611,"y":70,"w":9,"h":13}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":9,"h":13}, @@ -1170,7 +1170,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":602,"y":115,"w":10,"h":10}, + "frame": {"x":602,"y":103,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -1194,7 +1194,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":602,"y":115,"w":10,"h":10}, + "frame": {"x":602,"y":103,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -1202,7 +1202,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":616,"y":115,"w":10,"h":10}, + "frame": {"x":616,"y":103,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -1250,23 +1250,23 @@ }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":603,"y":54,"w":11,"h":12}, + "frame": {"x":618,"y":52,"w":9,"h":12}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":1,"y":0,"w":11,"h":12}, + "spriteSourceSize": {"x":2,"y":0,"w":9,"h":12}, "sourceSize": {"w":13,"h":13} }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":615,"y":37,"w":11,"h":12}, + "frame": {"x":614,"y":87,"w":9,"h":12}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":1,"y":0,"w":11,"h":12}, + "spriteSourceSize": {"x":2,"y":0,"w":9,"h":12}, "sourceSize": {"w":13,"h":13} }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":587,"y":105,"w":11,"h":12}, + "frame": {"x":603,"y":54,"w":11,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":11,"h":12}, @@ -1285,8 +1285,8 @@ "version": "1.0", "image": "atlas0_10.png", "format": "RGBA8888", - "size": {"w":630,"h":128}, + "size": {"w":632,"h":128}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:64992def403ecae5d6a9a8c1d669aa36:a6ea6940afa6efd3e09314c1b1be5a97:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:f9d84407e7fd8a428996f4d57e250e84:01202b345d862a009ec7b1beee1ef160:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png index 37ad646e..6eb63e20 100644 Binary files a/res_built/atlas/atlas0_10.png and b/res_built/atlas/atlas0_10.png differ diff --git a/res_built/atlas/atlas0_100.json b/res_built/atlas/atlas0_100.json index 0b66fd20..1d4a01d1 100644 --- a/res_built/atlas/atlas0_100.json +++ b/res_built/atlas/atlas0_100.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":2448,"y":135,"w":100,"h":126}, + "frame": {"x":241,"y":1899,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":2448,"y":265,"w":100,"h":126}, + "frame": {"x":345,"y":1899,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":2064,"y":575,"w":100,"h":126}, + "frame": {"x":1334,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":2376,"y":564,"w":100,"h":126}, + "frame": {"x":2270,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":2396,"y":694,"w":100,"h":126}, + "frame": {"x":2374,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":1980,"y":869,"w":100,"h":126}, + "frame": {"x":2075,"y":1694,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -50,7 +50,7 @@ }, "sprites/belt/forward_6.png": { - "frame": {"x":1876,"y":887,"w":100,"h":126}, + "frame": {"x":2194,"y":1888,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -58,7 +58,7 @@ }, "sprites/belt/forward_7.png": { - "frame": {"x":1850,"y":1134,"w":100,"h":126}, + "frame": {"x":2298,"y":1888,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -66,7 +66,7 @@ }, "sprites/belt/forward_8.png": { - "frame": {"x":2435,"y":824,"w":100,"h":126}, + "frame": {"x":735,"y":391,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -74,7 +74,7 @@ }, "sprites/belt/forward_9.png": { - "frame": {"x":1980,"y":999,"w":100,"h":126}, + "frame": {"x":735,"y":521,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -82,7 +82,7 @@ }, "sprites/belt/forward_10.png": { - "frame": {"x":1808,"y":1668,"w":100,"h":126}, + "frame": {"x":449,"y":1899,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -90,7 +90,7 @@ }, "sprites/belt/forward_11.png": { - "frame": {"x":1837,"y":367,"w":100,"h":126}, + "frame": {"x":553,"y":1899,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -98,7 +98,7 @@ }, "sprites/belt/forward_12.png": { - "frame": {"x":1941,"y":349,"w":100,"h":126}, + "frame": {"x":657,"y":1898,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -106,7 +106,7 @@ }, "sprites/belt/forward_13.png": { - "frame": {"x":1838,"y":497,"w":100,"h":126}, + "frame": {"x":761,"y":1892,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -114,7 +114,7 @@ }, "sprites/belt/forward_14.png": { - "frame": {"x":1942,"y":479,"w":100,"h":126}, + "frame": {"x":865,"y":1892,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -122,7 +122,7 @@ }, "sprites/belt/forward_15.png": { - "frame": {"x":2046,"y":445,"w":100,"h":126}, + "frame": {"x":969,"y":1892,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -130,7 +130,7 @@ }, "sprites/belt/forward_16.png": { - "frame": {"x":1856,"y":627,"w":100,"h":126}, + "frame": {"x":1073,"y":1892,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -138,7 +138,7 @@ }, "sprites/belt/forward_17.png": { - "frame": {"x":1960,"y":609,"w":100,"h":126}, + "frame": {"x":1022,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -146,7 +146,7 @@ }, "sprites/belt/forward_18.png": { - "frame": {"x":1876,"y":757,"w":100,"h":126}, + "frame": {"x":1126,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -154,7 +154,7 @@ }, "sprites/belt/forward_19.png": { - "frame": {"x":1980,"y":739,"w":100,"h":126}, + "frame": {"x":1230,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -162,7 +162,7 @@ }, "sprites/belt/forward_20.png": { - "frame": {"x":2084,"y":705,"w":100,"h":126}, + "frame": {"x":1438,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -170,7 +170,7 @@ }, "sprites/belt/forward_21.png": { - "frame": {"x":2150,"y":445,"w":100,"h":126}, + "frame": {"x":1542,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -178,7 +178,7 @@ }, "sprites/belt/forward_22.png": { - "frame": {"x":2168,"y":575,"w":100,"h":126}, + "frame": {"x":1646,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -186,7 +186,7 @@ }, "sprites/belt/forward_23.png": { - "frame": {"x":2188,"y":705,"w":100,"h":126}, + "frame": {"x":1750,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -194,7 +194,7 @@ }, "sprites/belt/forward_24.png": { - "frame": {"x":2254,"y":445,"w":100,"h":126}, + "frame": {"x":1854,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -202,7 +202,7 @@ }, "sprites/belt/forward_25.png": { - "frame": {"x":2272,"y":575,"w":100,"h":126}, + "frame": {"x":1958,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -210,7 +210,7 @@ }, "sprites/belt/forward_26.png": { - "frame": {"x":2292,"y":705,"w":100,"h":126}, + "frame": {"x":2062,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -218,7 +218,7 @@ }, "sprites/belt/forward_27.png": { - "frame": {"x":2358,"y":434,"w":100,"h":126}, + "frame": {"x":2166,"y":977,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -226,7 +226,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":1739,"y":669,"w":113,"h":113}, + "frame": {"x":2414,"y":1343,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -234,7 +234,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":1697,"y":786,"w":113,"h":113}, + "frame": {"x":2414,"y":1460,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -242,7 +242,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":2084,"y":952,"w":113,"h":113}, + "frame": {"x":1022,"y":852,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -250,7 +250,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":1967,"y":1246,"w":113,"h":113}, + "frame": {"x":1139,"y":853,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -258,7 +258,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":2084,"y":1186,"w":113,"h":113}, + "frame": {"x":1256,"y":588,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -266,7 +266,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":2201,"y":1186,"w":113,"h":113}, + "frame": {"x":1307,"y":471,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -274,7 +274,7 @@ }, "sprites/belt/left_6.png": { - "frame": {"x":2318,"y":1186,"w":113,"h":113}, + "frame": {"x":1369,"y":354,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -282,7 +282,7 @@ }, "sprites/belt/left_7.png": { - "frame": {"x":2435,"y":1188,"w":113,"h":113}, + "frame": {"x":1452,"y":237,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -290,7 +290,7 @@ }, "sprites/belt/left_8.png": { - "frame": {"x":2084,"y":1303,"w":113,"h":113}, + "frame": {"x":1256,"y":705,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -298,7 +298,7 @@ }, "sprites/belt/left_9.png": { - "frame": {"x":2201,"y":1303,"w":113,"h":113}, + "frame": {"x":1256,"y":822,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -306,7 +306,7 @@ }, "sprites/belt/left_10.png": { - "frame": {"x":2045,"y":328,"w":113,"h":113}, + "frame": {"x":2414,"y":1577,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -314,7 +314,7 @@ }, "sprites/belt/left_11.png": { - "frame": {"x":2162,"y":328,"w":113,"h":113}, + "frame": {"x":2402,"y":1888,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -322,7 +322,7 @@ }, "sprites/belt/left_12.png": { - "frame": {"x":2279,"y":317,"w":113,"h":113}, + "frame": {"x":1940,"y":3,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -330,7 +330,7 @@ }, "sprites/belt/left_13.png": { - "frame": {"x":2084,"y":835,"w":113,"h":113}, + "frame": {"x":1940,"y":120,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -338,7 +338,7 @@ }, "sprites/belt/left_14.png": { - "frame": {"x":2201,"y":835,"w":113,"h":113}, + "frame": {"x":839,"y":521,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -346,7 +346,7 @@ }, "sprites/belt/left_15.png": { - "frame": {"x":1841,"y":1017,"w":113,"h":113}, + "frame": {"x":901,"y":391,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -354,7 +354,7 @@ }, "sprites/belt/left_16.png": { - "frame": {"x":2318,"y":835,"w":113,"h":113}, + "frame": {"x":956,"y":508,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -362,7 +362,7 @@ }, "sprites/belt/left_17.png": { - "frame": {"x":1850,"y":1264,"w":113,"h":113}, + "frame": {"x":1018,"y":385,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -370,7 +370,7 @@ }, "sprites/belt/left_18.png": { - "frame": {"x":1847,"y":1381,"w":113,"h":113}, + "frame": {"x":1101,"y":237,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -378,7 +378,7 @@ }, "sprites/belt/left_19.png": { - "frame": {"x":1832,"y":1498,"w":113,"h":113}, + "frame": {"x":1022,"y":735,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -386,7 +386,7 @@ }, "sprites/belt/left_20.png": { - "frame": {"x":2201,"y":952,"w":113,"h":113}, + "frame": {"x":1073,"y":502,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -394,7 +394,7 @@ }, "sprites/belt/left_21.png": { - "frame": {"x":2318,"y":952,"w":113,"h":113}, + "frame": {"x":1135,"y":354,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -402,7 +402,7 @@ }, "sprites/belt/left_22.png": { - "frame": {"x":2435,"y":954,"w":113,"h":113}, + "frame": {"x":1218,"y":237,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -410,7 +410,7 @@ }, "sprites/belt/left_23.png": { - "frame": {"x":2084,"y":1069,"w":113,"h":113}, + "frame": {"x":1139,"y":619,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -418,7 +418,7 @@ }, "sprites/belt/left_24.png": { - "frame": {"x":2201,"y":1069,"w":113,"h":113}, + "frame": {"x":1190,"y":471,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -426,7 +426,7 @@ }, "sprites/belt/left_25.png": { - "frame": {"x":2318,"y":1069,"w":113,"h":113}, + "frame": {"x":1252,"y":354,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -434,7 +434,7 @@ }, "sprites/belt/left_26.png": { - "frame": {"x":2435,"y":1071,"w":113,"h":113}, + "frame": {"x":1335,"y":237,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -442,7 +442,7 @@ }, "sprites/belt/left_27.png": { - "frame": {"x":1967,"y":1129,"w":113,"h":113}, + "frame": {"x":1139,"y":736,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -450,7 +450,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":2318,"y":1303,"w":113,"h":113}, + "frame": {"x":1569,"y":197,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -458,7 +458,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":2435,"y":1305,"w":113,"h":113}, + "frame": {"x":1686,"y":197,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -466,7 +466,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":2300,"y":1537,"w":113,"h":113}, + "frame": {"x":1541,"y":431,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":2380,"y":1773,"w":113,"h":113}, + "frame": {"x":1490,"y":822,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":1439,"y":1742,"w":113,"h":113}, + "frame": {"x":1607,"y":705,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":1438,"y":1859,"w":113,"h":113}, + "frame": {"x":1607,"y":822,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":1555,"y":1859,"w":113,"h":113}, + "frame": {"x":1724,"y":665,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":1672,"y":1820,"w":113,"h":113}, + "frame": {"x":1724,"y":782,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":1789,"y":1820,"w":113,"h":113}, + "frame": {"x":1841,"y":705,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":1906,"y":1849,"w":113,"h":113}, + "frame": {"x":1958,"y":705,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -530,7 +530,7 @@ }, "sprites/belt/right_10.png": { - "frame": {"x":1967,"y":1363,"w":113,"h":113}, + "frame": {"x":1803,"y":197,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -538,7 +538,7 @@ }, "sprites/belt/right_11.png": { - "frame": {"x":2084,"y":1420,"w":113,"h":113}, + "frame": {"x":1920,"y":237,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -546,7 +546,7 @@ }, "sprites/belt/right_12.png": { - "frame": {"x":2201,"y":1420,"w":113,"h":113}, + "frame": {"x":1569,"y":314,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -554,7 +554,7 @@ }, "sprites/belt/right_13.png": { - "frame": {"x":2318,"y":1420,"w":113,"h":113}, + "frame": {"x":1686,"y":314,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -562,7 +562,7 @@ }, "sprites/belt/right_14.png": { - "frame": {"x":2435,"y":1422,"w":113,"h":113}, + "frame": {"x":1803,"y":314,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -570,7 +570,7 @@ }, "sprites/belt/right_15.png": { - "frame": {"x":1949,"y":1498,"w":113,"h":113}, + "frame": {"x":1920,"y":354,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -578,7 +578,7 @@ }, "sprites/belt/right_16.png": { - "frame": {"x":1912,"y":1615,"w":113,"h":113}, + "frame": {"x":1373,"y":588,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -586,7 +586,7 @@ }, "sprites/belt/right_17.png": { - "frame": {"x":1912,"y":1732,"w":113,"h":113}, + "frame": {"x":1424,"y":471,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -594,7 +594,7 @@ }, "sprites/belt/right_18.png": { - "frame": {"x":2066,"y":1537,"w":113,"h":113}, + "frame": {"x":1373,"y":705,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -602,7 +602,7 @@ }, "sprites/belt/right_19.png": { - "frame": {"x":2183,"y":1537,"w":113,"h":113}, + "frame": {"x":1373,"y":822,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":2417,"y":1539,"w":113,"h":113}, + "frame": {"x":1658,"y":431,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":2029,"y":1654,"w":113,"h":113}, + "frame": {"x":1775,"y":431,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":2146,"y":1654,"w":113,"h":113}, + "frame": {"x":1892,"y":471,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":2263,"y":1654,"w":113,"h":113}, + "frame": {"x":1541,"y":548,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":2029,"y":1771,"w":113,"h":113}, + "frame": {"x":1658,"y":548,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":2146,"y":1771,"w":113,"h":113}, + "frame": {"x":1775,"y":548,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":2263,"y":1771,"w":113,"h":113}, + "frame": {"x":1892,"y":588,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":2380,"y":1656,"w":113,"h":113}, + "frame": {"x":1490,"y":705,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -674,7 +674,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":2212,"y":199,"w":114,"h":114}, + "frame": {"x":2414,"y":1107,"w":114,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":12,"w":114,"h":114}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":2330,"y":199,"w":114,"h":114}, + "frame": {"x":2414,"y":1225,"w":114,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":12,"w":114,"h":114}, @@ -690,7 +690,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":2042,"y":198,"w":102,"h":126}, + "frame": {"x":135,"y":1899,"w":102,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":0,"w":102,"h":126}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/cutter-quad.png": { - "frame": {"x":1485,"y":3,"w":730,"h":191}, + "frame": {"x":1337,"y":1505,"w":730,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":730,"h":191}, @@ -706,7 +706,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":705,"y":1562,"w":341,"h":191}, + "frame": {"x":1472,"y":1107,"w":341,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":341,"h":191}, @@ -714,7 +714,7 @@ }, "sprites/blueprints/energy_generator.png": { - "frame": {"x":1123,"y":395,"w":339,"h":373}, + "frame": {"x":338,"y":737,"w":339,"h":373}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":25,"y":11,"w":339,"h":373}, @@ -722,7 +722,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1466,"y":395,"w":182,"h":190}, + "frame": {"x":735,"y":197,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -730,7 +730,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1511,"y":759,"w":182,"h":190}, + "frame": {"x":1754,"y":3,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -738,7 +738,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":3,"y":1704,"w":347,"h":191}, + "frame": {"x":2108,"y":393,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -746,7 +746,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":735,"y":395,"w":384,"h":382}, + "frame": {"x":3,"y":1513,"w":384,"h":382}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":382}, @@ -754,7 +754,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":735,"y":781,"w":384,"h":192}, + "frame": {"x":724,"y":1309,"w":384,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":192}, @@ -762,7 +762,7 @@ }, "sprites/blueprints/painter-quad.png": { - "frame": {"x":735,"y":3,"w":746,"h":192}, + "frame": {"x":391,"y":1510,"w":746,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":746,"h":192}, @@ -770,7 +770,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":724,"y":977,"w":384,"h":192}, + "frame": {"x":1112,"y":1309,"w":384,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":192}, @@ -778,7 +778,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":1246,"y":1550,"w":189,"h":191}, + "frame": {"x":1844,"y":1302,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -786,7 +786,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":1054,"y":1745,"w":189,"h":191}, + "frame": {"x":2013,"y":1107,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -794,7 +794,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":1658,"y":1146,"w":188,"h":182}, + "frame": {"x":757,"y":1706,"w":188,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":188,"h":182}, @@ -802,7 +802,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1455,"y":1345,"w":185,"h":182}, + "frame": {"x":949,"y":1706,"w":185,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":4,"w":185,"h":182}, @@ -810,7 +810,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":1123,"y":967,"w":340,"h":191}, + "frame": {"x":1500,"y":1302,"w":340,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":340,"h":191}, @@ -818,7 +818,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":354,"y":1695,"w":347,"h":191}, + "frame": {"x":2108,"y":588,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -826,7 +826,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":3,"y":1316,"w":331,"h":384}, + "frame": {"x":3,"y":737,"w":331,"h":384}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":29,"y":0,"w":331,"h":384}, @@ -834,7 +834,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":2219,"y":3,"w":192,"h":192}, + "frame": {"x":1141,"y":1505,"w":192,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":192}, @@ -842,7 +842,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":1466,"y":589,"w":183,"h":166}, + "frame": {"x":1517,"y":1700,"w":183,"h":166}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":26,"w":183,"h":166}, @@ -850,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":1622,"y":1668,"w":182,"h":148}, + "frame": {"x":1704,"y":1700,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":44,"w":182,"h":148}, @@ -858,7 +858,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":1658,"y":1332,"w":185,"h":148}, + "frame": {"x":1363,"y":1885,"w":185,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":185,"h":148}, @@ -866,7 +866,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":1485,"y":198,"w":182,"h":148}, + "frame": {"x":1737,"y":1852,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":148}, @@ -874,7 +874,7 @@ }, "sprites/blueprints/wire_left.png": { - "frame": {"x":183,"y":1899,"w":93,"h":93}, + "frame": {"x":839,"y":638,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":33,"w":93,"h":93}, @@ -882,7 +882,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":280,"y":1899,"w":93,"h":93}, + "frame": {"x":936,"y":638,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":33,"y":33,"w":93,"h":93}, @@ -890,7 +890,7 @@ }, "sprites/blueprints/wire_top.png": { - "frame": {"x":2148,"y":198,"w":60,"h":126}, + "frame": {"x":2108,"y":1824,"w":60,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":33,"y":0,"w":60,"h":126}, @@ -898,7 +898,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":2023,"y":1888,"w":113,"h":113}, + "frame": {"x":1841,"y":822,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -906,7 +906,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":2140,"y":1888,"w":113,"h":113}, + "frame": {"x":1958,"y":822,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -914,7 +914,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":2448,"y":135,"w":100,"h":126}, + "frame": {"x":241,"y":1899,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -922,7 +922,7 @@ }, "sprites/buildings/cutter-quad.png": { - "frame": {"x":3,"y":737,"w":728,"h":190}, + "frame": {"x":1022,"y":3,"w":728,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":728,"h":190}, @@ -930,7 +930,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":1112,"y":1162,"w":339,"h":190}, + "frame": {"x":2071,"y":1496,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -938,7 +938,7 @@ }, "sprites/buildings/energy_generator.png": { - "frame": {"x":338,"y":1319,"w":337,"h":372}, + "frame": {"x":681,"y":737,"w":337,"h":372}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":26,"y":12,"w":337,"h":372}, @@ -954,7 +954,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1439,"y":1550,"w":179,"h":188}, + "frame": {"x":574,"y":1706,"w":179,"h":188}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":1,"w":179,"h":188}, @@ -962,7 +962,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1658,"y":953,"w":179,"h":189}, + "frame": {"x":391,"y":1706,"w":179,"h":189}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":179,"h":189}, @@ -970,7 +970,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":679,"y":1368,"w":345,"h":190}, + "frame": {"x":2108,"y":783,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -978,7 +978,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":3,"y":931,"w":384,"h":381}, + "frame": {"x":336,"y":1125,"w":384,"h":381}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":381}, @@ -986,7 +986,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":1123,"y":772,"w":384,"h":191}, + "frame": {"x":2108,"y":3,"w":384,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":191}, @@ -994,7 +994,7 @@ }, "sprites/buildings/painter-quad.png": { - "frame": {"x":735,"y":199,"w":744,"h":192}, + "frame": {"x":724,"y":1113,"w":744,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":744,"h":192}, @@ -1002,7 +1002,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":724,"y":1173,"w":384,"h":191}, + "frame": {"x":2108,"y":198,"w":384,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":191}, @@ -1010,7 +1010,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":1247,"y":1745,"w":187,"h":190}, + "frame": {"x":2206,"y":1107,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -1018,7 +1018,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":1467,"y":967,"w":187,"h":190}, + "frame": {"x":735,"y":3,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -1026,7 +1026,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":1467,"y":1161,"w":187,"h":180}, + "frame": {"x":1138,"y":1706,"w":187,"h":180}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":187,"h":180}, @@ -1034,7 +1034,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1644,"y":1484,"w":184,"h":180}, + "frame": {"x":1329,"y":1701,"w":184,"h":180}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":5,"w":184,"h":180}, @@ -1042,7 +1042,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":1112,"y":1356,"w":339,"h":190}, + "frame": {"x":2179,"y":1694,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -1050,7 +1050,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":705,"y":1757,"w":345,"h":190}, + "frame": {"x":2037,"y":1302,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -1058,7 +1058,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":391,"y":931,"w":329,"h":384}, + "frame": {"x":3,"y":1125,"w":329,"h":384}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":30,"y":0,"w":329,"h":384}, @@ -1066,7 +1066,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":1050,"y":1550,"w":192,"h":191}, + "frame": {"x":1817,"y":1107,"w":192,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":192,"h":191}, @@ -1074,7 +1074,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":1671,"y":198,"w":181,"h":165}, + "frame": {"x":1552,"y":1870,"w":181,"h":165}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":27,"w":181,"h":165}, @@ -1082,7 +1082,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1652,"y":367,"w":181,"h":147}, + "frame": {"x":1890,"y":1700,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":45,"w":181,"h":147}, @@ -1090,7 +1090,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1856,"y":198,"w":182,"h":147}, + "frame": {"x":1177,"y":1890,"w":182,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":182,"h":147}, @@ -1098,7 +1098,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1653,"y":518,"w":181,"h":147}, + "frame": {"x":1923,"y":1851,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":181,"h":147}, @@ -1106,7 +1106,7 @@ }, "sprites/buildings/wire_left.png": { - "frame": {"x":377,"y":1890,"w":92,"h":92}, + "frame": {"x":926,"y":3,"w":92,"h":92}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":34,"w":92,"h":92}, @@ -1114,7 +1114,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":473,"y":1890,"w":92,"h":92}, + "frame": {"x":926,"y":99,"w":92,"h":92}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":34,"y":34,"w":92,"h":92}, @@ -1122,7 +1122,7 @@ }, "sprites/buildings/wire_top.png": { - "frame": {"x":1814,"y":786,"w":58,"h":126}, + "frame": {"x":839,"y":391,"w":58,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":34,"y":0,"w":58,"h":126}, @@ -1130,7 +1130,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1028,"y":1468,"w":50,"h":64}, + "frame": {"x":2478,"y":819,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -1138,7 +1138,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":648,"y":1890,"w":50,"h":64}, + "frame": {"x":2478,"y":887,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -1146,7 +1146,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":2415,"y":135,"w":24,"h":32}, + "frame": {"x":1773,"y":2004,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -1154,7 +1154,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":2029,"y":1615,"w":28,"h":28}, + "frame": {"x":1881,"y":2004,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":28,"h":28}, @@ -1162,7 +1162,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":2497,"y":1656,"w":28,"h":28}, + "frame": {"x":1913,"y":2004,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":28,"h":28}, @@ -1170,7 +1170,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":1653,"y":669,"w":82,"h":82}, + "frame": {"x":2108,"y":1954,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -1178,7 +1178,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":679,"y":1319,"w":32,"h":32}, + "frame": {"x":1737,"y":2004,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, @@ -1186,7 +1186,7 @@ }, "sprites/misc/lock_direction_indicator.png": { - "frame": {"x":2396,"y":317,"w":48,"h":30}, + "frame": {"x":1829,"y":2004,"w":48,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":48,"h":30}, @@ -1194,7 +1194,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":1653,"y":669,"w":82,"h":82}, + "frame": {"x":2108,"y":1954,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -1202,7 +1202,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":1028,"y":1368,"w":80,"h":96}, + "frame": {"x":926,"y":195,"w":80,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":80,"h":96}, @@ -1210,7 +1210,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":3,"y":1899,"w":176,"h":86}, + "frame": {"x":921,"y":295,"w":176,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":4,"w":176,"h":86}, @@ -1218,7 +1218,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1832,"y":1615,"w":24,"h":32}, + "frame": {"x":1801,"y":2004,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -1226,7 +1226,7 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":2415,"y":3,"w":128,"h":128}, + "frame": {"x":3,"y":1899,"w":128,"h":128}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, @@ -1234,7 +1234,7 @@ }, "sprites/wires/negative_energy.png": { - "frame": {"x":1697,"y":903,"w":42,"h":42}, + "frame": {"x":2062,"y":3,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":11,"w":42,"h":42}, @@ -1242,39 +1242,39 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":569,"y":1890,"w":75,"h":106}, + "frame": {"x":2459,"y":393,"w":73,"h":105}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":26,"y":0,"w":75,"h":106}, + "spriteSourceSize": {"x":27,"y":0,"w":73,"h":105}, "sourceSize": {"w":128,"h":128} }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":2462,"y":395,"w":75,"h":106}, + "frame": {"x":2459,"y":611,"w":63,"h":100}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":26,"y":0,"w":75,"h":106}, + "spriteSourceSize": {"x":32,"y":0,"w":63,"h":100}, "sourceSize": {"w":128,"h":128} }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":2257,"y":1888,"w":75,"h":106}, + "frame": {"x":2459,"y":715,"w":63,"h":100}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":26,"y":0,"w":75,"h":106}, + "spriteSourceSize": {"x":32,"y":0,"w":63,"h":100}, "sourceSize": {"w":128,"h":128} }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":2336,"y":1890,"w":75,"h":106}, + "frame": {"x":2459,"y":502,"w":73,"h":105}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":26,"y":0,"w":75,"h":106}, + "spriteSourceSize": {"x":27,"y":0,"w":73,"h":105}, "sourceSize": {"w":128,"h":128} }, "sprites/wires/positive_energy.png": { - "frame": {"x":2462,"y":505,"w":42,"h":42}, + "frame": {"x":2062,"y":49,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":11,"w":42,"h":42}, @@ -1285,8 +1285,8 @@ "version": "1.0", "image": "atlas0_100.png", "format": "RGBA8888", - "size": {"w":2551,"h":2004}, + "size": {"w":2535,"h":2040}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:64992def403ecae5d6a9a8c1d669aa36:a6ea6940afa6efd3e09314c1b1be5a97:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:f9d84407e7fd8a428996f4d57e250e84:01202b345d862a009ec7b1beee1ef160:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.png b/res_built/atlas/atlas0_100.png index a4182a50..d0f84383 100644 Binary files a/res_built/atlas/atlas0_100.png and b/res_built/atlas/atlas0_100.png differ diff --git a/res_built/atlas/atlas0_25.json b/res_built/atlas/atlas0_25.json index d373f082..9a4a7ad6 100644 --- a/res_built/atlas/atlas0_25.json +++ b/res_built/atlas/atlas0_25.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":3,"y":615,"w":28,"h":32}, + "frame": {"x":443,"y":159,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":29,"y":550,"w":28,"h":32}, + "frame": {"x":196,"y":623,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":99,"y":788,"w":28,"h":32}, + "frame": {"x":318,"y":385,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":229,"y":775,"w":28,"h":32}, + "frame": {"x":267,"y":491,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":261,"y":725,"w":28,"h":32}, + "frame": {"x":299,"y":491,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":291,"y":685,"w":28,"h":32}, + "frame": {"x":331,"y":455,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -50,7 +50,7 @@ }, "sprites/belt/forward_6.png": { - "frame": {"x":261,"y":761,"w":28,"h":32}, + "frame": {"x":331,"y":491,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -58,7 +58,7 @@ }, "sprites/belt/forward_7.png": { - "frame": {"x":293,"y":721,"w":28,"h":32}, + "frame": {"x":363,"y":455,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -66,7 +66,7 @@ }, "sprites/belt/forward_8.png": { - "frame": {"x":323,"y":683,"w":28,"h":32}, + "frame": {"x":363,"y":491,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -74,7 +74,7 @@ }, "sprites/belt/forward_9.png": { - "frame": {"x":293,"y":757,"w":28,"h":32}, + "frame": {"x":395,"y":455,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -82,7 +82,7 @@ }, "sprites/belt/forward_10.png": { - "frame": {"x":61,"y":550,"w":28,"h":32}, + "frame": {"x":196,"y":659,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -90,7 +90,7 @@ }, "sprites/belt/forward_11.png": { - "frame": {"x":35,"y":615,"w":28,"h":32}, + "frame": {"x":235,"y":446,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -98,7 +98,7 @@ }, "sprites/belt/forward_12.png": { - "frame": {"x":3,"y":731,"w":28,"h":32}, + "frame": {"x":235,"y":482,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -106,7 +106,7 @@ }, "sprites/belt/forward_13.png": { - "frame": {"x":3,"y":767,"w":28,"h":32}, + "frame": {"x":235,"y":518,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -114,7 +114,7 @@ }, "sprites/belt/forward_14.png": { - "frame": {"x":35,"y":731,"w":28,"h":32}, + "frame": {"x":254,"y":349,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -122,7 +122,7 @@ }, "sprites/belt/forward_15.png": { - "frame": {"x":54,"y":686,"w":28,"h":32}, + "frame": {"x":286,"y":349,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -130,7 +130,7 @@ }, "sprites/belt/forward_16.png": { - "frame": {"x":35,"y":767,"w":28,"h":32}, + "frame": {"x":254,"y":385,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -138,7 +138,7 @@ }, "sprites/belt/forward_17.png": { - "frame": {"x":120,"y":686,"w":28,"h":32}, + "frame": {"x":318,"y":349,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -146,7 +146,7 @@ }, "sprites/belt/forward_18.png": { - "frame": {"x":120,"y":722,"w":28,"h":32}, + "frame": {"x":286,"y":385,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -154,7 +154,7 @@ }, "sprites/belt/forward_19.png": { - "frame": {"x":67,"y":788,"w":28,"h":32}, + "frame": {"x":350,"y":349,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -162,7 +162,7 @@ }, "sprites/belt/forward_20.png": { - "frame": {"x":131,"y":758,"w":28,"h":32}, + "frame": {"x":382,"y":349,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -170,7 +170,7 @@ }, "sprites/belt/forward_21.png": { - "frame": {"x":163,"y":748,"w":28,"h":32}, + "frame": {"x":350,"y":385,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -178,7 +178,7 @@ }, "sprites/belt/forward_22.png": { - "frame": {"x":165,"y":784,"w":28,"h":32}, + "frame": {"x":382,"y":385,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -186,7 +186,7 @@ }, "sprites/belt/forward_23.png": { - "frame": {"x":195,"y":731,"w":28,"h":32}, + "frame": {"x":414,"y":349,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -194,7 +194,7 @@ }, "sprites/belt/forward_24.png": { - "frame": {"x":197,"y":767,"w":28,"h":32}, + "frame": {"x":414,"y":385,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -202,7 +202,7 @@ }, "sprites/belt/forward_25.png": { - "frame": {"x":227,"y":703,"w":28,"h":32}, + "frame": {"x":443,"y":195,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -210,7 +210,7 @@ }, "sprites/belt/forward_26.png": { - "frame": {"x":229,"y":739,"w":28,"h":32}, + "frame": {"x":267,"y":455,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -218,7 +218,7 @@ }, "sprites/belt/forward_27.png": { - "frame": {"x":259,"y":689,"w":28,"h":32}, + "frame": {"x":299,"y":455,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -226,7 +226,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":427,"y":162,"w":30,"h":30}, + "frame": {"x":235,"y":554,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -234,7 +234,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":391,"y":195,"w":30,"h":30}, + "frame": {"x":232,"y":588,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -242,7 +242,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":155,"y":346,"w":30,"h":30}, + "frame": {"x":335,"y":421,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -250,7 +250,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":146,"y":516,"w":30,"h":30}, + "frame": {"x":269,"y":561,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -258,7 +258,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":323,"y":513,"w":30,"h":30}, + "frame": {"x":303,"y":561,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -266,7 +266,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":323,"y":547,"w":30,"h":30}, + "frame": {"x":337,"y":561,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -274,7 +274,7 @@ }, "sprites/belt/left_6.png": { - "frame": {"x":232,"y":519,"w":30,"h":30}, + "frame": {"x":371,"y":561,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -282,7 +282,7 @@ }, "sprites/belt/left_7.png": { - "frame": {"x":232,"y":553,"w":30,"h":30}, + "frame": {"x":266,"y":595,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -290,7 +290,7 @@ }, "sprites/belt/left_8.png": { - "frame": {"x":318,"y":581,"w":30,"h":30}, + "frame": {"x":300,"y":595,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -298,7 +298,7 @@ }, "sprites/belt/left_9.png": { - "frame": {"x":144,"y":550,"w":30,"h":30}, + "frame": {"x":334,"y":595,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -306,7 +306,7 @@ }, "sprites/belt/left_10.png": { - "frame": {"x":425,"y":196,"w":30,"h":30}, + "frame": {"x":269,"y":315,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -314,7 +314,7 @@ }, "sprites/belt/left_11.png": { - "frame": {"x":391,"y":229,"w":30,"h":30}, + "frame": {"x":303,"y":315,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -322,7 +322,7 @@ }, "sprites/belt/left_12.png": { - "frame": {"x":425,"y":230,"w":30,"h":30}, + "frame": {"x":337,"y":315,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -330,7 +330,7 @@ }, "sprites/belt/left_13.png": { - "frame": {"x":155,"y":244,"w":30,"h":30}, + "frame": {"x":371,"y":315,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -338,7 +338,7 @@ }, "sprites/belt/left_14.png": { - "frame": {"x":155,"y":278,"w":30,"h":30}, + "frame": {"x":405,"y":315,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -346,7 +346,7 @@ }, "sprites/belt/left_15.png": { - "frame": {"x":389,"y":263,"w":30,"h":30}, + "frame": {"x":441,"y":231,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -354,7 +354,7 @@ }, "sprites/belt/left_16.png": { - "frame": {"x":423,"y":264,"w":30,"h":30}, + "frame": {"x":441,"y":265,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -362,7 +362,7 @@ }, "sprites/belt/left_17.png": { - "frame": {"x":389,"y":297,"w":30,"h":30}, + "frame": {"x":441,"y":299,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -370,7 +370,7 @@ }, "sprites/belt/left_18.png": { - "frame": {"x":423,"y":298,"w":30,"h":30}, + "frame": {"x":267,"y":421,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -378,7 +378,7 @@ }, "sprites/belt/left_19.png": { - "frame": {"x":155,"y":312,"w":30,"h":30}, + "frame": {"x":301,"y":421,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -386,7 +386,7 @@ }, "sprites/belt/left_20.png": { - "frame": {"x":387,"y":331,"w":30,"h":30}, + "frame": {"x":369,"y":421,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -394,7 +394,7 @@ }, "sprites/belt/left_21.png": { - "frame": {"x":421,"y":332,"w":30,"h":30}, + "frame": {"x":403,"y":421,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -402,7 +402,7 @@ }, "sprites/belt/left_22.png": { - "frame": {"x":387,"y":365,"w":30,"h":30}, + "frame": {"x":427,"y":491,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -410,7 +410,7 @@ }, "sprites/belt/left_23.png": { - "frame": {"x":421,"y":366,"w":30,"h":30}, + "frame": {"x":437,"y":421,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -418,7 +418,7 @@ }, "sprites/belt/left_24.png": { - "frame": {"x":147,"y":380,"w":30,"h":30}, + "frame": {"x":269,"y":527,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -426,7 +426,7 @@ }, "sprites/belt/left_25.png": { - "frame": {"x":146,"y":414,"w":30,"h":30}, + "frame": {"x":303,"y":527,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -434,7 +434,7 @@ }, "sprites/belt/left_26.png": { - "frame": {"x":146,"y":448,"w":30,"h":30}, + "frame": {"x":337,"y":527,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -442,7 +442,7 @@ }, "sprites/belt/left_27.png": { - "frame": {"x":146,"y":482,"w":30,"h":30}, + "frame": {"x":371,"y":527,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -450,7 +450,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":144,"y":584,"w":30,"h":30}, + "frame": {"x":368,"y":595,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -458,7 +458,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":229,"y":587,"w":30,"h":30}, + "frame": {"x":405,"y":527,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -466,7 +466,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":67,"y":754,"w":30,"h":30}, + "frame": {"x":402,"y":629,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":325,"y":754,"w":30,"h":30}, + "frame": {"x":298,"y":697,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":325,"y":788,"w":30,"h":30}, + "frame": {"x":332,"y":697,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":359,"y":720,"w":30,"h":30}, + "frame": {"x":366,"y":697,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":393,"y":720,"w":30,"h":30}, + "frame": {"x":400,"y":697,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":427,"y":720,"w":30,"h":30}, + "frame": {"x":264,"y":731,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":359,"y":754,"w":30,"h":30}, + "frame": {"x":298,"y":731,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":359,"y":788,"w":30,"h":30}, + "frame": {"x":332,"y":731,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -530,7 +530,7 @@ }, "sprites/belt/right_10.png": { - "frame": {"x":229,"y":621,"w":30,"h":30}, + "frame": {"x":405,"y":561,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -538,7 +538,7 @@ }, "sprites/belt/right_11.png": { - "frame": {"x":314,"y":615,"w":30,"h":30}, + "frame": {"x":402,"y":595,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -546,7 +546,7 @@ }, "sprites/belt/right_12.png": { - "frame": {"x":229,"y":655,"w":30,"h":30}, + "frame": {"x":439,"y":525,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -554,7 +554,7 @@ }, "sprites/belt/right_13.png": { - "frame": {"x":314,"y":649,"w":30,"h":30}, + "frame": {"x":439,"y":559,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -562,7 +562,7 @@ }, "sprites/belt/right_14.png": { - "frame": {"x":129,"y":618,"w":30,"h":30}, + "frame": {"x":232,"y":622,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -570,7 +570,7 @@ }, "sprites/belt/right_15.png": { - "frame": {"x":118,"y":652,"w":30,"h":30}, + "frame": {"x":228,"y":656,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -578,7 +578,7 @@ }, "sprites/belt/right_16.png": { - "frame": {"x":177,"y":663,"w":30,"h":30}, + "frame": {"x":266,"y":629,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -586,7 +586,7 @@ }, "sprites/belt/right_17.png": { - "frame": {"x":177,"y":697,"w":30,"h":30}, + "frame": {"x":300,"y":629,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -594,7 +594,7 @@ }, "sprites/belt/right_18.png": { - "frame": {"x":86,"y":686,"w":30,"h":30}, + "frame": {"x":334,"y":629,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -602,7 +602,7 @@ }, "sprites/belt/right_19.png": { - "frame": {"x":86,"y":720,"w":30,"h":30}, + "frame": {"x":368,"y":629,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":131,"y":794,"w":30,"h":30}, + "frame": {"x":262,"y":663,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":355,"y":652,"w":30,"h":30}, + "frame": {"x":296,"y":663,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":389,"y":652,"w":30,"h":30}, + "frame": {"x":330,"y":663,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":423,"y":652,"w":30,"h":30}, + "frame": {"x":364,"y":663,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":355,"y":686,"w":30,"h":30}, + "frame": {"x":398,"y":663,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":389,"y":686,"w":30,"h":30}, + "frame": {"x":228,"y":690,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":423,"y":686,"w":30,"h":30}, + "frame": {"x":230,"y":724,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":325,"y":720,"w":30,"h":30}, + "frame": {"x":264,"y":697,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -674,7 +674,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":393,"y":754,"w":30,"h":30}, + "frame": {"x":366,"y":731,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":427,"y":754,"w":30,"h":30}, + "frame": {"x":400,"y":731,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -690,7 +690,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":293,"y":793,"w":28,"h":32}, + "frame": {"x":395,"y":491,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/cutter-quad.png": { - "frame": {"x":191,"y":55,"w":184,"h":48}, + "frame": {"x":3,"y":192,"w":184,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":184,"h":48}, @@ -706,7 +706,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":180,"y":415,"w":87,"h":48}, + "frame": {"x":92,"y":498,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -714,7 +714,7 @@ }, "sprites/blueprints/energy_generator.png": { - "frame": {"x":281,"y":363,"w":87,"h":94}, + "frame": {"x":3,"y":644,"w":87,"h":94}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":87,"h":94}, @@ -722,7 +722,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":352,"y":600,"w":47,"h":48}, + "frame": {"x":94,"y":644,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -730,7 +730,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":403,"y":600,"w":47,"h":48}, + "frame": {"x":203,"y":342,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -738,7 +738,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":189,"y":311,"w":89,"h":48}, + "frame": {"x":383,"y":3,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -746,7 +746,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":191,"y":159,"w":96,"h":96}, + "frame": {"x":3,"y":244,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -754,7 +754,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":3,"y":244,"w":96,"h":48}, + "frame": {"x":191,"y":159,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -762,7 +762,7 @@ }, "sprites/blueprints/painter-quad.png": { - "frame": {"x":3,"y":3,"w":188,"h":48}, + "frame": {"x":191,"y":3,"w":188,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":188,"h":48}, @@ -770,7 +770,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":189,"y":259,"w":96,"h":48}, + "frame": {"x":291,"y":159,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -778,7 +778,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":387,"y":3,"w":48,"h":48}, + "frame": {"x":391,"y":159,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -786,7 +786,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":379,"y":55,"w":48,"h":48}, + "frame": {"x":285,"y":211,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -794,7 +794,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":379,"y":107,"w":48,"h":48}, + "frame": {"x":285,"y":263,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -802,7 +802,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":178,"y":561,"w":47,"h":47}, + "frame": {"x":55,"y":742,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -810,7 +810,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":3,"y":498,"w":87,"h":48}, + "frame": {"x":92,"y":550,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -818,7 +818,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":282,"y":311,"w":89,"h":48}, + "frame": {"x":383,"y":55,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -826,7 +826,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":372,"y":400,"w":85,"h":96}, + "frame": {"x":3,"y":444,"w":85,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":85,"h":96}, @@ -834,7 +834,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":103,"y":244,"w":48,"h":48}, + "frame": {"x":337,"y":211,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -842,7 +842,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":94,"y":503,"w":48,"h":43}, + "frame": {"x":183,"y":498,"w":48,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":48,"h":43}, @@ -850,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":271,"y":513,"w":48,"h":38}, + "frame": {"x":92,"y":602,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -858,7 +858,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":180,"y":519,"w":48,"h":38}, + "frame": {"x":183,"y":545,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -866,7 +866,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":266,"y":555,"w":48,"h":38}, + "frame": {"x":144,"y":602,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -874,7 +874,7 @@ }, "sprites/blueprints/wire_left.png": { - "frame": {"x":431,"y":75,"w":25,"h":25}, + "frame": {"x":196,"y":695,"w":25,"h":25}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":7,"w":25,"h":25}, @@ -882,7 +882,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":431,"y":104,"w":25,"h":25}, + "frame": {"x":446,"y":333,"w":25,"h":25}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":25,"h":25}, @@ -890,7 +890,7 @@ }, "sprites/blueprints/wire_top.png": { - "frame": {"x":439,"y":3,"w":18,"h":32}, + "frame": {"x":208,"y":724,"w":18,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":18,"h":32}, @@ -898,7 +898,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":393,"y":788,"w":30,"h":30}, + "frame": {"x":230,"y":758,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -906,7 +906,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":427,"y":788,"w":30,"h":30}, + "frame": {"x":432,"y":663,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -914,7 +914,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":3,"y":615,"w":28,"h":32}, + "frame": {"x":443,"y":159,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -930,7 +930,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":271,"y":461,"w":87,"h":48}, + "frame": {"x":194,"y":211,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -938,7 +938,7 @@ }, "sprites/buildings/energy_generator.png": { - "frame": {"x":3,"y":400,"w":87,"h":94}, + "frame": {"x":103,"y":244,"w":87,"h":94}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":87,"h":94}, @@ -946,7 +946,7 @@ }, "sprites/buildings/hub.png": { - "frame": {"x":3,"y":55,"w":184,"h":185}, + "frame": {"x":3,"y":3,"w":184,"h":185}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":184,"h":185}, @@ -954,7 +954,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":3,"y":652,"w":47,"h":48}, + "frame": {"x":203,"y":394,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -962,7 +962,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":93,"y":550,"w":47,"h":48}, + "frame": {"x":184,"y":446,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -970,7 +970,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":3,"y":348,"w":88,"h":48}, + "frame": {"x":379,"y":107,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -978,7 +978,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":291,"y":159,"w":96,"h":96}, + "frame": {"x":3,"y":344,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -986,7 +986,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":289,"y":259,"w":96,"h":48}, + "frame": {"x":103,"y":342,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -994,7 +994,7 @@ }, "sprites/buildings/painter-quad.png": { - "frame": {"x":195,"y":3,"w":188,"h":48}, + "frame": {"x":191,"y":55,"w":188,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":188,"h":48}, @@ -1002,7 +1002,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":3,"y":296,"w":96,"h":48}, + "frame": {"x":103,"y":394,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -1010,7 +1010,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":103,"y":296,"w":48,"h":48}, + "frame": {"x":337,"y":263,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1018,7 +1018,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":95,"y":348,"w":48,"h":48}, + "frame": {"x":389,"y":211,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1026,7 +1026,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":94,"y":452,"w":48,"h":47}, + "frame": {"x":3,"y":742,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -1034,7 +1034,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":178,"y":612,"w":47,"h":47}, + "frame": {"x":106,"y":742,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -1042,7 +1042,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":180,"y":467,"w":87,"h":48}, + "frame": {"x":194,"y":263,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -1050,7 +1050,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":189,"y":363,"w":88,"h":48}, + "frame": {"x":92,"y":446,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -1058,7 +1058,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":362,"y":500,"w":85,"h":96}, + "frame": {"x":3,"y":544,"w":85,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":85,"h":96}, @@ -1066,7 +1066,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":94,"y":400,"w":48,"h":48}, + "frame": {"x":389,"y":263,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1074,7 +1074,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":263,"y":597,"w":47,"h":42}, + "frame": {"x":94,"y":696,"w":47,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":47,"h":42}, @@ -1082,7 +1082,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":263,"y":643,"w":47,"h":38}, + "frame": {"x":145,"y":644,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -1090,7 +1090,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":78,"y":602,"w":47,"h":38}, + "frame": {"x":145,"y":686,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -1098,7 +1098,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":67,"y":644,"w":47,"h":38}, + "frame": {"x":157,"y":728,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -1106,7 +1106,7 @@ }, "sprites/buildings/wire_left.png": { - "frame": {"x":431,"y":133,"w":25,"h":25}, + "frame": {"x":446,"y":362,"w":25,"h":25}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":7,"w":25,"h":25}, @@ -1114,7 +1114,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":101,"y":758,"w":25,"h":25}, + "frame": {"x":434,"y":697,"w":25,"h":25}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":25,"h":25}, @@ -1122,7 +1122,7 @@ }, "sprites/buildings/wire_top.png": { - "frame": {"x":439,"y":39,"w":18,"h":32}, + "frame": {"x":427,"y":455,"w":18,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":18,"h":32}, @@ -1130,7 +1130,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":211,"y":663,"w":14,"h":16}, + "frame": {"x":458,"y":726,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1138,7 +1138,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":211,"y":683,"w":14,"h":16}, + "frame": {"x":458,"y":746,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1146,7 +1146,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":375,"y":311,"w":8,"h":8}, + "frame": {"x":145,"y":728,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1154,7 +1154,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":375,"y":323,"w":8,"h":8}, + "frame": {"x":290,"y":781,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1162,7 +1162,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":375,"y":335,"w":8,"h":8}, + "frame": {"x":302,"y":781,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1170,7 +1170,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":3,"y":561,"w":22,"h":22}, + "frame": {"x":243,"y":315,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -1178,7 +1178,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":375,"y":347,"w":8,"h":8}, + "frame": {"x":183,"y":587,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1186,7 +1186,7 @@ }, "sprites/misc/lock_direction_indicator.png": { - "frame": {"x":3,"y":716,"w":12,"h":10}, + "frame": {"x":173,"y":770,"w":12,"h":10}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":12,"h":10}, @@ -1194,7 +1194,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":3,"y":561,"w":22,"h":22}, + "frame": {"x":243,"y":315,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -1202,7 +1202,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":3,"y":587,"w":22,"h":24}, + "frame": {"x":264,"y":765,"w":22,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":22,"h":24}, @@ -1210,7 +1210,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":29,"y":587,"w":45,"h":23}, + "frame": {"x":194,"y":315,"w":45,"h":23}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":45,"h":23}, @@ -1218,7 +1218,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":375,"y":359,"w":8,"h":8}, + "frame": {"x":254,"y":421,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1226,7 +1226,7 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":391,"y":159,"w":32,"h":32}, + "frame": {"x":196,"y":587,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, @@ -1234,7 +1234,7 @@ }, "sprites/wires/negative_energy.png": { - "frame": {"x":19,"y":704,"w":12,"h":12}, + "frame": {"x":157,"y":770,"w":12,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":12,"h":12}, @@ -1242,39 +1242,39 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":152,"y":652,"w":21,"h":28}, + "frame": {"x":449,"y":455,"w":20,"h":27}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":5,"y":0,"w":21,"h":28}, + "spriteSourceSize": {"x":6,"y":0,"w":20,"h":27}, "sourceSize": {"w":32,"h":32} }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":152,"y":684,"w":21,"h":28}, + "frame": {"x":446,"y":391,"w":18,"h":26}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":5,"y":0,"w":21,"h":28}, + "spriteSourceSize": {"x":7,"y":0,"w":18,"h":26}, "sourceSize": {"w":32,"h":32} }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":152,"y":716,"w":21,"h":28}, + "frame": {"x":208,"y":760,"w":18,"h":26}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":5,"y":0,"w":21,"h":28}, + "spriteSourceSize": {"x":7,"y":0,"w":18,"h":26}, "sourceSize": {"w":32,"h":32} }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":261,"y":797,"w":21,"h":28}, + "frame": {"x":434,"y":726,"w":20,"h":27}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":5,"y":0,"w":21,"h":28}, + "spriteSourceSize": {"x":6,"y":0,"w":20,"h":27}, "sourceSize": {"w":32,"h":32} }, "sprites/wires/positive_energy.png": { - "frame": {"x":3,"y":803,"w":12,"h":12}, + "frame": {"x":290,"y":765,"w":12,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":12,"h":12}, @@ -1285,8 +1285,8 @@ "version": "1.0", "image": "atlas0_25.png", "format": "RGBA8888", - "size": {"w":460,"h":828}, + "size": {"w":475,"h":792}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:64992def403ecae5d6a9a8c1d669aa36:a6ea6940afa6efd3e09314c1b1be5a97:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:f9d84407e7fd8a428996f4d57e250e84:01202b345d862a009ec7b1beee1ef160:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png index 0a0b9b48..2f45149f 100644 Binary files a/res_built/atlas/atlas0_25.png and b/res_built/atlas/atlas0_25.png differ diff --git a/res_built/atlas/atlas0_50.json b/res_built/atlas/atlas0_50.json index 3334d77e..ce96d87a 100644 --- a/res_built/atlas/atlas0_50.json +++ b/res_built/atlas/atlas0_50.json @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":1207,"y":770,"w":57,"h":57}, + "frame": {"x":1142,"y":892,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":1081,"y":832,"w":57,"h":57}, + "frame": {"x":1203,"y":892,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":1081,"y":893,"w":57,"h":57}, + "frame": {"x":958,"y":893,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":1081,"y":954,"w":57,"h":57}, + "frame": {"x":1019,"y":893,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":1142,"y":831,"w":57,"h":57}, + "frame": {"x":1080,"y":893,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":1142,"y":892,"w":57,"h":57}, + "frame": {"x":958,"y":954,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":1203,"y":831,"w":57,"h":57}, + "frame": {"x":1019,"y":954,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":959,"y":893,"w":57,"h":57}, + "frame": {"x":1020,"y":832,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":959,"y":954,"w":57,"h":57}, + "frame": {"x":1024,"y":771,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":1020,"y":832,"w":57,"h":57}, + "frame": {"x":1085,"y":770,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":1020,"y":893,"w":57,"h":57}, + "frame": {"x":1146,"y":770,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":1020,"y":954,"w":57,"h":57}, + "frame": {"x":1207,"y":770,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":1024,"y":771,"w":57,"h":57}, + "frame": {"x":1081,"y":832,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":1085,"y":770,"w":57,"h":57}, + "frame": {"x":1142,"y":831,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":1146,"y":770,"w":57,"h":57}, + "frame": {"x":1203,"y":831,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -898,7 +898,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":1142,"y":953,"w":57,"h":57}, + "frame": {"x":1080,"y":954,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -906,7 +906,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1203,"y":892,"w":57,"h":57}, + "frame": {"x":1141,"y":953,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -970,7 +970,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":936,"y":203,"w":174,"h":96}, + "frame": {"x":1126,"y":103,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -1050,7 +1050,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":1126,"y":103,"w":174,"h":96}, + "frame": {"x":936,"y":203,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -1106,7 +1106,7 @@ }, "sprites/buildings/wire_left.png": { - "frame": {"x":1203,"y":953,"w":47,"h":47}, + "frame": {"x":1202,"y":953,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":16,"w":47,"h":47}, @@ -1114,7 +1114,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":1254,"y":953,"w":47,"h":47}, + "frame": {"x":1253,"y":953,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":16,"y":16,"w":47,"h":47}, @@ -1154,7 +1154,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":1288,"y":303,"w":15,"h":15}, + "frame": {"x":878,"y":762,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":15,"h":15}, @@ -1162,7 +1162,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":1288,"y":322,"w":15,"h":15}, + "frame": {"x":1270,"y":648,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":15,"h":15}, @@ -1242,34 +1242,34 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":916,"y":877,"w":39,"h":54}, + "frame": {"x":916,"y":877,"w":38,"h":53}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":12,"y":0,"w":39,"h":54}, + "spriteSourceSize": {"x":13,"y":0,"w":38,"h":53}, "sourceSize": {"w":64,"h":64} }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":916,"y":935,"w":39,"h":54}, + "frame": {"x":1264,"y":831,"w":33,"h":51}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":12,"y":0,"w":39,"h":54}, + "spriteSourceSize": {"x":15,"y":0,"w":33,"h":51}, "sourceSize": {"w":64,"h":64} }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":1264,"y":831,"w":39,"h":54}, + "frame": {"x":1264,"y":886,"w":33,"h":51}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":12,"y":0,"w":39,"h":54}, + "spriteSourceSize": {"x":15,"y":0,"w":33,"h":51}, "sourceSize": {"w":64,"h":64} }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":1264,"y":889,"w":39,"h":54}, + "frame": {"x":916,"y":934,"w":38,"h":53}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":12,"y":0,"w":39,"h":54}, + "spriteSourceSize": {"x":13,"y":0,"w":38,"h":53}, "sourceSize": {"w":64,"h":64} }, "sprites/wires/positive_energy.png": @@ -1285,8 +1285,8 @@ "version": "1.0", "image": "atlas0_50.png", "format": "RGBA8888", - "size": {"w":1306,"h":1024}, + "size": {"w":1303,"h":1024}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:64992def403ecae5d6a9a8c1d669aa36:a6ea6940afa6efd3e09314c1b1be5a97:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:f9d84407e7fd8a428996f4d57e250e84:01202b345d862a009ec7b1beee1ef160:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png index 4d0cddff..0512ebe7 100644 Binary files a/res_built/atlas/atlas0_50.png and b/res_built/atlas/atlas0_50.png differ diff --git a/res_built/atlas/atlas0_75.json b/res_built/atlas/atlas0_75.json index ecd0db0e..3563e6d5 100644 --- a/res_built/atlas/atlas0_75.json +++ b/res_built/atlas/atlas0_75.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":1930,"y":443,"w":77,"h":95}, + "frame": {"x":1879,"y":594,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":1077,"y":738,"w":77,"h":95}, + "frame": {"x":1167,"y":781,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":1123,"y":1276,"w":77,"h":95}, + "frame": {"x":1960,"y":537,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":500,"y":1285,"w":77,"h":95}, + "frame": {"x":1838,"y":1153,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":581,"y":1285,"w":77,"h":95}, + "frame": {"x":1757,"y":1252,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":662,"y":1336,"w":77,"h":95}, + "frame": {"x":1838,"y":1252,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -50,7 +50,7 @@ }, "sprites/belt/forward_6.png": { - "frame": {"x":743,"y":1336,"w":77,"h":95}, + "frame": {"x":1919,"y":1185,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -58,7 +58,7 @@ }, "sprites/belt/forward_7.png": { - "frame": {"x":824,"y":1329,"w":77,"h":95}, + "frame": {"x":1919,"y":1284,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -66,7 +66,7 @@ }, "sprites/belt/forward_8.png": { - "frame": {"x":905,"y":1329,"w":77,"h":95}, + "frame": {"x":1318,"y":1290,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -74,7 +74,7 @@ }, "sprites/belt/forward_9.png": { - "frame": {"x":1914,"y":723,"w":77,"h":95}, + "frame": {"x":1399,"y":1293,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -82,7 +82,7 @@ }, "sprites/belt/forward_10.png": { - "frame": {"x":1077,"y":837,"w":77,"h":95}, + "frame": {"x":1167,"y":880,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -90,7 +90,7 @@ }, "sprites/belt/forward_11.png": { - "frame": {"x":1076,"y":936,"w":77,"h":95}, + "frame": {"x":1428,"y":816,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -98,7 +98,7 @@ }, "sprites/belt/forward_12.png": { - "frame": {"x":1878,"y":838,"w":77,"h":95}, + "frame": {"x":1509,"y":774,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -106,7 +106,7 @@ }, "sprites/belt/forward_13.png": { - "frame": {"x":1507,"y":1131,"w":77,"h":95}, + "frame": {"x":1428,"y":915,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -114,7 +114,7 @@ }, "sprites/belt/forward_14.png": { - "frame": {"x":1588,"y":1131,"w":77,"h":95}, + "frame": {"x":1257,"y":920,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -122,7 +122,7 @@ }, "sprites/belt/forward_15.png": { - "frame": {"x":1687,"y":1215,"w":77,"h":95}, + "frame": {"x":1347,"y":1011,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -130,7 +130,7 @@ }, "sprites/belt/forward_16.png": { - "frame": {"x":1768,"y":1215,"w":77,"h":95}, + "frame": {"x":1428,"y":1014,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -138,7 +138,7 @@ }, "sprites/belt/forward_17.png": { - "frame": {"x":1939,"y":1117,"w":77,"h":95}, + "frame": {"x":1779,"y":865,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -146,7 +146,7 @@ }, "sprites/belt/forward_18.png": { - "frame": {"x":682,"y":1138,"w":77,"h":95}, + "frame": {"x":1779,"y":964,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -154,7 +154,7 @@ }, "sprites/belt/forward_19.png": { - "frame": {"x":682,"y":1237,"w":77,"h":95}, + "frame": {"x":1869,"y":1054,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -162,7 +162,7 @@ }, "sprites/belt/forward_20.png": { - "frame": {"x":1204,"y":1310,"w":77,"h":95}, + "frame": {"x":1960,"y":636,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -170,7 +170,7 @@ }, "sprites/belt/forward_21.png": { - "frame": {"x":1285,"y":1311,"w":77,"h":95}, + "frame": {"x":684,"y":1138,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -178,7 +178,7 @@ }, "sprites/belt/forward_22.png": { - "frame": {"x":1366,"y":1311,"w":77,"h":95}, + "frame": {"x":988,"y":1239,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -186,7 +186,7 @@ }, "sprites/belt/forward_23.png": { - "frame": {"x":1447,"y":1320,"w":77,"h":95}, + "frame": {"x":1595,"y":1143,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -194,7 +194,7 @@ }, "sprites/belt/forward_24.png": { - "frame": {"x":1528,"y":1320,"w":77,"h":95}, + "frame": {"x":1676,"y":1140,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -202,7 +202,7 @@ }, "sprites/belt/forward_25.png": { - "frame": {"x":1609,"y":1320,"w":77,"h":95}, + "frame": {"x":1595,"y":1242,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -210,7 +210,7 @@ }, "sprites/belt/forward_26.png": { - "frame": {"x":1690,"y":1314,"w":77,"h":95}, + "frame": {"x":1676,"y":1239,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -218,7 +218,7 @@ }, "sprites/belt/forward_27.png": { - "frame": {"x":419,"y":1282,"w":77,"h":95}, + "frame": {"x":1757,"y":1153,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -226,7 +226,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":268,"y":1281,"w":86,"h":86}, + "frame": {"x":1505,"y":684,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -234,7 +234,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":1930,"y":542,"w":86,"h":86}, + "frame": {"x":1111,"y":691,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -242,7 +242,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":1698,"y":855,"w":86,"h":86}, + "frame": {"x":1590,"y":780,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -250,7 +250,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":1788,"y":928,"w":86,"h":86}, + "frame": {"x":1257,"y":1019,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -258,7 +258,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":1878,"y":937,"w":86,"h":86}, + "frame": {"x":1509,"y":1053,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -266,7 +266,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":1157,"y":1006,"w":86,"h":86}, + "frame": {"x":1599,"y":1050,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -274,7 +274,7 @@ }, "sprites/belt/left_6.png": { - "frame": {"x":1247,"y":1040,"w":86,"h":86}, + "frame": {"x":1689,"y":1050,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -282,7 +282,7 @@ }, "sprites/belt/left_7.png": { - "frame": {"x":1337,"y":1041,"w":86,"h":86}, + "frame": {"x":1235,"y":1109,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -290,7 +290,7 @@ }, "sprites/belt/left_8.png": { - "frame": {"x":1427,"y":1041,"w":86,"h":86}, + "frame": {"x":1325,"y":1110,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -298,7 +298,7 @@ }, "sprites/belt/left_9.png": { - "frame": {"x":1788,"y":1018,"w":86,"h":86}, + "frame": {"x":1415,"y":1113,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -306,7 +306,7 @@ }, "sprites/belt/left_10.png": { - "frame": {"x":1915,"y":632,"w":86,"h":86}, + "frame": {"x":1077,"y":781,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -314,7 +314,7 @@ }, "sprites/belt/left_11.png": { - "frame": {"x":1158,"y":736,"w":86,"h":86}, + "frame": {"x":1077,"y":871,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -322,7 +322,7 @@ }, "sprites/belt/left_12.png": { - "frame": {"x":1248,"y":770,"w":86,"h":86}, + "frame": {"x":1077,"y":961,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -330,7 +330,7 @@ }, "sprites/belt/left_13.png": { - "frame": {"x":1158,"y":826,"w":86,"h":86}, + "frame": {"x":1055,"y":1051,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -338,7 +338,7 @@ }, "sprites/belt/left_14.png": { - "frame": {"x":1057,"y":1035,"w":86,"h":86}, + "frame": {"x":1167,"y":979,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -346,7 +346,7 @@ }, "sprites/belt/left_15.png": { - "frame": {"x":1248,"y":860,"w":86,"h":86}, + "frame": {"x":1145,"y":1069,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -354,7 +354,7 @@ }, "sprites/belt/left_16.png": { - "frame": {"x":1338,"y":861,"w":86,"h":86}, + "frame": {"x":1248,"y":740,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -362,7 +362,7 @@ }, "sprites/belt/left_17.png": { - "frame": {"x":1428,"y":861,"w":86,"h":86}, + "frame": {"x":1248,"y":830,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -370,7 +370,7 @@ }, "sprites/belt/left_18.png": { - "frame": {"x":1518,"y":854,"w":86,"h":86}, + "frame": {"x":1338,"y":741,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -378,7 +378,7 @@ }, "sprites/belt/left_19.png": { - "frame": {"x":1608,"y":855,"w":86,"h":86}, + "frame": {"x":1338,"y":831,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -386,7 +386,7 @@ }, "sprites/belt/left_20.png": { - "frame": {"x":1788,"y":838,"w":86,"h":86}, + "frame": {"x":1680,"y":780,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -394,7 +394,7 @@ }, "sprites/belt/left_21.png": { - "frame": {"x":1158,"y":916,"w":86,"h":86}, + "frame": {"x":1509,"y":873,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -402,7 +402,7 @@ }, "sprites/belt/left_22.png": { - "frame": {"x":1248,"y":950,"w":86,"h":86}, + "frame": {"x":1599,"y":870,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -410,7 +410,7 @@ }, "sprites/belt/left_23.png": { - "frame": {"x":1338,"y":951,"w":86,"h":86}, + "frame": {"x":1689,"y":870,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -418,7 +418,7 @@ }, "sprites/belt/left_24.png": { - "frame": {"x":1428,"y":951,"w":86,"h":86}, + "frame": {"x":1509,"y":963,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -426,7 +426,7 @@ }, "sprites/belt/left_25.png": { - "frame": {"x":1518,"y":944,"w":86,"h":86}, + "frame": {"x":1599,"y":960,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -434,7 +434,7 @@ }, "sprites/belt/left_26.png": { - "frame": {"x":1608,"y":945,"w":86,"h":86}, + "frame": {"x":1689,"y":960,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -442,7 +442,7 @@ }, "sprites/belt/left_27.png": { - "frame": {"x":1698,"y":945,"w":86,"h":86}, + "frame": {"x":1338,"y":921,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -450,7 +450,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":1878,"y":1027,"w":86,"h":86}, + "frame": {"x":1505,"y":1143,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -458,7 +458,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":1057,"y":1125,"w":86,"h":86}, + "frame": {"x":1055,"y":1141,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -466,7 +466,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":1697,"y":1035,"w":86,"h":86}, + "frame": {"x":1950,"y":735,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":1939,"y":1306,"w":86,"h":86}, + "frame": {"x":808,"y":1239,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":763,"y":1149,"w":86,"h":86}, + "frame": {"x":898,"y":1239,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":853,"y":1149,"w":86,"h":86}, + "frame": {"x":718,"y":1329,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":943,"y":1149,"w":86,"h":86}, + "frame": {"x":808,"y":1329,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":763,"y":1239,"w":86,"h":86}, + "frame": {"x":898,"y":1329,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":853,"y":1239,"w":86,"h":86}, + "frame": {"x":988,"y":1338,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":943,"y":1239,"w":86,"h":86}, + "frame": {"x":1143,"y":1249,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -530,7 +530,7 @@ }, "sprites/belt/right_10.png": { - "frame": {"x":1147,"y":1096,"w":86,"h":86}, + "frame": {"x":1145,"y":1159,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -538,7 +538,7 @@ }, "sprites/belt/right_11.png": { - "frame": {"x":1237,"y":1130,"w":86,"h":86}, + "frame": {"x":1235,"y":1199,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -546,7 +546,7 @@ }, "sprites/belt/right_12.png": { - "frame": {"x":1327,"y":1131,"w":86,"h":86}, + "frame": {"x":1325,"y":1200,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -554,7 +554,7 @@ }, "sprites/belt/right_13.png": { - "frame": {"x":1417,"y":1131,"w":86,"h":86}, + "frame": {"x":1415,"y":1203,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -562,7 +562,7 @@ }, "sprites/belt/right_14.png": { - "frame": {"x":1147,"y":1186,"w":86,"h":86}, + "frame": {"x":1505,"y":1233,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -570,7 +570,7 @@ }, "sprites/belt/right_15.png": { - "frame": {"x":1237,"y":1220,"w":86,"h":86}, + "frame": {"x":1770,"y":709,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -578,7 +578,7 @@ }, "sprites/belt/right_16.png": { - "frame": {"x":1327,"y":1221,"w":86,"h":86}, + "frame": {"x":1779,"y":1063,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -586,7 +586,7 @@ }, "sprites/belt/right_17.png": { - "frame": {"x":1417,"y":1221,"w":86,"h":86}, + "frame": {"x":1860,"y":709,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -594,7 +594,7 @@ }, "sprites/belt/right_18.png": { - "frame": {"x":1517,"y":1041,"w":86,"h":86}, + "frame": {"x":1860,"y":799,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -602,7 +602,7 @@ }, "sprites/belt/right_19.png": { - "frame": {"x":1607,"y":1035,"w":86,"h":86}, + "frame": {"x":1860,"y":889,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":1507,"y":1230,"w":86,"h":86}, + "frame": {"x":1950,"y":825,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":1669,"y":1125,"w":86,"h":86}, + "frame": {"x":1950,"y":915,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":1597,"y":1230,"w":86,"h":86}, + "frame": {"x":1950,"y":1005,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":1759,"y":1125,"w":86,"h":86}, + "frame": {"x":1950,"y":1095,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":1849,"y":1117,"w":86,"h":86}, + "frame": {"x":765,"y":1149,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":1849,"y":1207,"w":86,"h":86}, + "frame": {"x":855,"y":1149,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":1939,"y":1216,"w":86,"h":86}, + "frame": {"x":945,"y":1149,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":1849,"y":1297,"w":86,"h":86}, + "frame": {"x":718,"y":1239,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -674,7 +674,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":1259,"y":588,"w":87,"h":87}, + "frame": {"x":1935,"y":446,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":8,"w":87,"h":87}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":1259,"y":679,"w":87,"h":87}, + "frame": {"x":1505,"y":593,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":87,"h":87}, @@ -722,7 +722,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":402,"y":1135,"w":136,"h":143}, + "frame": {"x":1903,"y":299,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -730,7 +730,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":542,"y":1138,"w":136,"h":143}, + "frame": {"x":1239,"y":445,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -738,7 +738,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":3,"y":1286,"w":261,"h":144}, + "frame": {"x":812,"y":738,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -778,7 +778,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":1636,"y":446,"w":143,"h":144}, + "frame": {"x":1211,"y":592,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -786,7 +786,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":1783,"y":446,"w":143,"h":144}, + "frame": {"x":1358,"y":593,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -794,7 +794,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":1099,"y":446,"w":142,"h":138}, + "frame": {"x":3,"y":1286,"w":142,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":142,"h":138}, @@ -802,7 +802,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1245,"y":446,"w":139,"h":138}, + "frame": {"x":149,"y":1286,"w":139,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, @@ -810,7 +810,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":1119,"y":298,"w":256,"h":144}, + "frame": {"x":1383,"y":298,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -818,7 +818,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":812,"y":738,"w":261,"h":144}, + "frame": {"x":812,"y":886,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -834,7 +834,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":1111,"y":588,"w":144,"h":144}, + "frame": {"x":1639,"y":446,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -842,7 +842,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":1773,"y":594,"w":138,"h":125}, + "frame": {"x":542,"y":1138,"w":138,"h":125}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":19,"w":138,"h":125}, @@ -850,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":773,"y":1033,"w":138,"h":112}, + "frame": {"x":576,"y":1267,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -866,7 +866,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":915,"y":1033,"w":138,"h":112}, + "frame": {"x":1596,"y":594,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":138,"h":112}, @@ -874,7 +874,7 @@ }, "sprites/blueprints/wire_left.png": { - "frame": {"x":268,"y":1371,"w":71,"h":71}, + "frame": {"x":1428,"y":741,"w":71,"h":71}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":24,"w":71,"h":71}, @@ -882,7 +882,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":343,"y":1371,"w":71,"h":71}, + "frame": {"x":1860,"y":979,"w":71,"h":71}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":24,"w":71,"h":71}, @@ -898,7 +898,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":1033,"y":1215,"w":86,"h":86}, + "frame": {"x":1078,"y":1339,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -906,7 +906,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1033,"y":1305,"w":86,"h":86}, + "frame": {"x":1168,"y":1339,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -914,7 +914,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1930,"y":443,"w":77,"h":95}, + "frame": {"x":1879,"y":594,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -930,7 +930,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":1379,"y":298,"w":256,"h":143}, + "frame": {"x":1643,"y":299,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -954,7 +954,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1493,"y":593,"w":136,"h":142}, + "frame": {"x":1099,"y":445,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -962,7 +962,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1633,"y":594,"w":136,"h":142}, + "frame": {"x":402,"y":1135,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -1034,7 +1034,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1350,"y":593,"w":139,"h":136}, + "frame": {"x":292,"y":1281,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -1042,7 +1042,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":1639,"y":299,"w":256,"h":143}, + "frame": {"x":1379,"y":446,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -1050,7 +1050,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":812,"y":886,"w":260,"h":143}, + "frame": {"x":1119,"y":298,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -1066,7 +1066,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":1388,"y":445,"w":144,"h":144}, + "frame": {"x":1787,"y":446,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -1074,7 +1074,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":1350,"y":733,"w":137,"h":124}, + "frame": {"x":435,"y":1281,"w":137,"h":124}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":20,"w":137,"h":124}, @@ -1082,7 +1082,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1491,"y":739,"w":137,"h":111}, + "frame": {"x":1738,"y":594,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -1090,7 +1090,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1632,"y":740,"w":137,"h":111}, + "frame": {"x":773,"y":1034,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -1098,7 +1098,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1773,"y":723,"w":137,"h":111}, + "frame": {"x":914,"y":1034,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -1106,7 +1106,7 @@ }, "sprites/buildings/wire_left.png": { - "frame": {"x":1899,"y":369,"w":70,"h":70}, + "frame": {"x":1069,"y":1231,"w":70,"h":70}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":25,"w":70,"h":70}, @@ -1114,7 +1114,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":1771,"y":1314,"w":70,"h":70}, + "frame": {"x":1480,"y":1323,"w":70,"h":70}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":25,"y":25,"w":70,"h":70}, @@ -1130,7 +1130,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1973,"y":369,"w":38,"h":48}, + "frame": {"x":1258,"y":1372,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -1138,7 +1138,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":986,"y":1329,"w":38,"h":48}, + "frame": {"x":2000,"y":1185,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -1146,7 +1146,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":1033,"y":1149,"w":20,"h":24}, + "frame": {"x":1836,"y":799,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -1154,7 +1154,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":1572,"y":545,"w":22,"h":22}, + "frame": {"x":2014,"y":3,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":22,"h":22}, @@ -1162,7 +1162,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":2004,"y":1066,"w":22,"h":22}, + "frame": {"x":684,"y":1237,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":22,"h":22}, @@ -1170,7 +1170,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":1123,"y":1375,"w":62,"h":62}, + "frame": {"x":1770,"y":799,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -1178,7 +1178,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":1204,"y":1276,"w":24,"h":24}, + "frame": {"x":1077,"y":738,"w":24,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":24,"h":24}, @@ -1186,7 +1186,7 @@ }, "sprites/misc/lock_direction_indicator.png": { - "frame": {"x":986,"y":1381,"w":36,"h":24}, + "frame": {"x":1069,"y":1305,"w":36,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":36,"h":24}, @@ -1194,7 +1194,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":1123,"y":1375,"w":62,"h":62}, + "frame": {"x":1770,"y":799,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -1202,7 +1202,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":1968,"y":990,"w":62,"h":72}, + "frame": {"x":1554,"y":1341,"w":62,"h":72}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":62,"h":72}, @@ -1210,7 +1210,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":1899,"y":299,"w":133,"h":66}, + "frame": {"x":1595,"y":710,"w":133,"h":66}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":133,"h":66}, @@ -1218,7 +1218,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1123,"y":1215,"w":20,"h":24}, + "frame": {"x":1836,"y":827,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -1226,7 +1226,7 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":1536,"y":445,"w":96,"h":96}, + "frame": {"x":1111,"y":591,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1234,7 +1234,7 @@ }, "sprites/wires/negative_energy.png": { - "frame": {"x":1536,"y":545,"w":32,"h":32}, + "frame": {"x":2000,"y":1237,"w":32,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":32,"h":32}, @@ -1242,39 +1242,39 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":1963,"y":201,"w":57,"h":80}, + "frame": {"x":1963,"y":201,"w":56,"h":79}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":19,"y":0,"w":57,"h":80}, + "spriteSourceSize": {"x":20,"y":0,"w":56,"h":79}, "sourceSize": {"w":96,"h":96} }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":358,"y":1282,"w":57,"h":80}, + "frame": {"x":1620,"y":1341,"w":49,"h":76}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":19,"y":0,"w":57,"h":80}, + "spriteSourceSize": {"x":23,"y":0,"w":49,"h":76}, "sourceSize": {"w":96,"h":96} }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":1959,"y":822,"w":57,"h":80}, + "frame": {"x":1673,"y":1341,"w":49,"h":76}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":19,"y":0,"w":57,"h":80}, + "spriteSourceSize": {"x":23,"y":0,"w":49,"h":76}, "sourceSize": {"w":96,"h":96} }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":1968,"y":906,"w":57,"h":80}, + "frame": {"x":1258,"y":1289,"w":56,"h":79}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":19,"y":0,"w":57,"h":80}, + "spriteSourceSize": {"x":20,"y":0,"w":56,"h":79}, "sourceSize": {"w":96,"h":96} }, "sprites/wires/positive_energy.png": { - "frame": {"x":1968,"y":1066,"w":32,"h":32}, + "frame": {"x":2000,"y":1273,"w":32,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":32,"h":32}, @@ -1285,8 +1285,8 @@ "version": "1.0", "image": "atlas0_75.png", "format": "RGBA8888", - "size": {"w":2035,"h":1445}, + "size": {"w":2042,"h":1428}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:64992def403ecae5d6a9a8c1d669aa36:a6ea6940afa6efd3e09314c1b1be5a97:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:f9d84407e7fd8a428996f4d57e250e84:01202b345d862a009ec7b1beee1ef160:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png index 6e5a8d35..4559b3a1 100644 Binary files a/res_built/atlas/atlas0_75.png and b/res_built/atlas/atlas0_75.png differ diff --git a/res_raw/atlas.tps b/res_raw/atlas.tps index a0362783..9914e6e0 100644 --- a/res_raw/atlas.tps +++ b/res_raw/atlas.tps @@ -589,6 +589,22 @@ scale9FromFile + sprites/wires/negative_energy.png + sprites/wires/positive_energy.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 16,16,32,32 + scale9Paddings + 16,16,32,32 + scale9FromFile + + fileList diff --git a/res_raw/sprites/misc/wires_overlay_tile.png b/res_raw/sprites/misc/wires_overlay_tile.png index 598e0d7f..2a57c0aa 100644 Binary files a/res_raw/sprites/misc/wires_overlay_tile.png and b/res_raw/sprites/misc/wires_overlay_tile.png differ diff --git a/res_raw/sprites/wires/negative_energy.png b/res_raw/sprites/wires/negative_energy.png index 09b6229a..73933791 100644 Binary files a/res_raw/sprites/wires/negative_energy.png and b/res_raw/sprites/wires/negative_energy.png differ diff --git a/res_raw/sprites/wires/pin_negative_accept.png b/res_raw/sprites/wires/pin_negative_accept.png index 6d74af29..da607977 100644 Binary files a/res_raw/sprites/wires/pin_negative_accept.png and b/res_raw/sprites/wires/pin_negative_accept.png differ diff --git a/res_raw/sprites/wires/pin_negative_eject.png b/res_raw/sprites/wires/pin_negative_eject.png index fe2e1338..60f1c11a 100644 Binary files a/res_raw/sprites/wires/pin_negative_eject.png and b/res_raw/sprites/wires/pin_negative_eject.png differ diff --git a/res_raw/sprites/wires/pin_positive_accept.png b/res_raw/sprites/wires/pin_positive_accept.png index b1d42d32..d29dcdf2 100644 Binary files a/res_raw/sprites/wires/pin_positive_accept.png and b/res_raw/sprites/wires/pin_positive_accept.png differ diff --git a/res_raw/sprites/wires/pin_positive_eject.png b/res_raw/sprites/wires/pin_positive_eject.png index 4b26af1e..0f32b17c 100644 Binary files a/res_raw/sprites/wires/pin_positive_eject.png and b/res_raw/sprites/wires/pin_positive_eject.png differ diff --git a/res_raw/sprites/wires/positive_energy.png b/res_raw/sprites/wires/positive_energy.png index 827adeaa..3706f2a4 100644 Binary files a/res_raw/sprites/wires/positive_energy.png and b/res_raw/sprites/wires/positive_energy.png differ diff --git a/src/js/core/config.js b/src/js/core/config.js index 55e8217f..fa9b156f 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -51,9 +51,15 @@ export const globalConfig = { // Belt speeds // NOTICE: Update webpack.production.config too! beltSpeedItemsPerSecond: 2, - itemSpacingOnBelts: 0.63, minerSpeedItemsPerSecond: 0, // COMPUTED + beltItemSpacingByLayer: { + regular: 0.63, + wires: 0.33, + }, + + wiresSpeedItemsPerSecond: 6, + undergroundBeltMaxTilesByTier: [5, 8], buildingSpeeds: { diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 087585b2..0b6da48c 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -90,7 +90,7 @@ export class BeltPath extends BasicSerializableObject { * @param {boolean} computeSpacing Whether to also compute the spacing */ init(computeSpacing = true) { - // Find acceptor and ejector + this.onPathChanged(); this.totalLength = this.computeTotalLength(); @@ -108,8 +108,6 @@ export class BeltPath extends BasicSerializableObject { for (let i = 0; i < this.entityPath.length; ++i) { this.entityPath[i].components.Belt.assignedPath = this; } - - this.onPathChanged(); } /** @@ -117,7 +115,14 @@ export class BeltPath extends BasicSerializableObject { * @returns {boolean} */ canAcceptItem() { - return this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts; + return this.spacingToFirstItem >= this.getItemSpacing(); + } + + /** + * Returns the spacing between items + */ + getItemSpacing() { + return globalConfig.beltItemSpacingByLayer[this.layer]; } /** @@ -133,15 +138,15 @@ export class BeltPath extends BasicSerializableObject { * @param {BaseItem} item */ tryAcceptItem(item) { - if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { + if (this.spacingToFirstItem >= this.getItemSpacing()) { // So, since we already need one tick to accept this item we will add this directly. const beltProgressPerTick = - this.root.hubGoals.getBeltBaseSpeed() * + this.root.hubGoals.getBeltBaseSpeed(this.layer) * this.root.dynamicTickrate.deltaSeconds * - globalConfig.itemSpacingOnBelts; + this.getItemSpacing(); // First, compute how much progress we can make *at max* - const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); + const maxProgress = Math.max(0, this.spacingToFirstItem - this.getItemSpacing()); const initialProgress = Math.min(maxProgress, beltProgressPerTick); this.items.unshift([this.spacingToFirstItem - initialProgress, item]); @@ -200,6 +205,8 @@ export class BeltPath extends BasicSerializableObject { } } } + + this.layer = this.entityPath[0].layer; } // Following code will be compiled out outside of dev versions @@ -376,7 +383,7 @@ export class BeltPath extends BasicSerializableObject { this.onPathChanged(); // Extend the path length - const additionalLength = beltComp.getEffectiveLengthTiles(); + const additionalLength = beltComp.getEffectiveLengthTiles(entity.layer); this.totalLength += additionalLength; DEBUG && logger.log(" Extended total length by", additionalLength, "to", this.totalLength); @@ -419,7 +426,7 @@ export class BeltPath extends BasicSerializableObject { // All items on that belt are simply lost (for now) - const length = beltComp.getEffectiveLengthTiles(); + const length = beltComp.getEffectiveLengthTiles(entity.layer); // Extend the length of this path this.totalLength += length; @@ -471,7 +478,7 @@ export class BeltPath extends BasicSerializableObject { const beltComp = entity.components.Belt; beltComp.assignedPath = null; - const entityLength = beltComp.getEffectiveLengthTiles(); + const entityLength = beltComp.getEffectiveLengthTiles(entity.layer); assert(this.entityPath.indexOf(entity) >= 0, "Entity not contained for split"); assert(this.entityPath.indexOf(entity) !== 0, "Entity is first"); assert(this.entityPath.indexOf(entity) !== this.entityPath.length - 1, "Entity is last"); @@ -489,7 +496,7 @@ export class BeltPath extends BasicSerializableObject { ++firstPathEntityCount; firstPathEndEntity = otherEntity; - firstPathLength += otherEntity.components.Belt.getEffectiveLengthTiles(); + firstPathLength += otherEntity.components.Belt.getEffectiveLengthTiles(otherEntity.layer); } DEBUG && @@ -633,7 +640,7 @@ export class BeltPath extends BasicSerializableObject { // Ok, first remove the entity const beltComp = entity.components.Belt; - const beltLength = beltComp.getEffectiveLengthTiles(); + const beltLength = beltComp.getEffectiveLengthTiles(entity.layer); DEBUG && logger.log( @@ -742,7 +749,7 @@ export class BeltPath extends BasicSerializableObject { // Ok, first remove the entity const beltComp = entity.components.Belt; - const beltLength = beltComp.getEffectiveLengthTiles(); + const beltLength = beltComp.getEffectiveLengthTiles(entity.layer); DEBUG && logger.log( @@ -882,7 +889,7 @@ export class BeltPath extends BasicSerializableObject { beltComp.assignedPath = this; // Update our length - const additionalLength = beltComp.getEffectiveLengthTiles(); + const additionalLength = beltComp.getEffectiveLengthTiles(entity.layer); this.totalLength += additionalLength; } @@ -939,7 +946,8 @@ export class BeltPath extends BasicSerializableObject { computeTotalLength() { let length = 0; for (let i = 0; i < this.entityPath.length; ++i) { - length += this.entityPath[i].components.Belt.getEffectiveLengthTiles(); + const entity = this.entityPath[i]; + length += entity.components.Belt.getEffectiveLengthTiles(this.layer); } return length; } @@ -954,15 +962,15 @@ export class BeltPath extends BasicSerializableObject { // Divide by item spacing on belts since we use throughput and not speed let beltSpeed = - this.root.hubGoals.getBeltBaseSpeed() * + this.root.hubGoals.getBeltBaseSpeed(this.layer) * this.root.dynamicTickrate.deltaSeconds * - globalConfig.itemSpacingOnBelts; + this.getItemSpacing(); if (G_IS_DEV && globalConfig.debug.instantBelts) { beltSpeed *= 100; } - let minimumDistance = this.ejectorSlot.item ? globalConfig.itemSpacingOnBelts : 0; + let minimumDistance = this.ejectorSlot.item ? this.getItemSpacing() : 0; // Try to reduce spacing let remainingAmount = beltSpeed; @@ -983,7 +991,7 @@ export class BeltPath extends BasicSerializableObject { break; } - minimumDistance = globalConfig.itemSpacingOnBelts; + minimumDistance = this.getItemSpacing(); } const lastItem = this.items[this.items.length - 1]; @@ -1012,14 +1020,14 @@ export class BeltPath extends BasicSerializableObject { for (let i = 0; i < this.entityPath.length; ++i) { const beltComp = this.entityPath[i].components.Belt; - const localLength = beltComp.getEffectiveLengthTiles(); + const localLength = beltComp.getEffectiveLengthTiles(this.layer); if (currentLength + localLength >= progress || i === this.entityPath.length - 1) { // Min required here due to floating point issues const localProgress = Math.min(1.0, progress - currentLength); assert(localProgress >= 0.0, "Invalid local progress: " + localProgress); - const localSpace = beltComp.transformBeltToLocalSpace(localProgress); + const localSpace = beltComp.transformBeltToLocalSpace(localProgress, this.layer); return this.entityPath[i].components.StaticMapEntity.localTileToWorld(localSpace); } currentLength += localLength; @@ -1123,13 +1131,18 @@ export class BeltPath extends BasicSerializableObject { for (let i = 0; i < this.entityPath.length; ++i) { const entity = this.entityPath[i]; const beltComp = entity.components.Belt; - const beltLength = beltComp.getEffectiveLengthTiles(); + const beltLength = beltComp.getEffectiveLengthTiles(this.layer); - // Check if the item is on the current belt - if (trackPos + beltLength >= currentItemPos) { + // Check if the current items are on the belt + while (trackPos + beltLength >= currentItemPos) { // Its on the belt, render it now const staticComp = entity.components.StaticMapEntity; - const localPos = beltComp.transformBeltToLocalSpace(currentItemPos - trackPos); + assert( + currentItemPos - trackPos >= 0, + "invalid track pos: " + currentItemPos + " vs " + trackPos + " (l =" + beltLength + ")" + ); + + const localPos = beltComp.transformBeltToLocalSpace(currentItemPos - trackPos, this.layer); const worldPos = staticComp.localTileToWorld(localPos).toWorldSpaceCenterOfTile(); const distanceAndItem = this.items[currentItemIndex]; @@ -1143,7 +1156,7 @@ export class BeltPath extends BasicSerializableObject { if (currentItemIndex >= this.items.length) { // We rendered all items - break; + return; } } diff --git a/src/js/game/buildings/belt_base.js b/src/js/game/buildings/belt_base.js index fa91af97..b8e92150 100644 --- a/src/js/game/buildings/belt_base.js +++ b/src/js/game/buildings/belt_base.js @@ -24,7 +24,7 @@ export class MetaBeltBaseBuilding extends MetaBuilding { * @returns {Array<[string, string]>} */ getAdditionalStatistics(root, variant) { - const beltSpeed = root.hubGoals.getBeltBaseSpeed(); + const beltSpeed = root.hubGoals.getBeltBaseSpeed(enumLayer.regular); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(beltSpeed)]]; } diff --git a/src/js/game/components/belt.js b/src/js/game/components/belt.js index 5689376e..e9a0cd80 100644 --- a/src/js/game/components/belt.js +++ b/src/js/game/components/belt.js @@ -3,6 +3,7 @@ import { types } from "../../savegame/serialization"; import { BeltPath } from "../belt_path"; import { Component } from "../component"; import { Entity } from "../entity"; +import { enumLayer } from "../root"; export const curvedBeltLength = /* Math.PI / 4 */ 0.78; @@ -44,9 +45,14 @@ export class BeltComponent extends Component { /** * Returns the effective length of this belt in tile space + * @param {enumLayer} layer * @returns {number} */ - getEffectiveLengthTiles() { + getEffectiveLengthTiles(layer) { + assert(layer, "no layer given"); + if (layer === enumLayer.wires) { + return 1.0; + } return this.direction === enumDirection.top ? 1.0 : curvedBeltLength; } @@ -54,27 +60,62 @@ export class BeltComponent extends Component { * Converts from belt space (0 = start of belt ... 1 = end of belt) to the local * belt coordinates (-0.5|-0.5 to 0.5|0.5) * @param {number} progress + * @param {enumLayer} layer * @returns {Vector} */ - transformBeltToLocalSpace(progress) { - switch (this.direction) { - case enumDirection.top: - assert(progress <= 1.02, "Invalid progress: " + progress); - return new Vector(0, 0.5 - progress); + transformBeltToLocalSpace(progress, layer) { + assert(progress >= 0.0, "Invalid progress ( < 0): " + progress); - case enumDirection.right: { - assert(progress <= curvedBeltLength + 0.02, "Invalid progress 2: " + progress); - const arcProgress = (progress / curvedBeltLength) * 0.5 * Math.PI; - return new Vector(0.5 - 0.5 * Math.cos(arcProgress), 0.5 - 0.5 * Math.sin(arcProgress)); + switch (layer) { + case enumLayer.regular: { + switch (this.direction) { + case enumDirection.top: + assert(progress <= 1.02, "Invalid progress: " + progress); + return new Vector(0, 0.5 - progress); + + case enumDirection.right: { + assert(progress <= curvedBeltLength + 0.02, "Invalid progress 2: " + progress); + const arcProgress = (progress / curvedBeltLength) * 0.5 * Math.PI; + return new Vector( + 0.5 - 0.5 * Math.cos(arcProgress), + 0.5 - 0.5 * Math.sin(arcProgress) + ); + } + case enumDirection.left: { + assert(progress <= curvedBeltLength + 0.02, "Invalid progress 3: " + progress); + const arcProgress = (progress / curvedBeltLength) * 0.5 * Math.PI; + return new Vector( + -0.5 + 0.5 * Math.cos(arcProgress), + 0.5 - 0.5 * Math.sin(arcProgress) + ); + } + default: + assertAlways(false, "Invalid belt direction: " + this.direction); + return new Vector(0, 0); + } } - case enumDirection.left: { - assert(progress <= curvedBeltLength + 0.02, "Invalid progress 3: " + progress); - const arcProgress = (progress / curvedBeltLength) * 0.5 * Math.PI; - return new Vector(-0.5 + 0.5 * Math.cos(arcProgress), 0.5 - 0.5 * Math.sin(arcProgress)); + case enumLayer.wires: { + const pow = 0.5; + switch (this.direction) { + case enumDirection.top: + assert(progress <= 1.02, "Invalid progress: " + progress); + return new Vector(0, 0.5 - progress); + + case enumDirection.right: { + assert(progress <= 1.02, "Invalid progress 2: " + progress); + return progress > 0.5 ? new Vector(progress - 0.5, 0) : new Vector(0, 0.5 - progress); + } + case enumDirection.left: { + assert(progress <= 1.02, "Invalid progress 3: " + progress); + return progress > 0.5 + ? new Vector(-progress + 0.5, 0) + : new Vector(0, 0.5 - progress); + } + default: + assertAlways(false, "Invalid belt direction: " + this.direction); + return new Vector(0, 0); + } } - default: - assertAlways(false, "Invalid belt direction: " + this.direction); - return new Vector(0, 0); } } } diff --git a/src/js/game/components/energy_generator.js b/src/js/game/components/energy_generator.js index dd9f9d76..bf29f008 100644 --- a/src/js/game/components/energy_generator.js +++ b/src/js/game/components/energy_generator.js @@ -3,7 +3,7 @@ import { BaseItem } from "../base_item"; import { Component } from "../component"; import { ShapeItem } from "../items/shape_item"; -const maxQueueSize = 4; +const maxQueueSize = 20; export const ENERGY_GENERATOR_EJECT_SLOT = 0; export const ENERGY_GENERATOR_ACCEPT_SLOT = 4; diff --git a/src/js/game/components/underground_belt.js b/src/js/game/components/underground_belt.js index f873e6e9..e94b7cb1 100644 --- a/src/js/game/components/underground_belt.js +++ b/src/js/game/components/underground_belt.js @@ -4,6 +4,7 @@ import { globalConfig } from "../../core/config"; import { types } from "../../savegame/serialization"; import { gItemRegistry } from "../../core/global_registries"; import { Entity } from "../entity"; +import { enumLayer } from "../root"; /** @enum {string} */ export const enumUndergroundBeltMode = { @@ -102,7 +103,8 @@ export class UndergroundBeltComponent extends Component { } // Notice: We assume that for all items the travel distance is the same - const maxItemsInTunnel = (2 + travelDistance) / globalConfig.itemSpacingOnBelts; + const maxItemsInTunnel = + (2 + travelDistance) / globalConfig.beltItemSpacingByLayer[enumLayer.regular]; if (this.pendingItems.length >= maxItemsInTunnel) { // Simulate a real belt which gets full at some point return false; @@ -112,7 +114,8 @@ export class UndergroundBeltComponent extends Component { // This corresponds to the item ejector - it needs 0.5 additional tiles to eject the item. // So instead of adding 1 we add 0.5 only. // Additionally it takes 1 tile for the acceptor which we just add on top. - const travelDuration = (travelDistance + 1.5) / beltSpeed / globalConfig.itemSpacingOnBelts; + const travelDuration = + (travelDistance + 1.5) / beltSpeed / globalConfig.beltItemSpacingByLayer[enumLayer.regular]; this.pendingItems.push([item, travelDuration]); diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index cb1e27c8..59479765 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -4,7 +4,7 @@ import { clamp, findNiceIntegerValue, randomChoice, randomInt } from "../core/ut import { BasicSerializableObject, types } from "../savegame/serialization"; import { enumColors } from "./colors"; import { enumItemProcessorTypes } from "./components/item_processor"; -import { GameRoot } from "./root"; +import { GameRoot, enumLayer } from "./root"; import { enumSubShape, ShapeDefinition } from "./shape_definition"; import { enumHubGoalRewards, tutorialGoals } from "./tutorial_goals"; import { UPGRADES, blueprintShape } from "./upgrades"; @@ -370,9 +370,13 @@ export class HubGoals extends BasicSerializableObject { /** * Belt speed + * @param {enumLayer} layer * @returns {number} items / sec */ - getBeltBaseSpeed() { + getBeltBaseSpeed(layer) { + if (layer === enumLayer.wires) { + return globalConfig.wiresSpeedItemsPerSecond; + } return globalConfig.beltSpeedItemsPerSecond * this.upgradeImprovements.belt; } diff --git a/src/js/game/hud/trailer_maker.js b/src/js/game/hud/trailer_maker.js index 8655def4..2834b40d 100644 --- a/src/js/game/hud/trailer_maker.js +++ b/src/js/game/hud/trailer_maker.js @@ -1,4 +1,4 @@ -import { GameRoot } from "../root"; +import { GameRoot, enumLayer } from "../root"; import { globalConfig } from "../../core/config"; import { Vector, mixVector } from "../../core/vector"; import { lerp } from "../../core/utils"; @@ -92,7 +92,7 @@ export class TrailerMaker { const speed = globalConfig.tileSize * globalConfig.beltSpeedItemsPerSecond * - globalConfig.itemSpacingOnBelts; + globalConfig.beltItemSpacingByLayer[enumLayer.regular]; // let time = // this.currentPlaybackOrigin.distance(Vector.fromSerializedObject(nextMarker.pos)) / speed; const time = nextMarker.time; diff --git a/src/js/game/systems/belt.js b/src/js/game/systems/belt.js index 9a09480f..f099f26c 100644 --- a/src/js/game/systems/belt.js +++ b/src/js/game/systems/belt.js @@ -312,7 +312,7 @@ export class BeltSystem extends GameSystemWithFilter { drawLayer(parameters, layer) { for (let i = 0; i < this.beltPaths.length; ++i) { const path = this.beltPaths[i]; - if (path.getLayer() === layer) { + if (path.layer === layer) { path.draw(parameters); } } @@ -507,13 +507,13 @@ export class BeltSystem extends GameSystemWithFilter { } // Limit speed to avoid belts going backwards - const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10); + const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(enumLayer.regular), 10); // SYNC with systems/item_acceptor.js:drawEntityUnderlays! // 126 / 42 is the exact animation speed of the png animation const animationIndex = Math.floor( ((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) * - globalConfig.itemSpacingOnBelts + globalConfig.beltItemSpacingByLayer[enumLayer.regular] ); const contents = chunk.contents; for (let y = 0; y < globalConfig.mapChunkSize; ++y) { @@ -546,15 +546,6 @@ export class BeltSystem extends GameSystemWithFilter { return; } - // Limit speed to avoid belts going backwards - const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10); - - // SYNC with systems/item_acceptor.js:drawEntityUnderlays! - // 126 / 42 is the exact animation speed of the png animation - const animationIndex = Math.floor( - ((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) * - globalConfig.itemSpacingOnBelts - ); const contents = chunk.wireContents; for (let y = 0; y < globalConfig.mapChunkSize; ++y) { for (let x = 0; x < globalConfig.mapChunkSize; ++x) { diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index 384f66b6..2c0f1686 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -22,11 +22,7 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { } update() { - const progress = - this.root.dynamicTickrate.deltaSeconds * - this.root.hubGoals.getBeltBaseSpeed() * - 2 * // * 2 because its only a half tile - globalConfig.itemSpacingOnBelts; + const progress = this.root.dynamicTickrate.deltaSeconds * 2; // * 2 because its only a half tile for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; @@ -36,7 +32,11 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { // Process item consumption animations to avoid items popping from the belts for (let animIndex = 0; animIndex < animations.length; ++animIndex) { const anim = animations[animIndex]; - anim.animProgress += progress; + const layer = aceptorComp.slots[anim.slotIndex].layer; + anim.animProgress += + progress * + this.root.hubGoals.getBeltBaseSpeed(layer) * + globalConfig.beltItemSpacingByLayer[layer]; if (anim.animProgress > 1) { // Original // animations.splice(animIndex, 1); @@ -120,7 +120,7 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { } // Limit speed to avoid belts going backwards - const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10); + const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(layer), 10); const underlays = acceptorComp.beltUnderlays; for (let i = 0; i < underlays.length; ++i) { @@ -136,7 +136,7 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { // SYNC with systems/belt.js:drawSingleEntity! const animationIndex = Math.floor( ((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) * - globalConfig.itemSpacingOnBelts + globalConfig.beltItemSpacingByLayer[layer] ); drawRotatedSprite({ diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index 0289b967..68a8852e 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -185,8 +185,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter { } // Precompute effective belt speed - const effectiveBeltSpeed = this.root.hubGoals.getBeltBaseSpeed() * globalConfig.itemSpacingOnBelts; - let progressGrowth = (effectiveBeltSpeed / 0.5) * this.root.dynamicTickrate.deltaSeconds; + let progressGrowth = 2 * this.root.dynamicTickrate.deltaSeconds; if (G_IS_DEV && globalConfig.debug.instantBelts) { progressGrowth = 1; @@ -217,7 +216,13 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const targetEntity = sourceSlot.cachedTargetEntity; // Advance items on the slot - sourceSlot.progress = Math.min(1, sourceSlot.progress + progressGrowth); + sourceSlot.progress = Math.min( + 1, + sourceSlot.progress + + progressGrowth * + this.root.hubGoals.getBeltBaseSpeed(sourceSlot.layer) * + globalConfig.beltItemSpacingByLayer[sourceSlot.layer] + ); // Check if we are still in the process of ejecting, can't proceed then if (sourceSlot.progress < 1.0) {