diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index 2e28c0b1..0e49d257 100644 --- a/res_built/atlas/atlas0_10.json +++ b/res_built/atlas/atlas0_10.json @@ -1,38 +1,6 @@ {"frames": { "sprites/belt/forward_0.png": -{ - "frame": {"x":3,"y":267,"w":13,"h":13}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/belt/forward_1.png": -{ - "frame": {"x":20,"y":267,"w":13,"h":13}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/belt/forward_2.png": -{ - "frame": {"x":37,"y":267,"w":13,"h":13}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/belt/forward_3.png": -{ - "frame": {"x":54,"y":267,"w":13,"h":13}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/belt/forward_4.png": { "frame": {"x":82,"y":87,"w":13,"h":13}, "rotated": false, @@ -40,9 +8,41 @@ "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, "sourceSize": {"w":13,"h":13} }, +"sprites/belt/forward_1.png": +{ + "frame": {"x":99,"y":107,"w":13,"h":13}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, + "sourceSize": {"w":13,"h":13} +}, +"sprites/belt/forward_2.png": +{ + "frame": {"x":90,"y":128,"w":13,"h":13}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, + "sourceSize": {"w":13,"h":13} +}, +"sprites/belt/forward_3.png": +{ + "frame": {"x":107,"y":124,"w":13,"h":13}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, + "sourceSize": {"w":13,"h":13} +}, +"sprites/belt/forward_4.png": +{ + "frame": {"x":107,"y":141,"w":13,"h":13}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, + "sourceSize": {"w":13,"h":13} +}, "sprites/belt/forward_5.png": { - "frame": {"x":85,"y":127,"w":13,"h":13}, + "frame": {"x":90,"y":145,"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":102,"y":127,"w":13,"h":13}, + "frame": {"x":107,"y":158,"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":90,"y":144,"w":13,"h":13}, + "frame": {"x":90,"y":162,"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":107,"y":144,"w":13,"h":13}, + "frame": {"x":107,"y":175,"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":90,"y":161,"w":13,"h":13}, + "frame": {"x":90,"y":179,"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":107,"y":161,"w":13,"h":13}, + "frame": {"x":107,"y":192,"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":90,"y":178,"w":13,"h":13}, + "frame": {"x":90,"y":196,"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":107,"y":178,"w":13,"h":13}, + "frame": {"x":107,"y":209,"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":90,"y":195,"w":13,"h":13}, + "frame": {"x":90,"y":213,"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":107,"y":195,"w":13,"h":13}, + "frame": {"x":107,"y":226,"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":90,"y":212,"w":13,"h":13}, + "frame": {"x":89,"y":230,"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":107,"y":212,"w":13,"h":13}, + "frame": {"x":89,"y":247,"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":89,"y":229,"w":13,"h":13}, + "frame": {"x":89,"y":264,"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":89,"y":246,"w":13,"h":13}, + "frame": {"x":106,"y":243,"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":106,"y":229,"w":13,"h":13}, + "frame": {"x":106,"y":260,"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":106,"y":246,"w":13,"h":13}, + "frame": {"x":106,"y":277,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":44,"y":152,"w":19,"h":19}, + "frame": {"x":44,"y":129,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -216,6 +216,14 @@ "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, "sourceSize": {"w":38,"h":19} }, +"sprites/blueprints/rotater-ccw.png": +{ + "frame": {"x":44,"y":152,"w":19,"h":19}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, + "sourceSize": {"w":19,"h":19} +}, "sprites/blueprints/rotater.png": { "frame": {"x":44,"y":175,"w":19,"h":19}, @@ -258,7 +266,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":66,"y":244,"w":19,"h":16}, + "frame": {"x":66,"y":221,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -266,7 +274,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":71,"y":264,"w":19,"h":16}, + "frame": {"x":66,"y":241,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -274,7 +282,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":102,"y":127,"w":13,"h":13}, + "frame": {"x":107,"y":158,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -282,7 +290,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":107,"y":178,"w":13,"h":13}, + "frame": {"x":107,"y":209,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -290,7 +298,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":3,"y":267,"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}, @@ -298,7 +306,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":45,"y":106,"w":36,"h":19}, + "frame": {"x":3,"y":267,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -322,7 +330,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":67,"y":152,"w":19,"h":19}, + "frame": {"x":43,"y":267,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -352,9 +360,17 @@ "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, "sourceSize": {"w":38,"h":19} }, +"sprites/buildings/rotater-ccw.png": +{ + "frame": {"x":67,"y":129,"w":19,"h":19}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, + "sourceSize": {"w":19,"h":19} +}, "sprites/buildings/rotater.png": { - "frame": {"x":67,"y":175,"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}, @@ -362,7 +378,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":67,"y":198,"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}, @@ -370,7 +386,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":44,"y":129,"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}, @@ -386,7 +402,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":66,"y":221,"w":19,"h":19}, + "frame": {"x":67,"y":198,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -394,7 +410,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":99,"y":87,"w":19,"h":16}, + "frame": {"x":66,"y":261,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -402,7 +418,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":85,"y":107,"w":19,"h":16}, + "frame": {"x":99,"y":87,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -410,7 +426,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":94,"y":263,"w":6,"h":6}, + "frame": {"x":85,"y":118,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -418,7 +434,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":94,"y":273,"w":6,"h":6}, + "frame": {"x":66,"y":281,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -442,7 +458,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":104,"y":263,"w":3,"h":3}, + "frame": {"x":76,"y":281,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -466,7 +482,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":108,"y":107,"w":10,"h":10}, + "frame": {"x":85,"y":104,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -477,8 +493,8 @@ "version": "1.0", "image": "atlas0_10.png", "format": "RGBA8888", - "size": {"w":123,"h":283}, + "size": {"w":123,"h":293}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:1a28e62a074b0346c536cb875a4fbda8:3d5d3842157667ebdb6e61f7cb9abd01:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png index 075b76d9..57038638 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 5e9bd8b0..fea45f53 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":2029,"y":551,"w":100,"h":126}, + "frame": {"x":853,"y":1258,"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":2029,"y":681,"w":100,"h":126}, + "frame": {"x":851,"y":1388,"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":2029,"y":811,"w":100,"h":126}, + "frame": {"x":851,"y":1518,"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":2133,"y":467,"w":100,"h":126}, + "frame": {"x":728,"y":1903,"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":2133,"y":597,"w":100,"h":126}, + "frame": {"x":770,"y":1696,"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":2237,"y":467,"w":100,"h":126}, + "frame": {"x":733,"y":2033,"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":2165,"y":350,"w":113,"h":113}, + "frame": {"x":734,"y":1376,"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":2001,"y":434,"w":113,"h":113}, + "frame": {"x":734,"y":1493,"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":2282,"y":350,"w":113,"h":113}, + "frame": {"x":733,"y":2163,"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":2133,"y":727,"w":113,"h":113}, + "frame": {"x":545,"y":2280,"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":2237,"y":597,"w":113,"h":113}, + "frame": {"x":662,"y":2280,"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":2133,"y":844,"w":113,"h":113}, + "frame": {"x":779,"y":2280,"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":2250,"y":714,"w":113,"h":113}, + "frame": {"x":559,"y":2397,"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":2250,"y":831,"w":113,"h":113}, + "frame": {"x":676,"y":2397,"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":2341,"y":467,"w":113,"h":113}, + "frame": {"x":559,"y":2514,"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":2354,"y":584,"w":113,"h":113}, + "frame": {"x":676,"y":2514,"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":2367,"y":701,"w":113,"h":113}, + "frame": {"x":793,"y":2397,"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":2367,"y":818,"w":113,"h":113}, + "frame": {"x":793,"y":2514,"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":2047,"y":316,"w":114,"h":114}, + "frame": {"x":735,"y":1258,"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":2047,"y":197,"w":114,"h":115}, + "frame": {"x":735,"y":589,"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":2350,"y":199,"w":102,"h":126}, + "frame": {"x":853,"y":589,"w":102,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":0,"w":102,"h":126}, @@ -178,7 +178,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1466,"y":778,"w":182,"h":190}, + "frame": {"x":584,"y":1709,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1657,"y":587,"w":182,"h":190}, + "frame": {"x":736,"y":719,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -194,7 +194,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":1123,"y":388,"w":347,"h":191}, + "frame": {"x":3,"y":1899,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -202,7 +202,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":735,"y":3,"w":384,"h":382}, + "frame": {"x":3,"y":737,"w":384,"h":382}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":382}, @@ -210,15 +210,23 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":3,"y":737,"w":384,"h":192}, + "frame": {"x":3,"y":1508,"w":384,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":192}, "sourceSize": {"w":384,"h":192} }, +"sprites/blueprints/rotater-ccw.png": +{ + "frame": {"x":735,"y":394,"w":189,"h":191}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, + "sourceSize": {"w":192,"h":192} +}, "sprites/blueprints/rotater.png": { - "frame": {"x":1275,"y":583,"w":189,"h":191}, + "frame": {"x":391,"y":1709,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -226,7 +234,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1468,"y":587,"w":185,"h":182}, + "frame": {"x":352,"y":2292,"w":185,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":4,"w":185,"h":182}, @@ -234,7 +242,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":1474,"y":392,"w":340,"h":191}, + "frame": {"x":391,"y":1126,"w":340,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":340,"h":191}, @@ -242,7 +250,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":1511,"y":3,"w":347,"h":191}, + "frame": {"x":3,"y":2094,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -250,7 +258,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":2211,"y":3,"w":192,"h":192}, + "frame": {"x":735,"y":3,"w":192,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":192}, @@ -258,7 +266,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":1843,"y":584,"w":182,"h":148}, + "frame": {"x":373,"y":2478,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":44,"w":182,"h":148}, @@ -266,7 +274,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":1843,"y":736,"w":182,"h":148}, + "frame": {"x":740,"y":1106,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":148}, @@ -274,7 +282,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":2165,"y":350,"w":113,"h":113}, + "frame": {"x":734,"y":1376,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -282,7 +290,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":2250,"y":714,"w":113,"h":113}, + "frame": {"x":559,"y":2397,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -290,7 +298,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":2029,"y":551,"w":100,"h":126}, + "frame": {"x":853,"y":1258,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -298,7 +306,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":736,"y":584,"w":339,"h":190}, + "frame": {"x":391,"y":1321,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -314,7 +322,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1818,"y":392,"w":179,"h":188}, + "frame": {"x":545,"y":1904,"w":179,"h":188}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":1,"w":179,"h":188}, @@ -322,7 +330,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1079,"y":779,"w":179,"h":189}, + "frame": {"x":740,"y":913,"w":179,"h":189}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":179,"h":189}, @@ -330,7 +338,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":1862,"y":3,"w":345,"h":190}, + "frame": {"x":3,"y":2289,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -338,7 +346,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":1123,"y":3,"w":384,"h":381}, + "frame": {"x":3,"y":1123,"w":384,"h":381}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":381}, @@ -346,15 +354,23 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":735,"y":389,"w":384,"h":191}, + "frame": {"x":3,"y":1704,"w":384,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":191}, "sourceSize": {"w":384,"h":192} }, +"sprites/buildings/rotater-ccw.png": +{ + "frame": {"x":354,"y":1904,"w":187,"h":190}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, + "sourceSize": {"w":192,"h":192} +}, "sprites/buildings/rotater.png": { - "frame": {"x":1275,"y":778,"w":187,"h":190}, + "frame": {"x":354,"y":2098,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -362,7 +378,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1652,"y":781,"w":184,"h":180}, + "frame": {"x":545,"y":2096,"w":184,"h":180}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":5,"w":184,"h":180}, @@ -370,7 +386,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":736,"y":778,"w":339,"h":190}, + "frame": {"x":391,"y":1515,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -378,7 +394,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":1511,"y":198,"w":345,"h":190}, + "frame": {"x":391,"y":932,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -386,7 +402,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":1079,"y":584,"w":192,"h":191}, + "frame": {"x":735,"y":199,"w":192,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":192,"h":191}, @@ -394,7 +410,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1862,"y":197,"w":181,"h":147}, + "frame": {"x":3,"y":2483,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":45,"w":181,"h":147}, @@ -402,7 +418,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":2165,"y":199,"w":181,"h":147}, + "frame": {"x":188,"y":2483,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":181,"h":147}, @@ -410,7 +426,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":2407,"y":103,"w":50,"h":64}, + "frame": {"x":770,"y":1826,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -418,7 +434,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":1840,"y":888,"w":50,"h":64}, + "frame": {"x":874,"y":1748,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -426,7 +442,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":3,"y":933,"w":24,"h":32}, + "frame": {"x":931,"y":3,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -434,7 +450,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":1894,"y":888,"w":28,"h":28}, + "frame": {"x":922,"y":719,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":28,"h":28}, @@ -442,7 +458,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":2118,"y":434,"w":28,"h":28}, + "frame": {"x":824,"y":1826,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":28,"h":28}, @@ -450,7 +466,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":2399,"y":329,"w":82,"h":82}, + "frame": {"x":734,"y":1610,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -458,7 +474,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":2399,"y":329,"w":82,"h":82}, + "frame": {"x":734,"y":1610,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -466,7 +482,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":2407,"y":3,"w":80,"h":96}, + "frame": {"x":874,"y":1648,"w":80,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":80,"h":96}, @@ -477,8 +493,8 @@ "version": "1.0", "image": "atlas0_100.png", "format": "RGBA8888", - "size": {"w":2490,"h":971}, + "size": {"w":958,"h":2633}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:1a28e62a074b0346c536cb875a4fbda8:3d5d3842157667ebdb6e61f7cb9abd01:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.png b/res_built/atlas/atlas0_100.png index a2016c22..36ca7892 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 68b4764f..6d2cb526 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":664,"y":71,"w":28,"h":32}, + "frame": {"x":191,"y":155,"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":669,"y":159,"w":28,"h":32}, + "frame": {"x":633,"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":296,"y":197,"w":28,"h":32}, + "frame": {"x":429,"y":210,"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":669,"y":195,"w":28,"h":32}, + "frame": {"x":461,"y":210,"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":430,"y":211,"w":28,"h":32}, + "frame": {"x":493,"y":210,"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":462,"y":210,"w":28,"h":32}, + "frame": {"x":525,"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":668,"y":3,"w":30,"h":30}, + "frame": {"x":557,"y":201,"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":668,"y":37,"w":30,"h":30}, + "frame": {"x":591,"y":201,"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":191,"y":155,"w":30,"h":30}, + "frame": {"x":694,"y":107,"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":635,"y":159,"w":30,"h":30}, + "frame": {"x":220,"y":197,"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":194,"y":217,"w":30,"h":30}, + "frame": {"x":254,"y":197,"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":228,"y":197,"w":30,"h":30}, + "frame": {"x":288,"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":262,"y":197,"w":30,"h":30}, + "frame": {"x":322,"y":207,"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":328,"y":207,"w":30,"h":30}, + "frame": {"x":697,"y":141,"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":362,"y":211,"w":30,"h":30}, + "frame": {"x":697,"y":175,"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":396,"y":211,"w":30,"h":30}, + "frame": {"x":356,"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":635,"y":193,"w":30,"h":30}, + "frame": {"x":390,"y":211,"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":533,"y":201,"w":30,"h":30}, + "frame": {"x":625,"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":567,"y":201,"w":30,"h":30}, + "frame": {"x":659,"y":195,"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":601,"y":201,"w":30,"h":30}, + "frame": {"x":693,"y":209,"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":494,"y":210,"w":28,"h":32}, + "frame": {"x":665,"y":159,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -216,9 +216,17 @@ "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, "sourceSize": {"w":96,"h":48} }, +"sprites/blueprints/rotater-ccw.png": +{ + "frame": {"x":668,"y":3,"w":48,"h":48}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, + "sourceSize": {"w":48,"h":48} +}, "sprites/blueprints/rotater.png": { - "frame": {"x":384,"y":107,"w":48,"h":48}, + "frame": {"x":664,"y":55,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -226,7 +234,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":431,"y":159,"w":47,"h":47}, + "frame": {"x":429,"y":159,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -250,7 +258,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":436,"y":107,"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}, @@ -258,7 +266,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":225,"y":155,"w":48,"h":38}, + "frame": {"x":223,"y":155,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -266,7 +274,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":277,"y":155,"w":48,"h":38}, + "frame": {"x":275,"y":155,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -274,7 +282,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":668,"y":3,"w":30,"h":30}, + "frame": {"x":557,"y":201,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -282,7 +290,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":262,"y":197,"w":30,"h":30}, + "frame": {"x":322,"y":207,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -290,7 +298,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":664,"y":71,"w":28,"h":32}, + "frame": {"x":191,"y":155,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -314,7 +322,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":329,"y":155,"w":47,"h":48}, + "frame": {"x":327,"y":155,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -322,7 +330,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":380,"y":159,"w":47,"h":48}, + "frame": {"x":378,"y":159,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -352,6 +360,14 @@ "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, "sourceSize": {"w":96,"h":48} }, +"sprites/buildings/rotater-ccw.png": +{ + "frame": {"x":436,"y":107,"w":48,"h":48}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, + "sourceSize": {"w":48,"h":48} +}, "sprites/buildings/rotater.png": { "frame": {"x":488,"y":107,"w":48,"h":48}, @@ -362,7 +378,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":482,"y":159,"w":47,"h":47}, + "frame": {"x":480,"y":159,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -394,7 +410,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":533,"y":159,"w":47,"h":38}, + "frame": {"x":531,"y":159,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -402,7 +418,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":584,"y":159,"w":47,"h":38}, + "frame": {"x":582,"y":159,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -410,7 +426,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":228,"y":231,"w":14,"h":16}, + "frame": {"x":716,"y":55,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -418,7 +434,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":246,"y":231,"w":14,"h":16}, + "frame": {"x":716,"y":75,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -426,7 +442,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":264,"y":231,"w":8,"h":8}, + "frame": {"x":716,"y":95,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -434,7 +450,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":276,"y":231,"w":8,"h":8}, + "frame": {"x":220,"y":231,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -442,7 +458,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":661,"y":231,"w":8,"h":8}, + "frame": {"x":720,"y":3,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -450,7 +466,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":635,"y":227,"w":22,"h":22}, + "frame": {"x":194,"y":219,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -458,7 +474,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":635,"y":227,"w":22,"h":22}, + "frame": {"x":194,"y":219,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -466,7 +482,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":194,"y":189,"w":22,"h":24}, + "frame": {"x":194,"y":191,"w":22,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":22,"h":24}, @@ -477,8 +493,8 @@ "version": "1.0", "image": "atlas0_25.png", "format": "RGBA8888", - "size": {"w":701,"h":252}, + "size": {"w":733,"h":245}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:1a28e62a074b0346c536cb875a4fbda8:3d5d3842157667ebdb6e61f7cb9abd01:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png index 3201ed0e..77c20e34 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 0d50d458..4c5a3e9a 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":1205,"y":303,"w":51,"h":63}, + "frame": {"x":1300,"y":3,"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":592,"y":399,"w":51,"h":63}, + "frame": {"x":1300,"y":70,"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":1242,"y":370,"w":51,"h":63}, + "frame": {"x":1004,"y":382,"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":1242,"y":437,"w":51,"h":63}, + "frame": {"x":1059,"y":381,"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":1120,"y":442,"w":51,"h":63}, + "frame": {"x":1114,"y":381,"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":1175,"y":442,"w":51,"h":63}, + "frame": {"x":1268,"y":365,"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":647,"y":397,"w":57,"h":57}, + "frame": {"x":1269,"y":303,"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":708,"y":398,"w":57,"h":57}, + "frame": {"x":622,"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":815,"y":402,"w":57,"h":57}, + "frame": {"x":1290,"y":137,"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":876,"y":402,"w":57,"h":57}, + "frame": {"x":821,"y":382,"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":937,"y":382,"w":57,"h":57}, + "frame": {"x":882,"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":998,"y":382,"w":57,"h":57}, + "frame": {"x":943,"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":1059,"y":382,"w":57,"h":57}, + "frame": {"x":1207,"y":365,"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":1120,"y":381,"w":57,"h":57}, + "frame": {"x":683,"y":403,"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":1181,"y":381,"w":57,"h":57}, + "frame": {"x":744,"y":403,"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":937,"y":443,"w":57,"h":57}, + "frame": {"x":1169,"y":426,"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":998,"y":443,"w":57,"h":57}, + "frame": {"x":1230,"y":432,"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":1059,"y":443,"w":57,"h":57}, + "frame": {"x":1291,"y":432,"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":530,"y":399,"w":58,"h":58}, + "frame": {"x":1207,"y":303,"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":473,"y":396,"w":53,"h":63}, + "frame": {"x":565,"y":394,"w":53,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":53,"h":63}, @@ -170,7 +170,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":765,"y":103,"w":172,"h":96}, + "frame": {"x":199,"y":374,"w":172,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":172,"h":96}, @@ -178,7 +178,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1147,"y":203,"w":92,"h":96}, + "frame": {"x":629,"y":298,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":532,"y":299,"w":92,"h":96}, + "frame": {"x":725,"y":303,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -216,7 +216,7 @@ "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, "sourceSize": {"w":192,"h":96} }, -"sprites/blueprints/rotater.png": +"sprites/blueprints/rotater-ccw.png": { "frame": {"x":748,"y":203,"w":96,"h":96}, "rotated": false, @@ -224,6 +224,14 @@ "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, "sourceSize": {"w":96,"h":96} }, +"sprites/blueprints/rotater.png": +{ + "frame": {"x":848,"y":203,"w":96,"h":96}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, + "sourceSize": {"w":96,"h":96} +}, "sprites/blueprints/splitter-compact.png": { "frame": {"x":435,"y":299,"w":93,"h":93}, @@ -234,7 +242,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":1122,"y":3,"w":171,"h":96}, + "frame": {"x":765,"y":103,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -250,7 +258,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":848,"y":203,"w":96,"h":96}, + "frame": {"x":948,"y":203,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -258,7 +266,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":915,"y":303,"w":93,"h":75}, + "frame": {"x":821,"y":303,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":21,"w":93,"h":75}, @@ -266,7 +274,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":1012,"y":303,"w":93,"h":75}, + "frame": {"x":918,"y":303,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":93,"h":75}, @@ -274,7 +282,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":647,"y":397,"w":57,"h":57}, + "frame": {"x":1269,"y":303,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -282,7 +290,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1059,"y":382,"w":57,"h":57}, + "frame": {"x":1207,"y":365,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -290,7 +298,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1205,"y":303,"w":51,"h":63}, + "frame": {"x":1300,"y":3,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -298,7 +306,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":941,"y":103,"w":171,"h":96}, + "frame": {"x":940,"y":103,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -314,7 +322,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":628,"y":298,"w":91,"h":95}, + "frame": {"x":375,"y":396,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -322,7 +330,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":820,"y":303,"w":91,"h":95}, + "frame": {"x":470,"y":396,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -352,9 +360,17 @@ "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, "sourceSize": {"w":192,"h":96} }, +"sprites/buildings/rotater-ccw.png": +{ + "frame": {"x":1148,"y":203,"w":95,"h":96}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, + "sourceSize": {"w":96,"h":96} +}, "sprites/buildings/rotater.png": { - "frame": {"x":1048,"y":203,"w":95,"h":96}, + "frame": {"x":1247,"y":203,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -362,7 +378,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":723,"y":303,"w":93,"h":91}, + "frame": {"x":532,"y":299,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, @@ -370,7 +386,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":1116,"y":103,"w":171,"h":96}, + "frame": {"x":1115,"y":103,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -378,7 +394,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":199,"y":374,"w":174,"h":96}, + "frame": {"x":1122,"y":3,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -386,7 +402,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":948,"y":203,"w":96,"h":96}, + "frame": {"x":1048,"y":203,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -394,7 +410,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1109,"y":303,"w":92,"h":74}, + "frame": {"x":1015,"y":303,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":22,"w":92,"h":74}, @@ -402,7 +418,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":377,"y":396,"w":92,"h":74}, + "frame": {"x":1111,"y":303,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -410,7 +426,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1243,"y":255,"w":26,"h":32}, + "frame": {"x":897,"y":443,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -418,7 +434,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":3,"y":474,"w":26,"h":32}, + "frame": {"x":1169,"y":381,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -426,7 +442,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":915,"y":382,"w":14,"h":16}, + "frame": {"x":3,"y":474,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -434,7 +450,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":33,"y":474,"w":15,"h":15}, + "frame": {"x":565,"y":461,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":15,"h":15}, @@ -442,7 +458,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":52,"y":474,"w":15,"h":15}, + "frame": {"x":927,"y":443,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":15,"h":15}, @@ -450,7 +466,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":769,"y":398,"w":42,"h":42}, + "frame": {"x":851,"y":443,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -458,7 +474,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":769,"y":398,"w":42,"h":42}, + "frame": {"x":851,"y":443,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -466,7 +482,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":1243,"y":203,"w":42,"h":48}, + "frame": {"x":805,"y":443,"w":42,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":42,"h":48}, @@ -477,8 +493,8 @@ "version": "1.0", "image": "atlas0_50.png", "format": "RGBA8888", - "size": {"w":1296,"h":509}, + "size": {"w":1354,"h":494}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:1a28e62a074b0346c536cb875a4fbda8:3d5d3842157667ebdb6e61f7cb9abd01:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png index c532d915..731c4b47 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 d3c6024f..bcb06031 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":909,"y":678,"w":77,"h":95}, + "frame": {"x":676,"y":1089,"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":843,"y":957,"w":77,"h":95}, + "frame": {"x":903,"y":1178,"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":377,"y":1295,"w":77,"h":95}, + "frame": {"x":621,"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":561,"y":1147,"w":77,"h":95}, + "frame": {"x":702,"y":1278,"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":642,"y":1145,"w":77,"h":95}, + "frame": {"x":783,"y":1278,"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":903,"y":1146,"w":77,"h":95}, + "frame": {"x":864,"y":1277,"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":819,"y":678,"w":86,"h":86}, + "frame": {"x":737,"y":998,"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":898,"y":777,"w":86,"h":86}, + "frame": {"x":827,"y":998,"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":838,"y":867,"w":86,"h":86}, + "frame": {"x":917,"y":995,"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":843,"y":1056,"w":86,"h":86}, + "frame": {"x":413,"y":1115,"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":458,"y":1294,"w":86,"h":86}, + "frame": {"x":503,"y":1115,"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":548,"y":1294,"w":86,"h":86}, + "frame": {"x":757,"y":1088,"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":723,"y":1143,"w":86,"h":86}, + "frame": {"x":847,"y":1088,"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":813,"y":1146,"w":86,"h":86}, + "frame": {"x":543,"y":1205,"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":723,"y":1233,"w":86,"h":86}, + "frame": {"x":531,"y":1295,"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":813,"y":1236,"w":86,"h":86}, + "frame": {"x":633,"y":1188,"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":638,"y":1323,"w":86,"h":86}, + "frame": {"x":723,"y":1188,"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":728,"y":1326,"w":86,"h":86}, + "frame": {"x":813,"y":1178,"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":145,"y":1291,"w":87,"h":87}, + "frame": {"x":555,"y":998,"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":819,"y":587,"w":87,"h":87}, + "frame": {"x":646,"y":998,"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":815,"y":768,"w":79,"h":95}, + "frame": {"x":593,"y":1089,"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":847,"y":285,"w":136,"h":143}, + "frame": {"x":442,"y":851,"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":563,"y":998,"w":136,"h":143}, + "frame": {"x":727,"y":851,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -216,9 +216,17 @@ "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, "sourceSize": {"w":288,"h":144} }, +"sprites/blueprints/rotater-ccw.png": +{ + "frame": {"x":295,"y":851,"w":143,"h":144}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, + "sourceSize": {"w":144,"h":144} +}, "sprites/blueprints/rotater.png": { - "frame": {"x":416,"y":999,"w":143,"h":144}, + "frame": {"x":847,"y":299,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -226,7 +234,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":847,"y":3,"w":139,"h":138}, + "frame": {"x":268,"y":1146,"w":139,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, @@ -234,7 +242,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":295,"y":704,"w":256,"h":144}, + "frame": {"x":555,"y":441,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -250,7 +258,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":268,"y":999,"w":144,"h":144}, + "frame": {"x":847,"y":3,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -258,7 +266,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":3,"y":1291,"w":138,"h":112}, + "frame": {"x":837,"y":733,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -266,7 +274,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":555,"y":882,"w":138,"h":112}, + "frame": {"x":413,"y":999,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":138,"h":112}, @@ -274,7 +282,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":819,"y":678,"w":86,"h":86}, + "frame": {"x":737,"y":998,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -282,7 +290,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":723,"y":1143,"w":86,"h":86}, + "frame": {"x":847,"y":1088,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -290,7 +298,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":909,"y":678,"w":77,"h":95}, + "frame": {"x":676,"y":1089,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -298,7 +306,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":295,"y":852,"w":256,"h":143}, + "frame": {"x":295,"y":704,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -314,7 +322,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":703,"y":997,"w":136,"h":142}, + "frame": {"x":815,"y":447,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -322,7 +330,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":819,"y":441,"w":136,"h":142}, + "frame": {"x":867,"y":849,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -330,7 +338,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":555,"y":441,"w":260,"h":143}, + "frame": {"x":3,"y":1291,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -352,9 +360,17 @@ "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, "sourceSize": {"w":288,"h":144} }, +"sprites/buildings/rotater-ccw.png": +{ + "frame": {"x":268,"y":999,"w":141,"h":143}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, + "sourceSize": {"w":144,"h":144} +}, "sprites/buildings/rotater.png": { - "frame": {"x":416,"y":1147,"w":141,"h":143}, + "frame": {"x":582,"y":851,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -362,7 +378,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":847,"y":145,"w":139,"h":136}, + "frame": {"x":815,"y":593,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -370,7 +386,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":555,"y":735,"w":256,"h":143}, + "frame": {"x":555,"y":589,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -378,7 +394,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":555,"y":588,"w":260,"h":143}, + "frame": {"x":267,"y":1291,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -386,7 +402,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":268,"y":1147,"w":144,"h":144}, + "frame": {"x":847,"y":151,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -394,7 +410,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":697,"y":882,"w":137,"h":111}, + "frame": {"x":555,"y":736,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -402,7 +418,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":236,"y":1295,"w":137,"h":111}, + "frame": {"x":696,"y":736,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -410,7 +426,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":928,"y":867,"w":38,"h":48}, + "frame": {"x":531,"y":1385,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -418,7 +434,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":903,"y":1245,"w":38,"h":48}, + "frame": {"x":573,"y":1385,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -426,7 +442,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":561,"y":1246,"w":20,"h":24}, + "frame": {"x":955,"y":447,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -434,7 +450,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":928,"y":919,"w":22,"h":22}, + "frame": {"x":555,"y":1089,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":22,"h":22}, @@ -442,7 +458,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":903,"y":1297,"w":22,"h":22}, + "frame": {"x":945,"y":1277,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":22,"h":22}, @@ -450,7 +466,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":910,"y":587,"w":62,"h":62}, + "frame": {"x":477,"y":1205,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -458,7 +474,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":910,"y":587,"w":62,"h":62}, + "frame": {"x":477,"y":1205,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -466,7 +482,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":924,"y":957,"w":62,"h":72}, + "frame": {"x":411,"y":1205,"w":62,"h":72}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":62,"h":72}, @@ -477,8 +493,8 @@ "version": "1.0", "image": "atlas0_75.png", "format": "RGBA8888", - "size": {"w":989,"h":1415}, + "size": {"w":1006,"h":1437}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:6bbb930c45842ab25fd7b4d0666970df:8136d6133729b6b3c4b0493e3ec8693f:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:1a28e62a074b0346c536cb875a4fbda8:3d5d3842157667ebdb6e61f7cb9abd01:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png index bd29aa1b..3f0308fd 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/rotater-ccw.png b/res_raw/sprites/blueprints/rotater-ccw.png new file mode 100644 index 00000000..2dd7e2db Binary files /dev/null and b/res_raw/sprites/blueprints/rotater-ccw.png differ diff --git a/res_raw/sprites/buildings/rotater-ccw.png b/res_raw/sprites/buildings/rotater-ccw.png new file mode 100644 index 00000000..a64caad3 Binary files /dev/null and b/res_raw/sprites/buildings/rotater-ccw.png differ diff --git a/src/js/core/config.js b/src/js/core/config.js index 620ea3c7..d61faf6b 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -47,6 +47,7 @@ export const globalConfig = { buildingSpeeds: { cutter: 1 / 4, rotater: 1 / 1, + rotaterCCW: 1 / 1, painter: 1 / 3, painterDouble: 1 / 3, mixer: 1 / 2, diff --git a/src/js/game/buildings/rotater.js b/src/js/game/buildings/rotater.js index 6c129115..ffb132f2 100644 --- a/src/js/game/buildings/rotater.js +++ b/src/js/game/buildings/rotater.js @@ -4,10 +4,13 @@ import { ItemAcceptorComponent, enumItemAcceptorItemFilter } from "../components import { ItemEjectorComponent } from "../components/item_ejector"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { MetaBuilding, defaultBuildingVariant } from "../meta_building"; import { enumHubGoalRewards } from "../tutorial_goals"; import { GameRoot } from "../root"; +/** @enum {string} */ +export const enumRotaterVariants = { ccw: "ccw" }; + export class MetaRotaterBuilding extends MetaBuilding { constructor() { super("rotater"); @@ -25,6 +28,10 @@ export class MetaRotaterBuilding extends MetaBuilding { return "#7dc6cd"; } + getAvailableVariants(root) { + return [defaultBuildingVariant, enumRotaterVariants.ccw]; + } + /** * @param {GameRoot} root */ @@ -61,4 +68,24 @@ export class MetaRotaterBuilding extends MetaBuilding { }) ); } + + /** + * + * @param {Entity} entity + * @param {string} variant + */ + updateVariant(entity, variant) { + switch (variant) { + case defaultBuildingVariant: { + entity.components.ItemProcessor.type = enumItemProcessorTypes.rotater; + break; + } + case enumRotaterVariants.ccw: { + entity.components.ItemProcessor.type = enumItemProcessorTypes.rotaterCCW; + break; + } + default: + assertAlways(false, "Unknown rotater variant: " + variant); + } + } } diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 296ee84a..8a4d7ae9 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -9,6 +9,7 @@ export const enumItemProcessorTypes = { splitter: "splitter", cutter: "cutter", rotater: "rotater", + rotaterCCW: "rotaterCCW", stacker: "stacker", trash: "trash", mixer: "mixer", diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 0b250591..c15110f9 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -384,6 +384,7 @@ export class HubGoals extends BasicSerializableObject { return globalConfig.beltSpeedItemsPerSecond * this.upgradeImprovements.belt * 2; case enumItemProcessorTypes.cutter: case enumItemProcessorTypes.rotater: + case enumItemProcessorTypes.rotaterCCW: case enumItemProcessorTypes.stacker: case enumItemProcessorTypes.mixer: case enumItemProcessorTypes.painter: diff --git a/src/js/game/shape_definition.js b/src/js/game/shape_definition.js index bce1a18b..1ad0d06b 100644 --- a/src/js/game/shape_definition.js +++ b/src/js/game/shape_definition.js @@ -393,6 +393,20 @@ export class ShapeDefinition extends BasicSerializableObject { return new ShapeDefinition({ layers: newLayers }); } + /** + * Returns a definition which was rotated counter clockwise + * @returns {ShapeDefinition} + */ + cloneRotateCCW() { + const newLayers = this.internalCloneLayers(); + for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { + const quadrants = newLayers[layerIndex]; + quadrants.push(quadrants[0]); + quadrants.shift(); + } + return new ShapeDefinition({ layers: newLayers }); + } + /** * Stacks the given shape definition on top. * @param {ShapeDefinition} definition diff --git a/src/js/game/shape_definition_manager.js b/src/js/game/shape_definition_manager.js index a1bb549f..9515a08c 100644 --- a/src/js/game/shape_definition_manager.js +++ b/src/js/game/shape_definition_manager.js @@ -75,7 +75,7 @@ export class ShapeDefinitionManager extends BasicSerializableObject { * @returns {ShapeDefinition} */ shapeActionRotateCW(definition) { - const key = "rotate:" + definition.getHash(); + const key = "rotate-cw:" + definition.getHash(); if (this.operationCache[key]) { return /** @type {ShapeDefinition} */ (this.operationCache[key]); } @@ -87,6 +87,24 @@ export class ShapeDefinitionManager extends BasicSerializableObject { )); } + /** + * Generates a definition for rotating a shape counter clockwise + * @param {ShapeDefinition} definition + * @returns {ShapeDefinition} + */ + shapeActionRotateCCW(definition) { + const key = "rotate-ccw:" + definition.getHash(); + if (this.operationCache[key]) { + return /** @type {ShapeDefinition} */ (this.operationCache[key]); + } + + const rotated = definition.cloneRotateCCW(); + + return /** @type {ShapeDefinition} */ (this.operationCache[key] = this.registerOrReturnHandle( + rotated + )); + } + /** * Generates a definition for stacking the upper definition onto the lower one * @param {ShapeDefinition} lowerDefinition diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index c53a0f11..24a5b5a7 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -175,7 +175,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { // ROTATER case enumItemProcessorTypes.rotater: { const inputItem = /** @type {ShapeItem} */ (items[0].item); - assert(inputItem instanceof ShapeItem, "Input for cut is not a shape"); + assert(inputItem instanceof ShapeItem, "Input for rotation is not a shape"); const inputDefinition = inputItem.definition; const rotatedDefinition = this.root.shapeDefinitionMgr.shapeActionRotateCW(inputDefinition); @@ -185,6 +185,19 @@ export class ItemProcessorSystem extends GameSystemWithFilter { break; } + // ROTATER ( CCW) + case enumItemProcessorTypes.rotaterCCW: { + const inputItem = /** @type {ShapeItem} */ (items[0].item); + assert(inputItem instanceof ShapeItem, "Input for rotation is not a shape"); + const inputDefinition = inputItem.definition; + + const rotatedDefinition = this.root.shapeDefinitionMgr.shapeActionRotateCCW(inputDefinition); + outItems.push({ + item: new ShapeItem(rotatedDefinition), + }); + break; + } + // STACKER case enumItemProcessorTypes.stacker: { diff --git a/src/js/game/systems/miner.js b/src/js/game/systems/miner.js index dcf1c7bd..4fb91e64 100644 --- a/src/js/game/systems/miner.js +++ b/src/js/game/systems/miner.js @@ -3,7 +3,6 @@ import { DrawParameters } from "../../core/draw_parameters"; import { MinerComponent } from "../components/miner"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { MapChunkView } from "../map_chunk_view"; -import { ShapeItem } from "../items/shape_item"; import { enumDirectionToVector } from "../../core/vector"; import { Entity } from "../entity"; import { BaseItem } from "../base_item"; @@ -20,7 +19,6 @@ export class MinerSystem extends GameSystemWithFilter { const minerComp = entity.components.Miner; const staticComp = entity.components.StaticMapEntity; - const ejectComp = entity.components.ItemEjector; // First, try to get rid of chained items if (minerComp.itemChainBuffer.length > 0) {