diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index 45f42389..2e28c0b1 100644 --- a/res_built/atlas/atlas0_10.json +++ b/res_built/atlas/atlas0_10.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":231,"y":23,"w":13,"h":13}, + "frame": {"x":3,"y":267,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":215,"y":69,"w":13,"h":13}, + "frame": {"x":20,"y":267,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":250,"y":3,"w":13,"h":13}, + "frame": {"x":37,"y":267,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":267,"y":3,"w":13,"h":13}, + "frame": {"x":54,"y":267,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":250,"y":20,"w":13,"h":13}, + "frame": {"x":82,"y":87,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":267,"y":20,"w":13,"h":13}, + "frame": {"x":85,"y":127,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -50,7 +50,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":248,"y":37,"w":13,"h":13}, + "frame": {"x":102,"y":127,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -58,7 +58,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":265,"y":37,"w":13,"h":13}, + "frame": {"x":90,"y":144,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -66,7 +66,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":217,"y":86,"w":13,"h":13}, + "frame": {"x":107,"y":144,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -74,7 +74,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":232,"y":69,"w":13,"h":13}, + "frame": {"x":90,"y":161,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -82,7 +82,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":217,"y":103,"w":13,"h":13}, + "frame": {"x":107,"y":161,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -90,7 +90,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":249,"y":54,"w":13,"h":13}, + "frame": {"x":90,"y":178,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -98,7 +98,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":266,"y":54,"w":13,"h":13}, + "frame": {"x":107,"y":178,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -106,7 +106,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":249,"y":71,"w":13,"h":13}, + "frame": {"x":90,"y":195,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -114,7 +114,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":266,"y":71,"w":13,"h":13}, + "frame": {"x":107,"y":195,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -122,7 +122,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":234,"y":88,"w":13,"h":13}, + "frame": {"x":90,"y":212,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -130,7 +130,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":234,"y":105,"w":13,"h":13}, + "frame": {"x":107,"y":212,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -138,7 +138,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":251,"y":88,"w":13,"h":13}, + "frame": {"x":89,"y":229,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -146,7 +146,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":268,"y":88,"w":13,"h":13}, + "frame": {"x":89,"y":246,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -154,7 +154,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":251,"y":105,"w":13,"h":13}, + "frame": {"x":106,"y":229,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -162,7 +162,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":268,"y":105,"w":13,"h":13}, + "frame": {"x":106,"y":246,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -170,7 +170,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":133,"y":95,"w":36,"h":19}, + "frame": {"x":3,"y":221,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -178,7 +178,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":164,"y":26,"w":19,"h":19}, + "frame": {"x":45,"y":83,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":164,"y":49,"w":19,"h":19}, + "frame": {"x":44,"y":152,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -194,7 +194,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":82,"y":49,"w":37,"h":19}, + "frame": {"x":3,"y":129,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -202,7 +202,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":3,"y":83,"w":38,"h":38}, + "frame": {"x":82,"y":3,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -210,7 +210,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":82,"y":3,"w":38,"h":19}, + "frame": {"x":3,"y":83,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -218,7 +218,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":169,"y":72,"w":19,"h":19}, + "frame": {"x":44,"y":175,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -226,15 +226,15 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":196,"y":95,"w":17,"h":19}, + "frame": {"x":44,"y":198,"w":19,"h":19}, "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":0,"w":17,"h":19}, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, "sourceSize": {"w":19,"h":19} }, "sprites/blueprints/splitter.png": { - "frame": {"x":124,"y":3,"w":36,"h":19}, + "frame": {"x":3,"y":244,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -242,7 +242,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":87,"y":82,"w":37,"h":19}, + "frame": {"x":3,"y":152,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -250,7 +250,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":173,"y":95,"w":19,"h":19}, + "frame": {"x":43,"y":221,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -258,7 +258,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":87,"y":105,"w":19,"h":16}, + "frame": {"x":66,"y":244,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -266,7 +266,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":110,"y":105,"w":19,"h":16}, + "frame": {"x":71,"y":264,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -274,7 +274,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":248,"y":37,"w":13,"h":13}, + "frame": {"x":102,"y":127,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -282,7 +282,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":266,"y":54,"w":13,"h":13}, + "frame": {"x":107,"y":178,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -290,7 +290,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":231,"y":23,"w":13,"h":13}, + "frame": {"x":3,"y":267,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -298,7 +298,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":124,"y":26,"w":36,"h":19}, + "frame": {"x":45,"y":106,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -314,7 +314,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":187,"y":26,"w":19,"h":19}, + "frame": {"x":43,"y":244,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -322,7 +322,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":204,"y":3,"w":19,"h":19}, + "frame": {"x":67,"y":152,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -330,7 +330,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":123,"y":49,"w":37,"h":19}, + "frame": {"x":3,"y":175,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -338,7 +338,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":45,"y":83,"w":38,"h":38}, + "frame": {"x":82,"y":45,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -346,7 +346,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":82,"y":26,"w":38,"h":19}, + "frame": {"x":3,"y":106,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -354,7 +354,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":187,"y":49,"w":19,"h":19}, + "frame": {"x":67,"y":175,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -362,15 +362,15 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":210,"y":26,"w":17,"h":19}, + "frame": {"x":67,"y":198,"w":19,"h":19}, "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":0,"w":17,"h":19}, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, "sourceSize": {"w":19,"h":19} }, "sprites/buildings/splitter.png": { - "frame": {"x":164,"y":3,"w":36,"h":19}, + "frame": {"x":44,"y":129,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -378,7 +378,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":128,"y":72,"w":37,"h":19}, + "frame": {"x":3,"y":198,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -386,7 +386,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":192,"y":72,"w":19,"h":19}, + "frame": {"x":66,"y":221,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -394,7 +394,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":227,"y":3,"w":19,"h":16}, + "frame": {"x":99,"y":87,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -402,7 +402,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":210,"y":49,"w":19,"h":16}, + "frame": {"x":85,"y":107,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -410,7 +410,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":82,"y":72,"w":6,"h":6}, + "frame": {"x":94,"y":263,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -418,7 +418,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":92,"y":72,"w":6,"h":6}, + "frame": {"x":94,"y":273,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -426,7 +426,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":102,"y":72,"w":3,"h":3}, + "frame": {"x":68,"y":97,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -434,7 +434,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":109,"y":72,"w":3,"h":3}, + "frame": {"x":75,"y":97,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -442,7 +442,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":116,"y":72,"w":3,"h":3}, + "frame": {"x":104,"y":263,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -450,7 +450,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":233,"y":40,"w":10,"h":10}, + "frame": {"x":68,"y":83,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -458,7 +458,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":233,"y":40,"w":10,"h":10}, + "frame": {"x":68,"y":83,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -466,7 +466,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":233,"y":54,"w":10,"h":10}, + "frame": {"x":108,"y":107,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -477,8 +477,8 @@ "version": "1.0", "image": "atlas0_10.png", "format": "RGBA8888", - "size": {"w":284,"h":124}, + "size": {"w":123,"h":283}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:f63fd65ef73974465324213239ca32e1:fb51df0c27e5bdac60799c0e88f833c7:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png index 6374e56c..075b76d9 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 d061c98b..5e9bd8b0 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":2371,"y":329,"w":100,"h":126}, + "frame": {"x":2029,"y":551,"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":1797,"y":587,"w":100,"h":126}, + "frame": {"x":2029,"y":681,"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":1838,"y":717,"w":100,"h":126}, + "frame": {"x":2029,"y":811,"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":1901,"y":585,"w":100,"h":126}, + "frame": {"x":2133,"y":467,"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":2005,"y":585,"w":100,"h":126}, + "frame": {"x":2133,"y":597,"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":1942,"y":715,"w":100,"h":126}, + "frame": {"x":2237,"y":467,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -50,7 +50,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":2186,"y":502,"w":113,"h":113}, + "frame": {"x":2165,"y":350,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -58,7 +58,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":2303,"y":502,"w":113,"h":113}, + "frame": {"x":2001,"y":434,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -66,7 +66,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":1838,"y":847,"w":113,"h":113}, + "frame": {"x":2282,"y":350,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -74,7 +74,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":1955,"y":845,"w":113,"h":113}, + "frame": {"x":2133,"y":727,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -82,7 +82,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":2046,"y":715,"w":113,"h":113}, + "frame": {"x":2237,"y":597,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -90,7 +90,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":2072,"y":832,"w":113,"h":113}, + "frame": {"x":2133,"y":844,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -98,7 +98,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":2163,"y":619,"w":113,"h":113}, + "frame": {"x":2250,"y":714,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -106,7 +106,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":2280,"y":619,"w":113,"h":113}, + "frame": {"x":2250,"y":831,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -114,7 +114,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":2189,"y":736,"w":113,"h":113}, + "frame": {"x":2341,"y":467,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -122,7 +122,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":2189,"y":853,"w":113,"h":113}, + "frame": {"x":2354,"y":584,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -130,7 +130,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":2306,"y":736,"w":113,"h":113}, + "frame": {"x":2367,"y":701,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -138,7 +138,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":2306,"y":853,"w":113,"h":113}, + "frame": {"x":2367,"y":818,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -146,7 +146,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":2048,"y":316,"w":114,"h":114}, + "frame": {"x":2047,"y":316,"w":114,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":12,"w":114,"h":114}, @@ -154,7 +154,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":2048,"y":197,"w":114,"h":115}, + "frame": {"x":2047,"y":197,"w":114,"h":115}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":11,"w":114,"h":115}, @@ -162,7 +162,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":2352,"y":199,"w":102,"h":126}, + "frame": {"x":2350,"y":199,"w":102,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":0,"w":102,"h":126}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1652,"y":771,"w":182,"h":190}, + "frame": {"x":1657,"y":587,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -226,10 +226,10 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1468,"y":587,"w":161,"h":182}, + "frame": {"x":1468,"y":587,"w":185,"h":182}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":31,"y":4,"w":161,"h":182}, + "spriteSourceSize": {"x":7,"y":4,"w":185,"h":182}, "sourceSize": {"w":192,"h":192} }, "sprites/blueprints/splitter.png": @@ -258,7 +258,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":1862,"y":197,"w":182,"h":148}, + "frame": {"x":1843,"y":584,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":44,"w":182,"h":148}, @@ -266,7 +266,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":2166,"y":199,"w":182,"h":148}, + "frame": {"x":1843,"y":736,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":148}, @@ -274,7 +274,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":2186,"y":502,"w":113,"h":113}, + "frame": {"x":2165,"y":350,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -282,7 +282,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":2163,"y":619,"w":113,"h":113}, + "frame": {"x":2250,"y":714,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -290,7 +290,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":2371,"y":329,"w":100,"h":126}, + "frame": {"x":2029,"y":551,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -362,10 +362,10 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1633,"y":587,"w":160,"h":180}, + "frame": {"x":1652,"y":781,"w":184,"h":180}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":32,"y":5,"w":160,"h":180}, + "spriteSourceSize": {"x":8,"y":5,"w":184,"h":180}, "sourceSize": {"w":192,"h":192} }, "sprites/buildings/splitter.png": @@ -394,7 +394,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":2001,"y":434,"w":181,"h":147}, + "frame": {"x":1862,"y":197,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":45,"w":181,"h":147}, @@ -402,7 +402,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":2186,"y":351,"w":181,"h":147}, + "frame": {"x":2165,"y":199,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":181,"h":147}, @@ -410,7 +410,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":2109,"y":585,"w":50,"h":64}, + "frame": {"x":2407,"y":103,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -418,7 +418,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":2397,"y":619,"w":50,"h":64}, + "frame": {"x":1840,"y":888,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -434,7 +434,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":2371,"y":459,"w":28,"h":28}, + "frame": {"x":1894,"y":888,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":28,"h":28}, @@ -442,7 +442,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":1797,"y":717,"w":28,"h":28}, + "frame": {"x":2118,"y":434,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":28,"h":28}, @@ -450,7 +450,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":2407,"y":103,"w":82,"h":82}, + "frame": {"x":2399,"y":329,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -458,7 +458,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":2407,"y":103,"w":82,"h":82}, + "frame": {"x":2399,"y":329,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -477,8 +477,8 @@ "version": "1.0", "image": "atlas0_100.png", "format": "RGBA8888", - "size": {"w":2492,"h":971}, + "size": {"w":2490,"h":971}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:f63fd65ef73974465324213239ca32e1:fb51df0c27e5bdac60799c0e88f833c7:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.png b/res_built/atlas/atlas0_100.png index 18496463..a2016c22 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 d679d112..68b4764f 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":393,"y":55,"w":28,"h":32}, + "frame": {"x":664,"y":71,"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":425,"y":55,"w":28,"h":32}, + "frame": {"x":669,"y":159,"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":457,"y":55,"w":28,"h":32}, + "frame": {"x":296,"y":197,"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":489,"y":55,"w":28,"h":32}, + "frame": {"x":669,"y":195,"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":521,"y":55,"w":28,"h":32}, + "frame": {"x":430,"y":211,"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":553,"y":55,"w":28,"h":32}, + "frame": {"x":462,"y":210,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -50,7 +50,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":589,"y":142,"w":30,"h":30}, + "frame": {"x":668,"y":3,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -58,7 +58,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":628,"y":3,"w":30,"h":30}, + "frame": {"x":668,"y":37,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -66,7 +66,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":662,"y":3,"w":30,"h":30}, + "frame": {"x":191,"y":155,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -74,7 +74,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":628,"y":37,"w":30,"h":30}, + "frame": {"x":635,"y":159,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -82,7 +82,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":662,"y":37,"w":30,"h":30}, + "frame": {"x":194,"y":217,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -90,7 +90,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":617,"y":71,"w":30,"h":30}, + "frame": {"x":228,"y":197,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -98,7 +98,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":617,"y":105,"w":30,"h":30}, + "frame": {"x":262,"y":197,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -106,7 +106,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":651,"y":71,"w":30,"h":30}, + "frame": {"x":328,"y":207,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -114,7 +114,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":651,"y":105,"w":30,"h":30}, + "frame": {"x":362,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -122,7 +122,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":623,"y":139,"w":30,"h":30}, + "frame": {"x":396,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -130,7 +130,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":657,"y":139,"w":30,"h":30}, + "frame": {"x":635,"y":193,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -138,7 +138,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":623,"y":173,"w":30,"h":30}, + "frame": {"x":533,"y":201,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -146,7 +146,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":657,"y":173,"w":30,"h":30}, + "frame": {"x":567,"y":201,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -154,7 +154,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":630,"y":207,"w":30,"h":30}, + "frame": {"x":601,"y":201,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -162,7 +162,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":585,"y":55,"w":28,"h":32}, + "frame": {"x":494,"y":210,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -170,7 +170,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":383,"y":3,"w":87,"h":48}, + "frame": {"x":103,"y":192,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -178,7 +178,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":526,"y":3,"w":47,"h":48}, + "frame": {"x":592,"y":107,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":577,"y":3,"w":47,"h":48}, + "frame": {"x":643,"y":107,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -194,7 +194,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":191,"y":103,"w":89,"h":48}, + "frame": {"x":391,"y":3,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -218,7 +218,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":474,"y":3,"w":48,"h":48}, + "frame": {"x":384,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -226,15 +226,15 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":572,"y":91,"w":41,"h":47}, + "frame": {"x":431,"y":159,"w":47,"h":47}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":7,"y":0,"w":41,"h":47}, + "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, "sourceSize": {"w":48,"h":48} }, "sprites/blueprints/splitter.png": { - "frame": {"x":377,"y":97,"w":87,"h":48}, + "frame": {"x":391,"y":55,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -242,7 +242,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":284,"y":103,"w":89,"h":48}, + "frame": {"x":291,"y":103,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -250,7 +250,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":468,"y":91,"w":48,"h":48}, + "frame": {"x":436,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -258,7 +258,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":303,"y":207,"w":48,"h":38}, + "frame": {"x":225,"y":155,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -266,7 +266,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":355,"y":207,"w":48,"h":38}, + "frame": {"x":277,"y":155,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -274,7 +274,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":589,"y":142,"w":30,"h":30}, + "frame": {"x":668,"y":3,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -282,7 +282,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":617,"y":105,"w":30,"h":30}, + "frame": {"x":262,"y":197,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -290,7 +290,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":393,"y":55,"w":28,"h":32}, + "frame": {"x":664,"y":71,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -298,7 +298,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":395,"y":149,"w":87,"h":48}, + "frame": {"x":482,"y":55,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -314,7 +314,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":498,"y":195,"w":47,"h":48}, + "frame": {"x":329,"y":155,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -322,7 +322,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":538,"y":143,"w":47,"h":48}, + "frame": {"x":380,"y":159,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -330,7 +330,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":303,"y":155,"w":88,"h":48}, + "frame": {"x":484,"y":3,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -338,7 +338,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":203,"y":155,"w":96,"h":96}, + "frame": {"x":291,"y":3,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -346,7 +346,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":103,"y":192,"w":96,"h":48}, + "frame": {"x":191,"y":103,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -354,7 +354,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":486,"y":143,"w":48,"h":48}, + "frame": {"x":488,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -362,15 +362,15 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":549,"y":195,"w":41,"h":47}, + "frame": {"x":482,"y":159,"w":47,"h":47}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":7,"y":0,"w":41,"h":47}, + "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, "sourceSize": {"w":48,"h":48} }, "sprites/buildings/splitter.png": { - "frame": {"x":407,"y":201,"w":87,"h":48}, + "frame": {"x":573,"y":55,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -378,7 +378,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":291,"y":3,"w":88,"h":48}, + "frame": {"x":576,"y":3,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -386,7 +386,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":520,"y":91,"w":48,"h":48}, + "frame": {"x":540,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -394,7 +394,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":291,"y":55,"w":47,"h":38}, + "frame": {"x":533,"y":159,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -402,7 +402,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":342,"y":55,"w":47,"h":38}, + "frame": {"x":584,"y":159,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -410,7 +410,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":594,"y":230,"w":14,"h":16}, + "frame": {"x":228,"y":231,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -418,7 +418,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":612,"y":230,"w":14,"h":16}, + "frame": {"x":246,"y":231,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -426,7 +426,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":191,"y":155,"w":8,"h":8}, + "frame": {"x":264,"y":231,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -434,7 +434,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":191,"y":167,"w":8,"h":8}, + "frame": {"x":276,"y":231,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -442,7 +442,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":191,"y":179,"w":8,"h":8}, + "frame": {"x":661,"y":231,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -450,7 +450,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":594,"y":204,"w":22,"h":22}, + "frame": {"x":635,"y":227,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -458,7 +458,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":594,"y":204,"w":22,"h":22}, + "frame": {"x":635,"y":227,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -466,7 +466,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":594,"y":176,"w":22,"h":24}, + "frame": {"x":194,"y":189,"w":22,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":22,"h":24}, @@ -477,8 +477,8 @@ "version": "1.0", "image": "atlas0_25.png", "format": "RGBA8888", - "size": {"w":695,"h":254}, + "size": {"w":701,"h":252}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:f63fd65ef73974465324213239ca32e1:fb51df0c27e5bdac60799c0e88f833c7:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png index 6373f673..3201ed0e 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 2350e1ee..0d50d458 100644 --- a/res_built/atlas/atlas0_50.json +++ b/res_built/atlas/atlas0_50.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":873,"y":398,"w":51,"h":63}, + "frame": {"x":1205,"y":303,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":1111,"y":365,"w":51,"h":63}, + "frame": {"x":592,"y":399,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":1166,"y":370,"w":51,"h":63}, + "frame": {"x":1242,"y":370,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":1221,"y":370,"w":51,"h":63}, + "frame": {"x":1242,"y":437,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":1111,"y":432,"w":51,"h":63}, + "frame": {"x":1120,"y":442,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":1166,"y":437,"w":51,"h":63}, + "frame": {"x":1175,"y":442,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -50,7 +50,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":568,"y":378,"w":57,"h":57}, + "frame": {"x":647,"y":397,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -58,7 +58,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":1148,"y":303,"w":57,"h":57}, + "frame": {"x":708,"y":398,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -66,7 +66,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":629,"y":397,"w":57,"h":57}, + "frame": {"x":815,"y":402,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -74,7 +74,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":568,"y":439,"w":57,"h":57}, + "frame": {"x":876,"y":402,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -82,7 +82,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":690,"y":400,"w":57,"h":57}, + "frame": {"x":937,"y":382,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -90,7 +90,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":751,"y":400,"w":57,"h":57}, + "frame": {"x":998,"y":382,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -98,7 +98,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":812,"y":398,"w":57,"h":57}, + "frame": {"x":1059,"y":382,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -106,7 +106,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":928,"y":381,"w":57,"h":57}, + "frame": {"x":1120,"y":381,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -114,7 +114,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":989,"y":381,"w":57,"h":57}, + "frame": {"x":1181,"y":381,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -122,7 +122,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":1050,"y":381,"w":57,"h":57}, + "frame": {"x":937,"y":443,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -130,7 +130,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":928,"y":442,"w":57,"h":57}, + "frame": {"x":998,"y":443,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -138,7 +138,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":989,"y":442,"w":57,"h":57}, + "frame": {"x":1059,"y":443,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -154,7 +154,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":1086,"y":303,"w":58,"h":58}, + "frame": {"x":530,"y":399,"w":58,"h":58}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":58,"h":58}, @@ -162,7 +162,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":1209,"y":303,"w":53,"h":63}, + "frame": {"x":473,"y":396,"w":53,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":53,"h":63}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":377,"y":378,"w":92,"h":96}, + "frame": {"x":532,"y":299,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -226,10 +226,10 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":724,"y":303,"w":81,"h":93}, + "frame": {"x":435,"y":299,"w":93,"h":93}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":15,"y":1,"w":81,"h":93}, + "spriteSourceSize": {"x":3,"y":1,"w":93,"h":93}, "sourceSize": {"w":96,"h":96} }, "sprites/blueprints/splitter.png": @@ -258,7 +258,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":435,"y":299,"w":93,"h":75}, + "frame": {"x":915,"y":303,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":21,"w":93,"h":75}, @@ -266,7 +266,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":532,"y":299,"w":93,"h":75}, + "frame": {"x":1012,"y":303,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":93,"h":75}, @@ -274,7 +274,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":568,"y":378,"w":57,"h":57}, + "frame": {"x":647,"y":397,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -282,7 +282,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":812,"y":398,"w":57,"h":57}, + "frame": {"x":1059,"y":382,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -290,7 +290,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":873,"y":398,"w":51,"h":63}, + "frame": {"x":1205,"y":303,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -314,7 +314,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":473,"y":378,"w":91,"h":95}, + "frame": {"x":628,"y":298,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -322,7 +322,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":629,"y":298,"w":91,"h":95}, + "frame": {"x":820,"y":303,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -362,10 +362,10 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":809,"y":303,"w":81,"h":91}, + "frame": {"x":723,"y":303,"w":93,"h":91}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":15,"y":2,"w":81,"h":91}, + "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, "sourceSize": {"w":96,"h":96} }, "sprites/buildings/splitter.png": @@ -394,7 +394,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":894,"y":303,"w":92,"h":74}, + "frame": {"x":1109,"y":303,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":22,"w":92,"h":74}, @@ -402,7 +402,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":990,"y":303,"w":92,"h":74}, + "frame": {"x":377,"y":396,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -418,7 +418,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":1050,"y":442,"w":26,"h":32}, + "frame": {"x":3,"y":474,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -426,7 +426,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":3,"y":474,"w":14,"h":16}, + "frame": {"x":915,"y":382,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -434,7 +434,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":1221,"y":437,"w":15,"h":15}, + "frame": {"x":33,"y":474,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":15,"h":15}, @@ -442,7 +442,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":1050,"y":478,"w":15,"h":15}, + "frame": {"x":52,"y":474,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":15,"h":15}, @@ -450,7 +450,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":629,"y":458,"w":42,"h":42}, + "frame": {"x":769,"y":398,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -458,7 +458,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":629,"y":458,"w":42,"h":42}, + "frame": {"x":769,"y":398,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -477,8 +477,8 @@ "version": "1.0", "image": "atlas0_50.png", "format": "RGBA8888", - "size": {"w":1296,"h":503}, + "size": {"w":1296,"h":509}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:f63fd65ef73974465324213239ca32e1:fb51df0c27e5bdac60799c0e88f833c7:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png index 393d79d8..c532d915 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 b5985131..d3c6024f 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":842,"y":800,"w":77,"h":95}, + "frame": {"x":909,"y":678,"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":923,"y":799,"w":77,"h":95}, + "frame": {"x":843,"y":957,"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":1286,"y":588,"w":77,"h":95}, + "frame": {"x":377,"y":1295,"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":932,"y":898,"w":77,"h":95}, + "frame": {"x":561,"y":1147,"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":1286,"y":687,"w":77,"h":95}, + "frame": {"x":642,"y":1145,"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":1004,"y":799,"w":77,"h":95}, + "frame": {"x":903,"y":1146,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -50,7 +50,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":1106,"y":593,"w":86,"h":86}, + "frame": {"x":819,"y":678,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -58,7 +58,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":915,"y":709,"w":86,"h":86}, + "frame": {"x":898,"y":777,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -66,7 +66,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":1005,"y":708,"w":86,"h":86}, + "frame": {"x":838,"y":867,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -74,7 +74,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":1196,"y":593,"w":86,"h":86}, + "frame": {"x":843,"y":1056,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -82,7 +82,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":842,"y":899,"w":86,"h":86}, + "frame": {"x":458,"y":1294,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -90,7 +90,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":1106,"y":683,"w":86,"h":86}, + "frame": {"x":548,"y":1294,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -98,7 +98,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":1196,"y":683,"w":86,"h":86}, + "frame": {"x":723,"y":1143,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -106,7 +106,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":1013,"y":898,"w":86,"h":86}, + "frame": {"x":813,"y":1146,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -114,7 +114,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":1095,"y":773,"w":86,"h":86}, + "frame": {"x":723,"y":1233,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -122,7 +122,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":1185,"y":773,"w":86,"h":86}, + "frame": {"x":813,"y":1236,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -130,7 +130,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":1275,"y":786,"w":86,"h":86}, + "frame": {"x":638,"y":1323,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -138,7 +138,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":1103,"y":863,"w":86,"h":86}, + "frame": {"x":728,"y":1326,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -146,7 +146,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":697,"y":588,"w":87,"h":87}, + "frame": {"x":145,"y":1291,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":8,"w":87,"h":87}, @@ -154,7 +154,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":824,"y":709,"w":87,"h":87}, + "frame": {"x":819,"y":587,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":87,"h":87}, @@ -162,7 +162,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":1290,"y":298,"w":79,"h":95}, + "frame": {"x":815,"y":768,"w":79,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":79,"h":95}, @@ -178,7 +178,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":559,"y":704,"w":136,"h":143}, + "frame": {"x":847,"y":285,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":819,"y":447,"w":136,"h":143}, + "frame": {"x":563,"y":998,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -194,7 +194,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":847,"y":3,"w":261,"h":144}, + "frame": {"x":3,"y":995,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -218,7 +218,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":1143,"y":298,"w":143,"h":144}, + "frame": {"x":416,"y":999,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -226,15 +226,15 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1239,"y":446,"w":121,"h":138}, + "frame": {"x":847,"y":3,"w":139,"h":138}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":23,"y":2,"w":121,"h":138}, + "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, "sourceSize": {"w":144,"h":144} }, "sprites/blueprints/splitter.png": { - "frame": {"x":1112,"y":3,"w":256,"h":144}, + "frame": {"x":295,"y":704,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -242,7 +242,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":847,"y":151,"w":261,"h":144}, + "frame": {"x":3,"y":1143,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -250,7 +250,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":847,"y":299,"w":144,"h":144}, + "frame": {"x":268,"y":999,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -258,7 +258,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":555,"y":588,"w":138,"h":112}, + "frame": {"x":3,"y":1291,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -266,7 +266,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":700,"y":819,"w":138,"h":112}, + "frame": {"x":555,"y":882,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":138,"h":112}, @@ -274,7 +274,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":1106,"y":593,"w":86,"h":86}, + "frame": {"x":819,"y":678,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -282,7 +282,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1196,"y":683,"w":86,"h":86}, + "frame": {"x":723,"y":1143,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -290,7 +290,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":842,"y":800,"w":77,"h":95}, + "frame": {"x":909,"y":678,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -298,7 +298,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":1112,"y":151,"w":256,"h":143}, + "frame": {"x":295,"y":852,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -314,7 +314,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":959,"y":447,"w":136,"h":142}, + "frame": {"x":703,"y":997,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -322,7 +322,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1099,"y":447,"w":136,"h":142}, + "frame": {"x":819,"y":441,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -354,7 +354,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":555,"y":851,"w":141,"h":143}, + "frame": {"x":416,"y":1147,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -362,15 +362,15 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":699,"y":679,"w":121,"h":136}, + "frame": {"x":847,"y":145,"w":139,"h":136}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":23,"y":3,"w":121,"h":136}, + "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, "sourceSize": {"w":144,"h":144} }, "sprites/buildings/splitter.png": { - "frame": {"x":295,"y":851,"w":256,"h":143}, + "frame": {"x":555,"y":735,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -378,7 +378,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":295,"y":704,"w":260,"h":143}, + "frame": {"x":555,"y":588,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -386,7 +386,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":995,"y":299,"w":144,"h":144}, + "frame": {"x":268,"y":1147,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -394,7 +394,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":824,"y":594,"w":137,"h":111}, + "frame": {"x":697,"y":882,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -402,7 +402,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":965,"y":593,"w":137,"h":111}, + "frame": {"x":236,"y":1295,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -410,7 +410,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":700,"y":935,"w":38,"h":48}, + "frame": {"x":928,"y":867,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -418,7 +418,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":742,"y":935,"w":38,"h":48}, + "frame": {"x":903,"y":1245,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -426,7 +426,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":1290,"y":397,"w":20,"h":24}, + "frame": {"x":561,"y":1246,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -434,7 +434,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":788,"y":588,"w":22,"h":22}, + "frame": {"x":928,"y":919,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":22,"h":22}, @@ -442,7 +442,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":1103,"y":953,"w":22,"h":22}, + "frame": {"x":903,"y":1297,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":22,"h":22}, @@ -450,7 +450,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":1259,"y":876,"w":62,"h":62}, + "frame": {"x":910,"y":587,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -458,7 +458,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":1259,"y":876,"w":62,"h":62}, + "frame": {"x":910,"y":587,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -466,7 +466,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":1193,"y":863,"w":62,"h":72}, + "frame": {"x":924,"y":957,"w":62,"h":72}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":62,"h":72}, @@ -477,8 +477,8 @@ "version": "1.0", "image": "atlas0_75.png", "format": "RGBA8888", - "size": {"w":1372,"h":997}, + "size": {"w":989,"h":1415}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:f63fd65ef73974465324213239ca32e1:fb51df0c27e5bdac60799c0e88f833c7:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png index 89bb599c..bd29aa1b 100644 Binary files a/res_built/atlas/atlas0_75.png and b/res_built/atlas/atlas0_75.png differ diff --git a/res_raw/sprites/blueprints/splitter-compact.png b/res_raw/sprites/blueprints/splitter-compact.png index e08f75f0..3e3c81f7 100644 Binary files a/res_raw/sprites/blueprints/splitter-compact.png and b/res_raw/sprites/blueprints/splitter-compact.png differ diff --git a/res_raw/sprites/buildings/splitter-compact.png b/res_raw/sprites/buildings/splitter-compact.png index d6a03a9a..f0f80a0b 100644 Binary files a/res_raw/sprites/buildings/splitter-compact.png and b/res_raw/sprites/buildings/splitter-compact.png differ diff --git a/src/js/core/config.js b/src/js/core/config.js index 2100ae8c..620ea3c7 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -38,7 +38,7 @@ export const globalConfig = { // Belt speeds // NOTICE: Update webpack.production.config too! - beltSpeedItemsPerSecond: 1, + beltSpeedItemsPerSecond: 5, itemSpacingOnBelts: 0.63, minerSpeedItemsPerSecond: 0, // COMPUTED diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 98d421b3..296ee84a 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -118,11 +118,6 @@ export class ItemProcessorComponent extends Component { * @param {BaseItem} item */ tryTakeItem(item, sourceSlot, sourceDirection) { - if (this.inputSlots.length >= this.inputsPerCharge) { - // Already full - return false; - } - // Check that we only take one item per slot for (let i = 0; i < this.inputSlots.length; ++i) { const slot = this.inputSlots[i]; diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 91b04c24..c53a0f11 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -98,7 +98,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // Check if we have an empty queue and can start a new charge if (processorComp.itemsToEject.length === 0) { - if (processorComp.inputSlots.length === processorComp.inputsPerCharge) { + if (processorComp.inputSlots.length >= processorComp.inputsPerCharge) { this.startNewCharge(entity); } } @@ -133,11 +133,13 @@ export class ItemProcessorSystem extends GameSystemWithFilter { switch (processorComp.type) { // SPLITTER case enumItemProcessorTypes.splitter: { - let nextSlot = processorComp.nextOutputSlot++ % 2; + const availableSlots = entity.components.ItemEjector.slots.length; + + let nextSlot = processorComp.nextOutputSlot++ % availableSlots; for (let i = 0; i < items.length; ++i) { outItems.push({ item: items[i].item, - preferredSlot: (nextSlot + i) % 2, + preferredSlot: (nextSlot + i) % availableSlots, }); } break; @@ -255,7 +257,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // PAINTER (DOUBLE) case enumItemProcessorTypes.painterDouble: { - console.log("YUP"); const shapeItem1 = /** @type {ShapeItem} */ (itemsBySlot[0].item); const shapeItem2 = /** @type {ShapeItem} */ (itemsBySlot[1].item); const colorItem = /** @type {ColorItem} */ (itemsBySlot[2].item);