diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index 40385b9a..fdf7c08e 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":288,"y":3,"w":13,"h":13}, + "frame": {"x":49,"y":244,"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":288,"y":20,"w":13,"h":13}, + "frame": {"x":49,"y":261,"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":114,"y":95,"w":13,"h":13}, + "frame": {"x":112,"y":248,"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":131,"y":95,"w":13,"h":13}, + "frame": {"x":112,"y":265,"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":148,"y":95,"w":13,"h":13}, + "frame": {"x":112,"y":282,"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":165,"y":92,"w":13,"h":13}, + "frame": {"x":49,"y":278,"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":182,"y":92,"w":13,"h":13}, + "frame": {"x":112,"y":299,"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":199,"y":92,"w":13,"h":13}, + "frame": {"x":49,"y":295,"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":216,"y":92,"w":13,"h":13}, + "frame": {"x":49,"y":312,"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":233,"y":92,"w":13,"h":13}, + "frame": {"x":3,"y":350,"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":250,"y":92,"w":13,"h":13}, + "frame": {"x":20,"y":350,"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":267,"y":92,"w":13,"h":13}, + "frame": {"x":37,"y":350,"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":284,"y":92,"w":13,"h":13}, + "frame": {"x":49,"y":329,"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":165,"y":109,"w":13,"h":13}, + "frame": {"x":54,"y":346,"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":182,"y":109,"w":13,"h":13}, + "frame": {"x":66,"y":316,"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":199,"y":109,"w":13,"h":13}, + "frame": {"x":71,"y":333,"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":216,"y":109,"w":13,"h":13}, + "frame": {"x":83,"y":316,"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":233,"y":109,"w":13,"h":13}, + "frame": {"x":71,"y":350,"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":250,"y":109,"w":13,"h":13}, + "frame": {"x":100,"y":316,"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":267,"y":109,"w":13,"h":13}, + "frame": {"x":88,"y":333,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -162,15 +162,23 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":284,"y":109,"w":13,"h":13}, + "frame": {"x":88,"y":350,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, "sourceSize": {"w":13,"h":13} }, +"sprites/blueprints/cutter-quad.png": +{ + "frame": {"x":3,"y":49,"w":76,"h":19}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":0,"w":76,"h":19}, + "sourceSize": {"w":77,"h":19} +}, "sprites/blueprints/cutter.png": { - "frame": {"x":206,"y":26,"w":36,"h":19}, + "frame": {"x":81,"y":202,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -178,7 +186,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":124,"y":49,"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}, @@ -186,7 +194,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":147,"y":49,"w":19,"h":19}, + "frame": {"x":43,"y":198,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -194,7 +202,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":124,"y":26,"w":37,"h":19}, + "frame": {"x":82,"y":133,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -202,15 +210,23 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":3,"y":83,"w":38,"h":38}, + "frame": {"x":84,"y":3,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, "sourceSize": {"w":38,"h":38} }, +"sprites/blueprints/painter-quad.png": +{ + "frame": {"x":3,"y":3,"w":77,"h":19}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":77,"h":19}, + "sourceSize": {"w":77,"h":19} +}, "sprites/blueprints/painter.png": { - "frame": {"x":82,"y":45,"w":38,"h":19}, + "frame": {"x":83,"y":87,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -218,7 +234,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":170,"y":49,"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}, @@ -226,7 +242,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":193,"y":49,"w":19,"h":19}, + "frame": {"x":106,"y":225,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -234,7 +250,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":216,"y":49,"w":19,"h":19}, + "frame": {"x":3,"y":244,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -242,7 +258,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":248,"y":3,"w":36,"h":19}, + "frame": {"x":3,"y":198,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -250,7 +266,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":166,"y":3,"w":37,"h":19}, + "frame": {"x":82,"y":156,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -258,7 +274,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":239,"y":49,"w":19,"h":19}, + "frame": {"x":26,"y":244,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -266,7 +282,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":45,"y":106,"w":19,"h":18}, + "frame": {"x":66,"y":294,"w":19,"h":18}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":19,"h":18}, @@ -274,7 +290,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":164,"y":72,"w":19,"h":16}, + "frame": {"x":3,"y":290,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -282,7 +298,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":187,"y":72,"w":19,"h":16}, + "frame": {"x":26,"y":290,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -290,7 +306,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":210,"y":72,"w":19,"h":16}, + "frame": {"x":3,"y":310,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -298,7 +314,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":182,"y":92,"w":13,"h":13}, + "frame": {"x":112,"y":299,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -306,7 +322,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":284,"y":92,"w":13,"h":13}, + "frame": {"x":49,"y":329,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -314,15 +330,23 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":288,"y":3,"w":13,"h":13}, + "frame": {"x":49,"y":244,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, "sourceSize": {"w":13,"h":13} }, +"sprites/buildings/cutter-quad.png": +{ + "frame": {"x":3,"y":72,"w":76,"h":19}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":0,"w":76,"h":19}, + "sourceSize": {"w":77,"h":19} +}, "sprites/buildings/cutter.png": { - "frame": {"x":246,"y":26,"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}, @@ -330,7 +354,7 @@ }, "sprites/buildings/hub.png": { - "frame": {"x":3,"y":3,"w":75,"h":76}, + "frame": {"x":3,"y":95,"w":75,"h":76}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":75,"h":76}, @@ -338,7 +362,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":262,"y":49,"w":19,"h":19}, + "frame": {"x":66,"y":248,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -346,7 +370,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":285,"y":49,"w":19,"h":19}, + "frame": {"x":89,"y":248,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -354,7 +378,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":165,"y":26,"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}, @@ -362,15 +386,23 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":82,"y":3,"w":38,"h":38}, + "frame": {"x":84,"y":45,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, "sourceSize": {"w":38,"h":38} }, +"sprites/buildings/painter-quad.png": +{ + "frame": {"x":3,"y":26,"w":77,"h":19}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":77,"h":19}, + "sourceSize": {"w":77,"h":19} +}, "sprites/buildings/painter.png": { - "frame": {"x":124,"y":3,"w":38,"h":19}, + "frame": {"x":82,"y":110,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -378,7 +410,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":85,"y":68,"w":19,"h":19}, + "frame": {"x":66,"y":271,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -386,7 +418,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":91,"y":105,"w":19,"h":19}, + "frame": {"x":89,"y":271,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -394,7 +426,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":118,"y":72,"w":19,"h":19}, + "frame": {"x":3,"y":267,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -402,7 +434,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":45,"y":83,"w":36,"h":19}, + "frame": {"x":66,"y":225,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -410,7 +442,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":207,"y":3,"w":37,"h":19}, + "frame": {"x":81,"y":179,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -418,7 +450,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":141,"y":72,"w":19,"h":19}, + "frame": {"x":26,"y":267,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -426,7 +458,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":68,"y":106,"w":19,"h":18}, + "frame": {"x":89,"y":294,"w":19,"h":18}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":19,"h":18}, @@ -434,7 +466,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":233,"y":72,"w":19,"h":16}, + "frame": {"x":26,"y":310,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -442,7 +474,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":256,"y":72,"w":19,"h":16}, + "frame": {"x":3,"y":330,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -450,7 +482,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":279,"y":72,"w":19,"h":16}, + "frame": {"x":26,"y":330,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -458,7 +490,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":108,"y":68,"w":6,"h":6}, + "frame": {"x":66,"y":203,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -466,7 +498,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":108,"y":78,"w":6,"h":6}, + "frame": {"x":66,"y":213,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -474,7 +506,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":301,"y":92,"w":3,"h":3}, + "frame": {"x":122,"y":179,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -482,7 +514,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":301,"y":99,"w":3,"h":3}, + "frame": {"x":122,"y":186,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -490,7 +522,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":301,"y":106,"w":3,"h":3}, + "frame": {"x":122,"y":193,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -498,7 +530,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":85,"y":91,"w":10,"h":10}, + "frame": {"x":67,"y":175,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -506,7 +538,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":85,"y":91,"w":10,"h":10}, + "frame": {"x":67,"y":175,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -514,7 +546,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":99,"y":91,"w":10,"h":10}, + "frame": {"x":67,"y":189,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -525,8 +557,8 @@ "version": "1.0", "image": "atlas0_10.png", "format": "RGBA8888", - "size": {"w":307,"h":127}, + "size": {"w":128,"h":366}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:d8c7b55d4cea17126736a1070d617b0f:b7b7ecf41e0ce11453aef2472705bd1b:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:b6388644ac6868505c1c5a8724c498f7:ae727148497723e17b69d254af35c43d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png index 818e7a6d..1d5c37a1 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 8824d0d2..bdf8367a 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":2072,"y":786,"w":100,"h":126}, + "frame": {"x":538,"y":3073,"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":2374,"y":349,"w":100,"h":126}, + "frame": {"x":916,"y":2097,"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":2389,"y":479,"w":100,"h":126}, + "frame": {"x":916,"y":2227,"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":2176,"y":786,"w":100,"h":126}, + "frame": {"x":916,"y":2357,"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":2493,"y":474,"w":100,"h":126}, + "frame": {"x":916,"y":2487,"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":2493,"y":604,"w":100,"h":126}, + "frame": {"x":916,"y":2617,"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":2103,"y":669,"w":113,"h":113}, + "frame": {"x":853,"y":589,"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":2220,"y":651,"w":113,"h":113}, + "frame": {"x":853,"y":1374,"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":2529,"y":240,"w":113,"h":113}, + "frame": {"x":734,"y":3038,"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":2478,"y":357,"w":113,"h":113}, + "frame": {"x":538,"y":3203,"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":2595,"y":357,"w":113,"h":113}, + "frame": {"x":735,"y":2097,"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":2597,"y":474,"w":113,"h":113}, + "frame": {"x":734,"y":2214,"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":2597,"y":591,"w":113,"h":113}, + "frame": {"x":734,"y":2331,"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":2597,"y":708,"w":113,"h":113}, + "frame": {"x":770,"y":2448,"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":2337,"y":651,"w":113,"h":113}, + "frame": {"x":770,"y":2565,"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":2280,"y":768,"w":113,"h":113}, + "frame": {"x":655,"y":3155,"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":2397,"y":768,"w":113,"h":113}, + "frame": {"x":772,"y":3168,"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":2514,"y":825,"w":113,"h":113}, + "frame": {"x":889,"y":3168,"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":2560,"y":122,"w":114,"h":114}, + "frame": {"x":735,"y":1374,"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":2560,"y":3,"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,15 +162,23 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":2423,"y":197,"w":102,"h":126}, + "frame": {"x":851,"y":3038,"w":102,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":0,"w":102,"h":126}, "sourceSize": {"w":126,"h":126} }, +"sprites/blueprints/cutter-quad.png": +{ + "frame": {"x":3,"y":1129,"w":730,"h":191}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":23,"y":0,"w":730,"h":191}, + "sourceSize": {"w":768,"h":192} +}, "sprites/blueprints/cutter.png": { - "frame": {"x":391,"y":737,"w":341,"h":191}, + "frame": {"x":391,"y":1518,"w":341,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":341,"h":191}, @@ -178,7 +186,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1650,"y":587,"w":182,"h":190}, + "frame": {"x":352,"y":3073,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -186,7 +194,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1817,"y":393,"w":182,"h":190}, + "frame": {"x":584,"y":2490,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -194,7 +202,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":1123,"y":388,"w":347,"h":191}, + "frame": {"x":3,"y":2680,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -202,15 +210,23 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":735,"y":3,"w":384,"h":382}, + "frame": {"x":3,"y":1518,"w":384,"h":382}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":382}, "sourceSize": {"w":384,"h":384} }, +"sprites/blueprints/painter-quad.png": +{ + "frame": {"x":3,"y":737,"w":746,"h":192}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":7,"y":0,"w":746,"h":192}, + "sourceSize": {"w":768,"h":192} +}, "sprites/blueprints/painter.png": { - "frame": {"x":3,"y":737,"w":384,"h":192}, + "frame": {"x":3,"y":2289,"w":384,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":192}, @@ -218,7 +234,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":932,"y":778,"w":189,"h":191}, + "frame": {"x":735,"y":394,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -226,7 +242,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":1125,"y":778,"w":189,"h":191}, + "frame": {"x":391,"y":2490,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -234,7 +250,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1461,"y":587,"w":185,"h":182}, + "frame": {"x":545,"y":2877,"w":185,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":4,"w":185,"h":182}, @@ -242,7 +258,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":1511,"y":198,"w":340,"h":191}, + "frame": {"x":391,"y":1907,"w":340,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":340,"h":191}, @@ -250,7 +266,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":1511,"y":3,"w":347,"h":191}, + "frame": {"x":3,"y":2875,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -258,7 +274,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":1318,"y":777,"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}, @@ -266,7 +282,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":1885,"y":780,"w":183,"h":166}, + "frame": {"x":734,"y":2868,"w":183,"h":166}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":26,"w":183,"h":166}, @@ -274,7 +290,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":2051,"y":197,"w":182,"h":148}, + "frame": {"x":737,"y":1222,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":44,"w":182,"h":148}, @@ -282,7 +298,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":1862,"y":197,"w":185,"h":148}, + "frame": {"x":751,"y":1070,"w":185,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":185,"h":148}, @@ -290,7 +306,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":2237,"y":197,"w":182,"h":148}, + "frame": {"x":736,"y":1492,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":148}, @@ -298,7 +314,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":2103,"y":669,"w":113,"h":113}, + "frame": {"x":853,"y":589,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -306,7 +322,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":2597,"y":591,"w":113,"h":113}, + "frame": {"x":734,"y":2331,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -314,15 +330,23 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":2072,"y":786,"w":100,"h":126}, + "frame": {"x":538,"y":3073,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, "sourceSize": {"w":126,"h":126} }, +"sprites/buildings/cutter-quad.png": +{ + "frame": {"x":3,"y":1324,"w":728,"h":190}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":24,"y":0,"w":728,"h":190}, + "sourceSize": {"w":768,"h":192} +}, "sprites/buildings/cutter.png": { - "frame": {"x":1474,"y":393,"w":339,"h":190}, + "frame": {"x":391,"y":2102,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -338,7 +362,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1514,"y":781,"w":179,"h":188}, + "frame": {"x":545,"y":2685,"w":179,"h":188}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":1,"w":179,"h":188}, @@ -346,7 +370,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1836,"y":587,"w":179,"h":189}, + "frame": {"x":753,"y":708,"w":179,"h":189}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":179,"h":189}, @@ -354,7 +378,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":1862,"y":3,"w":345,"h":190}, + "frame": {"x":3,"y":3070,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -362,15 +386,23 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":1123,"y":3,"w":384,"h":381}, + "frame": {"x":3,"y":1904,"w":384,"h":381}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":381}, "sourceSize": {"w":384,"h":384} }, +"sprites/buildings/painter-quad.png": +{ + "frame": {"x":3,"y":933,"w":744,"h":192}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":8,"y":0,"w":744,"h":192}, + "sourceSize": {"w":768,"h":192} +}, "sprites/buildings/painter.png": { - "frame": {"x":735,"y":389,"w":384,"h":191}, + "frame": {"x":3,"y":2485,"w":384,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":191}, @@ -378,7 +410,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":1079,"y":584,"w":187,"h":190}, + "frame": {"x":354,"y":2685,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -386,7 +418,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":1270,"y":583,"w":187,"h":190}, + "frame": {"x":354,"y":2879,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -394,7 +426,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1697,"y":781,"w":184,"h":180}, + "frame": {"x":728,"y":2684,"w":184,"h":180}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":5,"w":184,"h":180}, @@ -402,7 +434,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":736,"y":584,"w":339,"h":190}, + "frame": {"x":391,"y":2296,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -410,7 +442,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":2211,"y":3,"w":345,"h":190}, + "frame": {"x":391,"y":1713,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -418,7 +450,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":736,"y":778,"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}, @@ -426,7 +458,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":2003,"y":349,"w":181,"h":165}, + "frame": {"x":753,"y":901,"w":181,"h":165}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":27,"w":181,"h":165}, @@ -434,7 +466,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":2019,"y":518,"w":181,"h":147}, + "frame": {"x":740,"y":1795,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":45,"w":181,"h":147}, @@ -442,7 +474,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":2188,"y":349,"w":182,"h":147}, + "frame": {"x":740,"y":1644,"w":182,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":182,"h":147}, @@ -450,7 +482,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":2204,"y":500,"w":181,"h":147}, + "frame": {"x":735,"y":1946,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":181,"h":147}, @@ -458,7 +490,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":2366,"y":885,"w":50,"h":64}, + "frame": {"x":936,"y":806,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -466,7 +498,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":2420,"y":885,"w":50,"h":64}, + "frame": {"x":931,"y":89,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -474,7 +506,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":3,"y":933,"w":24,"h":32}, + "frame": {"x":852,"y":2097,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -482,7 +514,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":2678,"y":3,"w":28,"h":28}, + "frame": {"x":3,"y":3264,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":28,"h":28}, @@ -490,7 +522,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":2646,"y":240,"w":28,"h":28}, + "frame": {"x":916,"y":2747,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":28,"h":28}, @@ -498,7 +530,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":2280,"y":885,"w":82,"h":82}, + "frame": {"x":931,"y":3,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -506,7 +538,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":2280,"y":885,"w":82,"h":82}, + "frame": {"x":931,"y":3,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -514,7 +546,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":2019,"y":669,"w":80,"h":96}, + "frame": {"x":936,"y":706,"w":80,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":80,"h":96}, @@ -525,8 +557,8 @@ "version": "1.0", "image": "atlas0_100.png", "format": "RGBA8888", - "size": {"w":2713,"h":972}, + "size": {"w":1019,"h":3319}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:d8c7b55d4cea17126736a1070d617b0f:b7b7ecf41e0ce11453aef2472705bd1b:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:b6388644ac6868505c1c5a8724c498f7:ae727148497723e17b69d254af35c43d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.png b/res_built/atlas/atlas0_100.png index 7470d46d..a42d7da0 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 941b1676..949d9214 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":214,"y":628,"w":28,"h":32}, + "frame": {"x":905,"y":149,"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":214,"y":664,"w":28,"h":32}, + "frame": {"x":625,"y":205,"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":146,"y":696,"w":28,"h":32}, + "frame": {"x":691,"y":201,"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":178,"y":696,"w":28,"h":32}, + "frame": {"x":723,"y":201,"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":145,"y":732,"w":28,"h":32}, + "frame": {"x":755,"y":201,"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":177,"y":732,"w":28,"h":32}, + "frame": {"x":787,"y":201,"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":155,"y":348,"w":30,"h":30}, + "frame": {"x":191,"y":207,"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":155,"y":382,"w":30,"h":30}, + "frame": {"x":225,"y":207,"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":155,"y":416,"w":30,"h":30}, + "frame": {"x":259,"y":207,"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":155,"y":450,"w":30,"h":30}, + "frame": {"x":293,"y":207,"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":154,"y":484,"w":30,"h":30}, + "frame": {"x":327,"y":207,"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":147,"y":560,"w":30,"h":30}, + "frame": {"x":361,"y":211,"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":198,"y":514,"w":30,"h":30}, + "frame": {"x":395,"y":211,"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":181,"y":560,"w":30,"h":30}, + "frame": {"x":429,"y":211,"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":147,"y":594,"w":30,"h":30}, + "frame": {"x":463,"y":210,"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":181,"y":594,"w":30,"h":30}, + "frame": {"x":497,"y":210,"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":146,"y":628,"w":30,"h":30}, + "frame": {"x":905,"y":185,"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":146,"y":662,"w":30,"h":30}, + "frame": {"x":557,"y":206,"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":180,"y":628,"w":30,"h":30}, + "frame": {"x":591,"y":206,"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":180,"y":662,"w":30,"h":30}, + "frame": {"x":657,"y":201,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -162,15 +162,23 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":210,"y":700,"w":28,"h":32}, + "frame": {"x":819,"y":201,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, "sourceSize": {"w":32,"h":32} }, +"sprites/blueprints/cutter-quad.png": +{ + "frame": {"x":3,"y":192,"w":184,"h":48}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":5,"y":0,"w":184,"h":48}, + "sourceSize": {"w":192,"h":48} +}, "sprites/blueprints/cutter.png": { - "frame": {"x":3,"y":704,"w":87,"h":48}, + "frame": {"x":484,"y":107,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -178,7 +186,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":103,"y":452,"w":47,"h":48}, + "frame": {"x":731,"y":107,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -186,7 +194,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":96,"y":504,"w":47,"h":48}, + "frame": {"x":782,"y":107,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -194,7 +202,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":3,"y":496,"w":89,"h":48}, + "frame": {"x":483,"y":55,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -202,15 +210,23 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":3,"y":192,"w":96,"h":96}, + "frame": {"x":191,"y":107,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, "sourceSize": {"w":96,"h":96} }, +"sprites/blueprints/painter-quad.png": +{ + "frame": {"x":191,"y":3,"w":188,"h":48}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":0,"w":188,"h":48}, + "sourceSize": {"w":192,"h":48} +}, "sprites/blueprints/painter.png": { - "frame": {"x":3,"y":392,"w":96,"h":48}, + "frame": {"x":383,"y":55,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -218,7 +234,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":191,"y":3,"w":48,"h":48}, + "frame": {"x":575,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -226,7 +242,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":103,"y":348,"w":48,"h":48}, + "frame": {"x":759,"y":55,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -234,7 +250,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":95,"y":660,"w":47,"h":47}, + "frame": {"x":442,"y":159,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -242,7 +258,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":103,"y":192,"w":87,"h":48}, + "frame": {"x":763,"y":3,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -250,7 +266,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":3,"y":548,"w":89,"h":48}, + "frame": {"x":391,"y":107,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -258,7 +274,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":191,"y":55,"w":48,"h":48}, + "frame": {"x":627,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -266,7 +282,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":194,"y":211,"w":48,"h":43}, + "frame": {"x":544,"y":159,"w":48,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":48,"h":43}, @@ -274,7 +290,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":194,"y":258,"w":48,"h":38}, + "frame": {"x":647,"y":159,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -282,7 +298,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":194,"y":300,"w":48,"h":38}, + "frame": {"x":699,"y":159,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -290,7 +306,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":194,"y":342,"w":48,"h":38}, + "frame": {"x":751,"y":159,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -298,7 +314,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":155,"y":348,"w":30,"h":30}, + "frame": {"x":191,"y":207,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -306,7 +322,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":198,"y":514,"w":30,"h":30}, + "frame": {"x":395,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -314,15 +330,23 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":214,"y":628,"w":28,"h":32}, + "frame": {"x":905,"y":149,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, "sourceSize": {"w":32,"h":32} }, +"sprites/buildings/cutter-quad.png": +{ + "frame": {"x":383,"y":3,"w":184,"h":48}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":5,"y":0,"w":184,"h":48}, + "sourceSize": {"w":192,"h":48} +}, "sprites/buildings/cutter.png": { - "frame": {"x":103,"y":244,"w":87,"h":48}, + "frame": {"x":854,"y":3,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -338,7 +362,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":96,"y":556,"w":47,"h":48}, + "frame": {"x":833,"y":107,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -346,7 +370,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":95,"y":608,"w":47,"h":48}, + "frame": {"x":391,"y":159,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -354,7 +378,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":3,"y":600,"w":88,"h":48}, + "frame": {"x":671,"y":3,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -362,15 +386,23 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":3,"y":292,"w":96,"h":96}, + "frame": {"x":291,"y":107,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, "sourceSize": {"w":96,"h":96} }, +"sprites/buildings/painter-quad.png": +{ + "frame": {"x":191,"y":55,"w":188,"h":48}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":0,"w":188,"h":48}, + "sourceSize": {"w":192,"h":48} +}, "sprites/buildings/painter.png": { - "frame": {"x":3,"y":444,"w":96,"h":48}, + "frame": {"x":571,"y":3,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -378,7 +410,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":103,"y":400,"w":48,"h":48}, + "frame": {"x":811,"y":55,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -386,7 +418,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":191,"y":107,"w":48,"h":48}, + "frame": {"x":679,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -394,7 +426,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":94,"y":711,"w":47,"h":47}, + "frame": {"x":493,"y":159,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -402,7 +434,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":103,"y":296,"w":87,"h":48}, + "frame": {"x":668,"y":55,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -410,7 +442,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":3,"y":652,"w":88,"h":48}, + "frame": {"x":576,"y":55,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -418,7 +450,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":194,"y":159,"w":48,"h":48}, + "frame": {"x":863,"y":55,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -426,7 +458,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":189,"y":384,"w":47,"h":42}, + "frame": {"x":596,"y":159,"w":47,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":47,"h":42}, @@ -434,7 +466,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":189,"y":430,"w":47,"h":38}, + "frame": {"x":803,"y":159,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -442,7 +474,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":189,"y":472,"w":47,"h":38}, + "frame": {"x":884,"y":107,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -450,7 +482,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":147,"y":518,"w":47,"h":38}, + "frame": {"x":854,"y":159,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -458,7 +490,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":215,"y":574,"w":14,"h":16}, + "frame": {"x":915,"y":83,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -466,7 +498,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":215,"y":594,"w":14,"h":16}, + "frame": {"x":851,"y":201,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -474,7 +506,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":198,"y":548,"w":8,"h":8}, + "frame": {"x":933,"y":83,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -482,7 +514,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":3,"y":756,"w":8,"h":8}, + "frame": {"x":933,"y":95,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -490,7 +522,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":215,"y":614,"w":8,"h":8}, + "frame": {"x":869,"y":201,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -498,7 +530,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":215,"y":548,"w":22,"h":22}, + "frame": {"x":531,"y":219,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -506,7 +538,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":215,"y":548,"w":22,"h":22}, + "frame": {"x":531,"y":219,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -514,7 +546,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":209,"y":736,"w":22,"h":24}, + "frame": {"x":915,"y":55,"w":22,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":22,"h":24}, @@ -525,8 +557,8 @@ "version": "1.0", "image": "atlas0_25.png", "format": "RGBA8888", - "size": {"w":245,"h":767}, + "size": {"w":944,"h":244}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:d8c7b55d4cea17126736a1070d617b0f:b7b7ecf41e0ce11453aef2472705bd1b:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:b6388644ac6868505c1c5a8724c498f7:ae727148497723e17b69d254af35c43d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png index 27389e32..102b8992 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 9c675571..c7a394ac 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":1178,"y":347,"w":51,"h":63}, + "frame": {"x":456,"y":1198,"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":1178,"y":414,"w":51,"h":63}, + "frame": {"x":454,"y":1265,"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":1233,"y":322,"w":51,"h":63}, + "frame": {"x":456,"y":1637,"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":1233,"y":389,"w":51,"h":63}, + "frame": {"x":3,"y":1631,"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":1288,"y":370,"w":51,"h":63}, + "frame": {"x":58,"y":1631,"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":1343,"y":370,"w":51,"h":63}, + "frame": {"x":113,"y":1631,"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":1292,"y":65,"w":57,"h":57}, + "frame": {"x":452,"y":1332,"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":1353,"y":65,"w":57,"h":57}, + "frame": {"x":452,"y":1393,"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":1291,"y":126,"w":57,"h":57}, + "frame": {"x":432,"y":1454,"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":1352,"y":126,"w":57,"h":57}, + "frame": {"x":370,"y":1493,"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":1291,"y":187,"w":57,"h":57}, + "frame": {"x":431,"y":1515,"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":1230,"y":200,"w":57,"h":57}, + "frame": {"x":369,"y":1554,"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":1352,"y":187,"w":57,"h":57}, + "frame": {"x":430,"y":1576,"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":1291,"y":248,"w":57,"h":57}, + "frame": {"x":273,"y":1608,"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":1352,"y":248,"w":57,"h":57}, + "frame": {"x":334,"y":1615,"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":1200,"y":261,"w":57,"h":57}, + "frame": {"x":395,"y":1637,"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":1288,"y":309,"w":57,"h":57}, + "frame": {"x":3,"y":1570,"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":1349,"y":309,"w":57,"h":57}, + "frame": {"x":64,"y":1570,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -146,7 +146,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":1292,"y":3,"w":58,"h":58}, + "frame": {"x":296,"y":774,"w":58,"h":58}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":58,"h":58}, @@ -154,7 +154,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":1354,"y":3,"w":58,"h":58}, + "frame": {"x":370,"y":1431,"w":58,"h":58}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":58,"h":58}, @@ -162,15 +162,23 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":1140,"y":280,"w":53,"h":63}, + "frame": {"x":456,"y":1131,"w":53,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":53,"h":63}, "sourceSize": {"w":63,"h":63} }, +"sprites/blueprints/cutter-quad.png": +{ + "frame": {"x":3,"y":574,"w":366,"h":96}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":11,"y":0,"w":366,"h":96}, + "sourceSize": {"w":384,"h":96} +}, "sprites/blueprints/cutter.png": { - "frame": {"x":747,"y":3,"w":172,"h":96}, + "frame": {"x":278,"y":1231,"w":172,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":172,"h":96}, @@ -178,7 +186,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":985,"y":382,"w":92,"h":96}, + "frame": {"x":182,"y":1115,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -186,7 +194,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1044,"y":281,"w":92,"h":96}, + "frame": {"x":182,"y":1215,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -194,7 +202,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":373,"y":199,"w":175,"h":96}, + "frame": {"x":3,"y":1070,"w":175,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":175,"h":96}, @@ -202,15 +210,23 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":373,"y":3,"w":192,"h":192}, + "frame": {"x":3,"y":774,"w":192,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":192}, "sourceSize": {"w":192,"h":192} }, +"sprites/blueprints/painter-quad.png": +{ + "frame": {"x":3,"y":3,"w":374,"h":96}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":3,"y":0,"w":374,"h":96}, + "sourceSize": {"w":384,"h":96} +}, "sprites/blueprints/painter.png": { - "frame": {"x":3,"y":374,"w":192,"h":96}, + "frame": {"x":3,"y":970,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -218,7 +234,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":906,"y":182,"w":96,"h":96}, + "frame": {"x":381,"y":3,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -226,7 +242,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":785,"y":382,"w":96,"h":96}, + "frame": {"x":381,"y":103,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -234,7 +250,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1081,"y":381,"w":93,"h":93}, + "frame": {"x":373,"y":682,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":1,"w":93,"h":93}, @@ -242,7 +258,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":731,"y":182,"w":171,"h":96}, + "frame": {"x":3,"y":1370,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -250,7 +266,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":552,"y":199,"w":175,"h":96}, + "frame": {"x":3,"y":1170,"w":175,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":175,"h":96}, @@ -258,7 +274,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":885,"y":382,"w":96,"h":96}, + "frame": {"x":373,"y":203,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -266,7 +282,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":688,"y":399,"w":93,"h":84}, + "frame": {"x":199,"y":869,"w":93,"h":84}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":12,"w":93,"h":84}, @@ -274,7 +290,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":763,"y":103,"w":93,"h":75}, + "frame": {"x":199,"y":957,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":21,"w":93,"h":75}, @@ -282,7 +298,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":665,"y":103,"w":94,"h":75}, + "frame": {"x":373,"y":603,"w":94,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":94,"h":75}, @@ -290,7 +306,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":860,"y":103,"w":93,"h":75}, + "frame": {"x":199,"y":1036,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":93,"h":75}, @@ -298,7 +314,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":1292,"y":65,"w":57,"h":57}, + "frame": {"x":452,"y":1332,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -306,7 +322,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1352,"y":187,"w":57,"h":57}, + "frame": {"x":430,"y":1576,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -314,15 +330,23 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1178,"y":347,"w":51,"h":63}, + "frame": {"x":456,"y":1198,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, "sourceSize": {"w":63,"h":63} }, +"sprites/buildings/cutter-quad.png": +{ + "frame": {"x":3,"y":674,"w":366,"h":96}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":11,"y":0,"w":366,"h":96}, + "sourceSize": {"w":384,"h":96} +}, "sprites/buildings/cutter.png": { - "frame": {"x":923,"y":3,"w":171,"h":96}, + "frame": {"x":277,"y":1331,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -330,7 +354,7 @@ }, "sprites/buildings/hub.png": { - "frame": {"x":3,"y":3,"w":366,"h":367}, + "frame": {"x":3,"y":203,"w":366,"h":367}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":10,"w":366,"h":367}, @@ -338,7 +362,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1105,"y":181,"w":91,"h":95}, + "frame": {"x":274,"y":1509,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -346,7 +370,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1197,"y":3,"w":91,"h":95}, + "frame": {"x":178,"y":1558,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -354,7 +378,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":591,"y":299,"w":174,"h":96}, + "frame": {"x":278,"y":1131,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -362,15 +386,23 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":395,"y":299,"w":192,"h":191}, + "frame": {"x":296,"y":836,"w":192,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":191}, "sourceSize": {"w":192,"h":192} }, +"sprites/buildings/painter-quad.png": +{ + "frame": {"x":3,"y":103,"w":374,"h":96}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":3,"y":0,"w":374,"h":96}, + "sourceSize": {"w":384,"h":96} +}, "sprites/buildings/painter.png": { - "frame": {"x":199,"y":374,"w":192,"h":96}, + "frame": {"x":296,"y":1031,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -378,7 +410,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":1006,"y":181,"w":95,"h":96}, + "frame": {"x":373,"y":403,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -386,7 +418,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":1098,"y":3,"w":95,"h":96}, + "frame": {"x":373,"y":503,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -394,7 +426,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":591,"y":399,"w":93,"h":91}, + "frame": {"x":199,"y":774,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, @@ -402,7 +434,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":769,"y":282,"w":171,"h":96}, + "frame": {"x":3,"y":1470,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -410,7 +442,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":569,"y":3,"w":174,"h":96}, + "frame": {"x":3,"y":1270,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -418,7 +450,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":944,"y":282,"w":96,"h":96}, + "frame": {"x":373,"y":303,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -426,7 +458,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":569,"y":103,"w":92,"h":83}, + "frame": {"x":181,"y":1315,"w":92,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":13,"w":92,"h":83}, @@ -434,7 +466,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":957,"y":103,"w":92,"h":74}, + "frame": {"x":178,"y":1402,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":22,"w":92,"h":74}, @@ -442,7 +474,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1053,"y":103,"w":92,"h":74}, + "frame": {"x":274,"y":1431,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -450,7 +482,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1149,"y":103,"w":92,"h":74}, + "frame": {"x":178,"y":1480,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -458,7 +490,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1200,"y":181,"w":26,"h":32}, + "frame": {"x":481,"y":3,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -466,7 +498,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":1200,"y":217,"w":26,"h":32}, + "frame": {"x":481,"y":39,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -474,7 +506,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":3,"y":474,"w":14,"h":16}, + "frame": {"x":481,"y":113,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -482,7 +514,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":21,"y":474,"w":15,"h":15}, + "frame": {"x":481,"y":75,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":15,"h":15}, @@ -490,7 +522,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":40,"y":474,"w":15,"h":15}, + "frame": {"x":481,"y":94,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":15,"h":15}, @@ -498,7 +530,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":1245,"y":154,"w":42,"h":42}, + "frame": {"x":404,"y":779,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -506,7 +538,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":1245,"y":154,"w":42,"h":42}, + "frame": {"x":404,"y":779,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -514,7 +546,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":1245,"y":102,"w":42,"h":48}, + "frame": {"x":358,"y":779,"w":42,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":42,"h":48}, @@ -525,8 +557,8 @@ "version": "1.0", "image": "atlas0_50.png", "format": "RGBA8888", - "size": {"w":1415,"h":493}, + "size": {"w":512,"h":1703}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:d8c7b55d4cea17126736a1070d617b0f:b7b7ecf41e0ce11453aef2472705bd1b:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:b6388644ac6868505c1c5a8724c498f7:ae727148497723e17b69d254af35c43d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png index 031b102a..8aa0e29a 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 5beb71b6..fb92ebfb 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":701,"y":982,"w":77,"h":95}, + "frame": {"x":429,"y":1729,"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":702,"y":1081,"w":77,"h":95}, + "frame": {"x":510,"y":1729,"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":702,"y":1180,"w":77,"h":95}, + "frame": {"x":591,"y":1729,"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":647,"y":1402,"w":77,"h":95}, + "frame": {"x":853,"y":1748,"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":701,"y":1286,"w":77,"h":95}, + "frame": {"x":713,"y":1847,"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":728,"y":1385,"w":77,"h":95}, + "frame": {"x":794,"y":1847,"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":251,"y":1443,"w":86,"h":86}, + "frame": {"x":859,"y":185,"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":557,"y":1402,"w":86,"h":86}, + "frame": {"x":859,"y":275,"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":782,"y":1279,"w":86,"h":86}, + "frame": {"x":859,"y":365,"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":809,"y":1369,"w":86,"h":86}, + "frame": {"x":859,"y":455,"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":872,"y":915,"w":86,"h":86}, + "frame": {"x":859,"y":545,"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":782,"y":934,"w":86,"h":86}, + "frame": {"x":847,"y":635,"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":783,"y":1024,"w":86,"h":86}, + "frame": {"x":847,"y":725,"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":783,"y":1114,"w":86,"h":86}, + "frame": {"x":847,"y":815,"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":873,"y":1005,"w":86,"h":86}, + "frame": {"x":410,"y":1441,"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":873,"y":1095,"w":86,"h":86}, + "frame": {"x":150,"y":1442,"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":873,"y":1185,"w":86,"h":86}, + "frame": {"x":150,"y":1532,"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":872,"y":1275,"w":86,"h":86}, + "frame": {"x":854,"y":1559,"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":3,"y":1438,"w":87,"h":87}, + "frame": {"x":859,"y":3,"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":94,"y":1438,"w":87,"h":87}, + "frame": {"x":859,"y":94,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":87,"h":87}, @@ -162,15 +162,23 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":698,"y":883,"w":79,"h":95}, + "frame": {"x":854,"y":1649,"w":79,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":79,"h":95}, "sourceSize": {"w":95,"h":95} }, +"sprites/blueprints/cutter-quad.png": +{ + "frame": {"x":3,"y":852,"w":548,"h":144}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":17,"y":0,"w":548,"h":144}, + "sourceSize": {"w":576,"h":144} +}, "sprites/blueprints/cutter.png": { - "frame": {"x":295,"y":556,"w":256,"h":144}, + "frame": {"x":531,"y":1176,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -178,7 +186,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":416,"y":999,"w":136,"h":143}, + "frame": {"x":148,"y":1622,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -186,7 +194,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":848,"y":476,"w":136,"h":143}, + "frame": {"x":288,"y":1589,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -194,7 +202,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":3,"y":995,"w":261,"h":144}, + "frame": {"x":555,"y":880,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -202,15 +210,23 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":3,"y":556,"w":288,"h":287}, + "frame": {"x":567,"y":3,"w":288,"h":287}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":287}, "sourceSize": {"w":288,"h":288} }, +"sprites/blueprints/painter-quad.png": +{ + "frame": {"x":3,"y":3,"w":560,"h":144}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":5,"y":0,"w":560,"h":144}, + "sourceSize": {"w":576,"h":144} +}, "sprites/blueprints/painter.png": { - "frame": {"x":3,"y":847,"w":288,"h":144}, + "frame": {"x":555,"y":584,"w":288,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, @@ -218,7 +234,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":268,"y":1147,"w":143,"h":144}, + "frame": {"x":263,"y":1441,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -226,7 +242,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":267,"y":1295,"w":143,"h":144}, + "frame": {"x":3,"y":1442,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -234,7 +250,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":416,"y":1146,"w":139,"h":138}, + "frame": {"x":568,"y":1471,"w":139,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, @@ -242,7 +258,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":295,"y":704,"w":256,"h":144}, + "frame": {"x":3,"y":1294,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -250,7 +266,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":3,"y":1143,"w":261,"h":144}, + "frame": {"x":555,"y":1028,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -258,7 +274,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":555,"y":735,"w":144,"h":144}, + "frame": {"x":791,"y":1263,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -266,7 +282,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":415,"y":1288,"w":138,"h":125}, + "frame": {"x":711,"y":1699,"w":138,"h":125}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":19,"w":138,"h":125}, @@ -274,7 +290,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":414,"y":1417,"w":138,"h":112}, + "frame": {"x":429,"y":1828,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -282,7 +298,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":555,"y":883,"w":139,"h":112}, + "frame": {"x":568,"y":1613,"w":139,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":139,"h":112}, @@ -290,7 +306,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":559,"y":1286,"w":138,"h":112}, + "frame": {"x":571,"y":1828,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":138,"h":112}, @@ -298,7 +314,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":251,"y":1443,"w":86,"h":86}, + "frame": {"x":859,"y":185,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -306,7 +322,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":783,"y":1024,"w":86,"h":86}, + "frame": {"x":847,"y":725,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -314,15 +330,23 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":701,"y":982,"w":77,"h":95}, + "frame": {"x":429,"y":1729,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, "sourceSize": {"w":95,"h":95} }, +"sprites/buildings/cutter-quad.png": +{ + "frame": {"x":3,"y":1000,"w":548,"h":143}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":17,"y":0,"w":548,"h":143}, + "sourceSize": {"w":576,"h":144} +}, "sprites/buildings/cutter.png": { - "frame": {"x":555,"y":588,"w":256,"h":143}, + "frame": {"x":263,"y":1294,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -330,7 +354,7 @@ }, "sprites/buildings/hub.png": { - "frame": {"x":3,"y":3,"w":548,"h":549}, + "frame": {"x":3,"y":299,"w":548,"h":549}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":16,"w":548,"h":549}, @@ -338,7 +362,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":848,"y":623,"w":136,"h":142}, + "frame": {"x":289,"y":1736,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -346,7 +370,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":848,"y":769,"w":136,"h":142}, + "frame": {"x":428,"y":1559,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -354,7 +378,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":3,"y":1291,"w":260,"h":143}, + "frame": {"x":3,"y":1147,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -362,15 +386,23 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":555,"y":3,"w":288,"h":286}, + "frame": {"x":567,"y":294,"w":288,"h":286}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":286}, "sourceSize": {"w":288,"h":288} }, +"sprites/buildings/painter-quad.png": +{ + "frame": {"x":3,"y":151,"w":560,"h":144}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":5,"y":0,"w":560,"h":144}, + "sourceSize": {"w":576,"h":144} +}, "sprites/buildings/painter.png": { - "frame": {"x":555,"y":293,"w":288,"h":144}, + "frame": {"x":555,"y":732,"w":288,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, @@ -378,7 +410,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":556,"y":999,"w":141,"h":143}, + "frame": {"x":3,"y":1590,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -386,7 +418,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":703,"y":735,"w":141,"h":143}, + "frame": {"x":3,"y":1737,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -394,7 +426,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":559,"y":1146,"w":139,"h":136}, + "frame": {"x":711,"y":1559,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -402,7 +434,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":295,"y":852,"w":256,"h":143}, + "frame": {"x":523,"y":1324,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -410,7 +442,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":555,"y":441,"w":260,"h":143}, + "frame": {"x":267,"y":1147,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -418,7 +450,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":268,"y":999,"w":144,"h":144}, + "frame": {"x":783,"y":1411,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -426,7 +458,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":847,"y":3,"w":137,"h":124}, + "frame": {"x":820,"y":905,"w":137,"h":124}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":20,"w":137,"h":124}, @@ -434,7 +466,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":847,"y":131,"w":137,"h":111}, + "frame": {"x":820,"y":1033,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -442,7 +474,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":847,"y":246,"w":137,"h":111}, + "frame": {"x":820,"y":1148,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -450,7 +482,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":847,"y":361,"w":137,"h":111}, + "frame": {"x":148,"y":1769,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -458,7 +490,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":781,"y":882,"w":38,"h":48}, + "frame": {"x":69,"y":1884,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -466,7 +498,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":783,"y":1204,"w":38,"h":48}, + "frame": {"x":111,"y":1884,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -474,7 +506,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":819,"y":441,"w":20,"h":24}, + "frame": {"x":937,"y":635,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -482,7 +514,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":962,"y":915,"w":22,"h":22}, + "frame": {"x":791,"y":1176,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":22,"h":22}, @@ -490,7 +522,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":962,"y":941,"w":22,"h":22}, + "frame": {"x":791,"y":1202,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":22,"h":22}, @@ -498,7 +530,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":341,"y":1443,"w":62,"h":62}, + "frame": {"x":3,"y":1884,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -506,7 +538,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":341,"y":1443,"w":62,"h":62}, + "frame": {"x":3,"y":1884,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -514,7 +546,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":185,"y":1438,"w":62,"h":72}, + "frame": {"x":500,"y":1471,"w":62,"h":72}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":62,"h":72}, @@ -525,8 +557,8 @@ "version": "1.0", "image": "atlas0_75.png", "format": "RGBA8888", - "size": {"w":987,"h":1532}, + "size": {"w":960,"h":1949}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:d8c7b55d4cea17126736a1070d617b0f:b7b7ecf41e0ce11453aef2472705bd1b:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:b6388644ac6868505c1c5a8724c498f7:ae727148497723e17b69d254af35c43d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png index cd61c7e3..307703f0 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/cutter-quad.png b/res_raw/sprites/blueprints/cutter-quad.png new file mode 100644 index 00000000..5ae8989e Binary files /dev/null and b/res_raw/sprites/blueprints/cutter-quad.png differ diff --git a/res_raw/sprites/blueprints/painter-quad.png b/res_raw/sprites/blueprints/painter-quad.png new file mode 100644 index 00000000..c3c755f2 Binary files /dev/null and b/res_raw/sprites/blueprints/painter-quad.png differ diff --git a/res_raw/sprites/buildings/cutter-quad.png b/res_raw/sprites/buildings/cutter-quad.png new file mode 100644 index 00000000..e67628f2 Binary files /dev/null and b/res_raw/sprites/buildings/cutter-quad.png differ diff --git a/res_raw/sprites/buildings/painter-quad.png b/res_raw/sprites/buildings/painter-quad.png new file mode 100644 index 00000000..18790a78 Binary files /dev/null and b/res_raw/sprites/buildings/painter-quad.png differ diff --git a/src/css/ingame_hud/building_placer.scss b/src/css/ingame_hud/building_placer.scss index b874ec3c..b4ba8160 100644 --- a/src/css/ingame_hud/building_placer.scss +++ b/src/css/ingame_hud/building_placer.scss @@ -97,6 +97,12 @@ &[data-tile-w="2"] { @include S(width, 2 * $iconSize); } + &[data-tile-w="3"] { + @include S(width, 3 * $iconSize); + } + &[data-tile-w="4"] { + @include S(width, 4 * $iconSize); + } &[data-tile-h="2"] { @include S(height, 2 * $iconSize); diff --git a/src/js/core/config.js b/src/js/core/config.js index 0b5a7214..05cad1c8 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -46,10 +46,12 @@ export const globalConfig = { buildingSpeeds: { cutter: 1 / 4, + cutterQuad: 1 / 4, rotater: 1 / 1, rotaterCCW: 1 / 1, painter: 1 / 3, painterDouble: 1 / 3, + painterQuad: 1 / 3, mixer: 1 / 2, stacker: 1 / 5, }, @@ -74,7 +76,7 @@ export const globalConfig = { debug: { /* dev:start */ - fastGameEnter: true, + // fastGameEnter: true, noArtificialDelays: true, // disableSavegameWrite: true, showEntityBounds: false, diff --git a/src/js/game/buildings/cutter.js b/src/js/game/buildings/cutter.js index 07a574f7..0fc7c16c 100644 --- a/src/js/game/buildings/cutter.js +++ b/src/js/game/buildings/cutter.js @@ -4,10 +4,13 @@ import { enumItemAcceptorItemFilter, ItemAcceptorComponent } 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 { GameRoot } from "../root"; import { enumHubGoalRewards } from "../tutorial_goals"; +/** @enum {string} */ +export const enumCutterVariants = { quad: "quad" }; + export class MetaCutterBuilding extends MetaBuilding { constructor() { super("cutter"); @@ -16,9 +19,15 @@ export class MetaCutterBuilding extends MetaBuilding { getSilhouetteColor() { return "#7dcda2"; } - - getDimensions() { - return new Vector(2, 1); + getDimensions(variant) { + switch (variant) { + case defaultBuildingVariant: + return new Vector(2, 1); + case enumCutterVariants.quad: + return new Vector(4, 1); + default: + assertAlways(false, "Unknown splitter variant: " + variant); + } } getName() { @@ -29,6 +38,10 @@ export class MetaCutterBuilding extends MetaBuilding { return "Cuts shapes from top to bottom and outputs both halfs. If you use only one part, be sure to destroy the other part or it will stall!"; } + getAvailableVariants(root) { + return [defaultBuildingVariant, enumCutterVariants.quad]; + } + /** * @param {GameRoot} root */ @@ -47,15 +60,7 @@ export class MetaCutterBuilding extends MetaBuilding { processorType: enumItemProcessorTypes.cutter, }) ); - - entity.addComponent( - new ItemEjectorComponent({ - slots: [ - { pos: new Vector(0, 0), direction: enumDirection.top }, - { pos: new Vector(1, 0), direction: enumDirection.top }, - ], - }) - ); + entity.addComponent(new ItemEjectorComponent({})); entity.addComponent( new ItemAcceptorComponent({ slots: [ @@ -68,4 +73,36 @@ export class MetaCutterBuilding extends MetaBuilding { }) ); } + + /** + * + * @param {Entity} entity + * @param {number} rotationVariant + * @param {string} variant + */ + updateVariants(entity, rotationVariant, variant) { + switch (variant) { + case defaultBuildingVariant: { + entity.components.ItemEjector.setSlots([ + { pos: new Vector(0, 0), direction: enumDirection.top }, + { pos: new Vector(1, 0), direction: enumDirection.top }, + ]); + entity.components.ItemProcessor.type = enumItemProcessorTypes.cutter; + break; + } + case enumCutterVariants.quad: { + entity.components.ItemEjector.setSlots([ + { pos: new Vector(0, 0), direction: enumDirection.top }, + { pos: new Vector(1, 0), direction: enumDirection.top }, + { pos: new Vector(2, 0), direction: enumDirection.top }, + { pos: new Vector(3, 0), direction: enumDirection.top }, + ]); + entity.components.ItemProcessor.type = enumItemProcessorTypes.cutterQuad; + break; + } + + default: + assertAlways(false, "Unknown painter variant: " + variant); + } + } } diff --git a/src/js/game/buildings/painter.js b/src/js/game/buildings/painter.js index d0477032..e085d051 100644 --- a/src/js/game/buildings/painter.js +++ b/src/js/game/buildings/painter.js @@ -9,7 +9,7 @@ import { enumHubGoalRewards } from "../tutorial_goals"; import { GameRoot } from "../root"; /** @enum {string} */ -export const enumPainterVariants = { double: "double" }; +export const enumPainterVariants = { double: "double", quad: "quad" }; export class MetaPainterBuilding extends MetaBuilding { constructor() { @@ -22,6 +22,8 @@ export class MetaPainterBuilding extends MetaBuilding { return new Vector(2, 1); case enumPainterVariants.double: return new Vector(2, 2); + case enumPainterVariants.quad: + return new Vector(4, 1); default: assertAlways(false, "Unknown painter variant: " + variant); } @@ -40,7 +42,7 @@ export class MetaPainterBuilding extends MetaBuilding { } getAvailableVariants(root) { - return [defaultBuildingVariant, enumPainterVariants.double]; + return [defaultBuildingVariant, enumPainterVariants.double, enumPainterVariants.quad]; } /** @@ -104,6 +106,9 @@ export class MetaPainterBuilding extends MetaBuilding { entity.components.ItemProcessor.type = enumItemProcessorTypes.painter; entity.components.ItemProcessor.inputsPerCharge = 2; + entity.components.ItemEjector.setSlots([ + { pos: new Vector(1, 0), direction: enumDirection.right }, + ]); break; } case enumPainterVariants.double: { @@ -127,6 +132,47 @@ export class MetaPainterBuilding extends MetaBuilding { entity.components.ItemProcessor.type = enumItemProcessorTypes.painterDouble; entity.components.ItemProcessor.inputsPerCharge = 3; + + entity.components.ItemEjector.setSlots([ + { pos: new Vector(1, 0), direction: enumDirection.right }, + ]); + break; + } + case enumPainterVariants.quad: { + entity.components.ItemAcceptor.setSlots([ + { + pos: new Vector(0, 0), + directions: [enumDirection.left], + filter: enumItemAcceptorItemFilter.shape, + }, + { + pos: new Vector(0, 0), + directions: [enumDirection.bottom], + filter: enumItemAcceptorItemFilter.color, + }, + { + pos: new Vector(1, 0), + directions: [enumDirection.bottom], + filter: enumItemAcceptorItemFilter.color, + }, + { + pos: new Vector(2, 0), + directions: [enumDirection.bottom], + filter: enumItemAcceptorItemFilter.color, + }, + { + pos: new Vector(3, 0), + directions: [enumDirection.bottom], + filter: enumItemAcceptorItemFilter.color, + }, + ]); + + entity.components.ItemProcessor.type = enumItemProcessorTypes.painterQuad; + entity.components.ItemProcessor.inputsPerCharge = 5; + + entity.components.ItemEjector.setSlots([ + { pos: new Vector(0, 0), direction: enumDirection.top }, + ]); break; } default: diff --git a/src/js/game/components/item_ejector.js b/src/js/game/components/item_ejector.js index 84289ee0..5cf96754 100644 --- a/src/js/game/components/item_ejector.js +++ b/src/js/game/components/item_ejector.js @@ -35,7 +35,7 @@ export class ItemEjectorComponent extends Component { /** * * @param {object} param0 - * @param {Array<{pos: Vector, direction: enumDirection}>} param0.slots The slots to eject on + * @param {Array<{pos: Vector, direction: enumDirection}>=} param0.slots The slots to eject on * @param {boolean=} param0.instantEject If the ejection is instant */ constructor({ slots = [], instantEject = false }) { diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 8a4d7ae9..6eaaa755 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -8,6 +8,7 @@ import { gItemRegistry } from "../../core/global_registries"; export const enumItemProcessorTypes = { splitter: "splitter", cutter: "cutter", + cutterQuad: "cutterQuad", rotater: "rotater", rotaterCCW: "rotaterCCW", stacker: "stacker", @@ -15,6 +16,7 @@ export const enumItemProcessorTypes = { mixer: "mixer", painter: "painter", painterDouble: "painterDouble", + painterQuad: "painterQuad", hub: "hub", }; diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index c15110f9..d4afc0ef 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -383,12 +383,14 @@ export class HubGoals extends BasicSerializableObject { case enumItemProcessorTypes.splitter: return globalConfig.beltSpeedItemsPerSecond * this.upgradeImprovements.belt * 2; case enumItemProcessorTypes.cutter: + case enumItemProcessorTypes.cutterQuad: case enumItemProcessorTypes.rotater: case enumItemProcessorTypes.rotaterCCW: case enumItemProcessorTypes.stacker: case enumItemProcessorTypes.mixer: case enumItemProcessorTypes.painter: case enumItemProcessorTypes.painterDouble: + case enumItemProcessorTypes.painterQuad: assert( globalConfig.buildingSpeeds[processorType], "Processor type has no speed set in globalConfig.buildingSpeeds: " + processorType diff --git a/src/js/game/items/color_item.js b/src/js/game/items/color_item.js index 8d1d3aa9..b2a3cd74 100644 --- a/src/js/game/items/color_item.js +++ b/src/js/game/items/color_item.js @@ -24,7 +24,7 @@ export class ColorItem extends BaseItem { } /** - * @param {string} color + * @param {enumColors} color */ constructor(color) { super(); diff --git a/src/js/game/shape_definition.js b/src/js/game/shape_definition.js index 1ad0d06b..64cc3eab 100644 --- a/src/js/game/shape_definition.js +++ b/src/js/game/shape_definition.js @@ -483,4 +483,23 @@ export class ShapeDefinition extends BasicSerializableObject { } return new ShapeDefinition({ layers: newLayers }); } + + /** + * Clones the shape and colors everything in the given colors + * @param {[enumColors, enumColors, enumColors, enumColors]} colors + */ + cloneAndPaintWith4Colors(colors) { + const newLayers = this.internalCloneLayers(); + + for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { + const quadrants = newLayers[layerIndex]; + for (let quadrantIndex = 0; quadrantIndex < 4; ++quadrantIndex) { + const item = quadrants[quadrantIndex]; + if (item) { + item.color = colors[quadrantIndex]; + } + } + } + return new ShapeDefinition({ layers: newLayers }); + } } diff --git a/src/js/game/shape_definition_manager.js b/src/js/game/shape_definition_manager.js index 9515a08c..ad682bf0 100644 --- a/src/js/game/shape_definition_manager.js +++ b/src/js/game/shape_definition_manager.js @@ -69,6 +69,28 @@ export class ShapeDefinitionManager extends BasicSerializableObject { ]); } + /** + * Generates a definition for splitting a shape definition in four quads + * @param {ShapeDefinition} definition + * @returns {[ShapeDefinition, ShapeDefinition, ShapeDefinition, ShapeDefinition]} + */ + shapeActionCutQuad(definition) { + const key = "cut-quad:" + definition.getHash(); + if (this.operationCache[key]) { + return /** @type {[ShapeDefinition, ShapeDefinition, ShapeDefinition, ShapeDefinition]} */ (this + .operationCache[key]); + } + + return /** @type {[ShapeDefinition, ShapeDefinition, ShapeDefinition, ShapeDefinition]} */ (this.operationCache[ + key + ] = [ + this.registerOrReturnHandle(definition.cloneFilteredByQuadrants([0])), + this.registerOrReturnHandle(definition.cloneFilteredByQuadrants([1])), + this.registerOrReturnHandle(definition.cloneFilteredByQuadrants([2])), + this.registerOrReturnHandle(definition.cloneFilteredByQuadrants([3])), + ]); + } + /** * Generates a definition for rotating a shape clockwise * @param {ShapeDefinition} definition @@ -125,7 +147,7 @@ export class ShapeDefinitionManager extends BasicSerializableObject { /** * Generates a definition for painting it with the given color * @param {ShapeDefinition} definition - * @param {string} color + * @param {enumColors} color * @returns {ShapeDefinition} */ shapeActionPaintWith(definition, color) { @@ -139,6 +161,23 @@ export class ShapeDefinitionManager extends BasicSerializableObject { )); } + /** + * Generates a definition for painting it with the 4 colors + * @param {ShapeDefinition} definition + * @param {[enumColors, enumColors, enumColors, enumColors]} colors + * @returns {ShapeDefinition} + */ + shapeActionPaintWith4Colors(definition, colors) { + const key = "paint4:" + definition.getHash() + ":" + colors.join(","); + if (this.operationCache[key]) { + return /** @type {ShapeDefinition} */ (this.operationCache[key]); + } + const colorized = definition.cloneAndPaintWith4Colors(colors); + return /** @type {ShapeDefinition} */ (this.operationCache[key] = this.registerOrReturnHandle( + colorized + )); + } + /** * Checks if we already have cached this definition, and if so throws it away and returns the already * cached variant diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 24a5b5a7..5a8d01d8 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -151,22 +151,37 @@ export class ItemProcessorSystem extends GameSystemWithFilter { assert(inputItem instanceof ShapeItem, "Input for cut is not a shape"); const inputDefinition = inputItem.definition; - const [cutDefinition1, cutDefinition2] = this.root.shapeDefinitionMgr.shapeActionCutHalf( - inputDefinition - ); + const cutDefinitions = this.root.shapeDefinitionMgr.shapeActionCutHalf(inputDefinition); - if (!cutDefinition1.isEntirelyEmpty()) { - outItems.push({ - item: new ShapeItem(cutDefinition1), - requiredSlot: 0, - }); + for (let i = 0; i < cutDefinitions.length; ++i) { + const definition = cutDefinitions[i]; + if (!definition.isEntirelyEmpty()) { + outItems.push({ + item: new ShapeItem(definition), + requiredSlot: i, + }); + } } - if (!cutDefinition2.isEntirelyEmpty()) { - outItems.push({ - item: new ShapeItem(cutDefinition2), - requiredSlot: 1, - }); + break; + } + + // CUTTER (Quad) + case enumItemProcessorTypes.cutterQuad: { + const inputItem = /** @type {ShapeItem} */ (items[0].item); + assert(inputItem instanceof ShapeItem, "Input for cut is not a shape"); + const inputDefinition = inputItem.definition; + + const cutDefinitions = this.root.shapeDefinitionMgr.shapeActionCutQuad(inputDefinition); + + for (let i = 0; i < cutDefinitions.length; ++i) { + const definition = cutDefinitions[i]; + if (!definition.isEntirelyEmpty()) { + outItems.push({ + item: new ShapeItem(definition), + requiredSlot: i, + }); + } } break; @@ -298,6 +313,33 @@ export class ItemProcessorSystem extends GameSystemWithFilter { break; } + // PAINTER (QUAD) + + case enumItemProcessorTypes.painterQuad: { + const shapeItem = /** @type {ShapeItem} */ (itemsBySlot[0].item); + const colorItem1 = /** @type {ColorItem} */ (itemsBySlot[1].item); + const colorItem2 = /** @type {ColorItem} */ (itemsBySlot[2].item); + const colorItem3 = /** @type {ColorItem} */ (itemsBySlot[3].item); + const colorItem4 = /** @type {ColorItem} */ (itemsBySlot[4].item); + + assert(shapeItem instanceof ShapeItem, "Input for painter is not a shape"); + assert(colorItem1 instanceof ColorItem, "Input for painter is not a color"); + assert(colorItem2 instanceof ColorItem, "Input for painter is not a color"); + assert(colorItem3 instanceof ColorItem, "Input for painter is not a color"); + assert(colorItem4 instanceof ColorItem, "Input for painter is not a color"); + + const colorizedDefinition = this.root.shapeDefinitionMgr.shapeActionPaintWith4Colors( + shapeItem.definition, + [colorItem2.color, colorItem3.color, colorItem4.color, colorItem1.color] + ); + + outItems.push({ + item: new ShapeItem(colorizedDefinition), + }); + + break; + } + // HUB case enumItemProcessorTypes.hub: {