diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index b996ff34..8aeef6ae 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":95,"y":372,"w":13,"h":13}, + "frame": {"x":204,"y":26,"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":112,"y":372,"w":13,"h":13}, + "frame": {"x":221,"y":26,"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":26,"y":356,"w":13,"h":13}, + "frame": {"x":238,"y":26,"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":43,"y":356,"w":13,"h":13}, + "frame": {"x":255,"y":26,"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":26,"y":373,"w":13,"h":13}, + "frame": {"x":272,"y":26,"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":3,"y":375,"w":13,"h":13}, + "frame": {"x":245,"y":112,"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":43,"y":373,"w":13,"h":13}, + "frame": {"x":262,"y":112,"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":60,"y":375,"w":13,"h":13}, + "frame": {"x":279,"y":112,"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":77,"y":375,"w":13,"h":13}, + "frame": {"x":296,"y":112,"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":94,"y":389,"w":13,"h":13}, + "frame": {"x":289,"y":49,"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":111,"y":389,"w":13,"h":13}, + "frame": {"x":306,"y":49,"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":20,"y":390,"w":13,"h":13}, + "frame": {"x":323,"y":49,"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":3,"y":392,"w":13,"h":13}, + "frame": {"x":313,"y":112,"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":37,"y":390,"w":13,"h":13}, + "frame": {"x":330,"y":112,"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":54,"y":392,"w":13,"h":13}, + "frame": {"x":340,"y":49,"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":71,"y":392,"w":13,"h":13}, + "frame": {"x":347,"y":112,"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":20,"y":407,"w":13,"h":13}, + "frame": {"x":357,"y":49,"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":3,"y":409,"w":13,"h":13}, + "frame": {"x":374,"y":49,"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":37,"y":407,"w":13,"h":13}, + "frame": {"x":391,"y":48,"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":88,"y":406,"w":13,"h":13}, + "frame": {"x":404,"y":25,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -162,7 +162,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":105,"y":406,"w":13,"h":13}, + "frame": {"x":400,"y":85,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -170,7 +170,7 @@ }, "sprites/blueprints/cutter-quad.png": { - "frame": {"x":3,"y":49,"w":76,"h":19}, + "frame": {"x":82,"y":3,"w":76,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":76,"h":19}, @@ -178,7 +178,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":3,"y":221,"w":36,"h":19}, + "frame": {"x":245,"y":66,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":44,"y":175,"w":19,"h":19}, + "frame": {"x":285,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -194,7 +194,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":44,"y":198,"w":19,"h":19}, + "frame": {"x":285,"y":89,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -202,7 +202,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":3,"y":175,"w":37,"h":19}, + "frame": {"x":204,"y":68,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -210,7 +210,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":84,"y":3,"w":38,"h":38}, + "frame": {"x":84,"y":82,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -218,7 +218,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":83,"y":87,"w":38,"h":19}, + "frame": {"x":82,"y":49,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -226,7 +226,7 @@ }, "sprites/blueprints/painter-quad.png": { - "frame": {"x":3,"y":3,"w":77,"h":19}, + "frame": {"x":3,"y":83,"w":77,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":77,"h":19}, @@ -234,7 +234,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":82,"y":110,"w":38,"h":19}, + "frame": {"x":124,"y":49,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -242,7 +242,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":43,"y":221,"w":19,"h":19}, + "frame": {"x":289,"y":26,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -250,7 +250,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":106,"y":225,"w":19,"h":19}, + "frame": {"x":312,"y":26,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -258,7 +258,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":43,"y":244,"w":19,"h":19}, + "frame": {"x":327,"y":3,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -266,7 +266,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":106,"y":248,"w":19,"h":19}, + "frame": {"x":308,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -274,7 +274,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":66,"y":225,"w":36,"h":19}, + "frame": {"x":249,"y":43,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -282,7 +282,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":81,"y":179,"w":37,"h":19}, + "frame": {"x":204,"y":91,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -290,7 +290,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":3,"y":267,"w":35,"h":38}, + "frame": {"x":126,"y":79,"w":35,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":35,"h":38}, @@ -298,7 +298,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":42,"y":267,"w":19,"h":19}, + "frame": {"x":335,"y":26,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -306,7 +306,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":72,"y":313,"w":19,"h":18}, + "frame": {"x":381,"y":26,"w":19,"h":18}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":19,"h":18}, @@ -314,7 +314,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":72,"y":335,"w":19,"h":16}, + "frame": {"x":354,"y":89,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -322,7 +322,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":95,"y":339,"w":19,"h":16}, + "frame": {"x":364,"y":109,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -330,7 +330,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":26,"y":336,"w":19,"h":16}, + "frame": {"x":377,"y":66,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -338,7 +338,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":43,"y":373,"w":13,"h":13}, + "frame": {"x":262,"y":112,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -346,7 +346,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":3,"y":392,"w":13,"h":13}, + "frame": {"x":313,"y":112,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -354,7 +354,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":95,"y":372,"w":13,"h":13}, + "frame": {"x":204,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -362,7 +362,7 @@ }, "sprites/buildings/cutter-quad.png": { - "frame": {"x":3,"y":72,"w":76,"h":19}, + "frame": {"x":82,"y":26,"w":76,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":76,"h":19}, @@ -370,7 +370,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":3,"y":244,"w":36,"h":19}, + "frame": {"x":287,"y":3,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -378,7 +378,7 @@ }, "sprites/buildings/hub.png": { - "frame": {"x":3,"y":95,"w":75,"h":76}, + "frame": {"x":3,"y":3,"w":75,"h":76}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":75,"h":76}, @@ -386,7 +386,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":42,"y":290,"w":19,"h":19}, + "frame": {"x":350,"y":3,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -394,7 +394,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":104,"y":271,"w":19,"h":19}, + "frame": {"x":308,"y":89,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -402,7 +402,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":81,"y":202,"w":37,"h":19}, + "frame": {"x":208,"y":43,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -410,7 +410,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":84,"y":45,"w":38,"h":38}, + "frame": {"x":162,"y":3,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -418,7 +418,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":82,"y":133,"w":38,"h":19}, + "frame": {"x":166,"y":45,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -426,7 +426,7 @@ }, "sprites/buildings/painter-quad.png": { - "frame": {"x":3,"y":26,"w":77,"h":19}, + "frame": {"x":3,"y":106,"w":77,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":77,"h":19}, @@ -434,7 +434,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":82,"y":156,"w":38,"h":19}, + "frame": {"x":204,"y":3,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -442,7 +442,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":104,"y":294,"w":19,"h":19}, + "frame": {"x":331,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -450,7 +450,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":3,"y":309,"w":19,"h":19}, + "frame": {"x":331,"y":89,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -458,7 +458,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":26,"y":313,"w":19,"h":19}, + "frame": {"x":354,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -466,7 +466,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":3,"y":332,"w":19,"h":19}, + "frame": {"x":358,"y":26,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -474,7 +474,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":66,"y":248,"w":36,"h":19}, + "frame": {"x":245,"y":89,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -482,7 +482,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":3,"y":198,"w":37,"h":19}, + "frame": {"x":246,"y":3,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -490,7 +490,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":65,"y":271,"w":35,"h":38}, + "frame": {"x":165,"y":72,"w":35,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":35,"h":38}, @@ -498,7 +498,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":49,"y":313,"w":19,"h":19}, + "frame": {"x":373,"y":3,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -506,7 +506,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":95,"y":317,"w":19,"h":18}, + "frame": {"x":396,"y":3,"w":19,"h":18}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":19,"h":18}, @@ -514,7 +514,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":3,"y":355,"w":19,"h":16}, + "frame": {"x":377,"y":86,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -522,7 +522,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":49,"y":336,"w":19,"h":16}, + "frame": {"x":387,"y":106,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -530,7 +530,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":72,"y":355,"w":19,"h":16}, + "frame": {"x":400,"y":65,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -538,7 +538,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":67,"y":203,"w":6,"h":6}, + "frame": {"x":82,"y":72,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -546,7 +546,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":67,"y":213,"w":6,"h":6}, + "frame": {"x":92,"y":72,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -554,7 +554,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":122,"y":179,"w":3,"h":3}, + "frame": {"x":111,"y":72,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -562,7 +562,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":122,"y":186,"w":3,"h":3}, + "frame": {"x":118,"y":72,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -570,7 +570,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":122,"y":193,"w":3,"h":3}, + "frame": {"x":125,"y":72,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -578,7 +578,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":67,"y":175,"w":10,"h":10}, + "frame": {"x":187,"y":114,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -586,15 +586,23 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":122,"y":200,"w":3,"h":3}, + "frame": {"x":132,"y":72,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, "sourceSize": {"w":3,"h":3} }, +"sprites/misc/lock_direction_indicator.png": +{ + "frame": {"x":102,"y":72,"w":5,"h":5}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":5,"h":5}, + "sourceSize": {"w":5,"h":5} +}, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":67,"y":175,"w":10,"h":10}, + "frame": {"x":187,"y":114,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -602,7 +610,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":67,"y":189,"w":10,"h":10}, + "frame": {"x":201,"y":114,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -610,7 +618,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":95,"y":359,"w":18,"h":9}, + "frame": {"x":165,"y":114,"w":18,"h":9}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":18,"h":9}, @@ -618,7 +626,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":122,"y":207,"w":3,"h":3}, + "frame": {"x":139,"y":72,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -629,8 +637,8 @@ "version": "1.0", "image": "atlas0_10.png", "format": "RGBA8888", - "size": {"w":128,"h":425}, + "size": {"w":422,"h":128}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:d89b36ef407ab57010cdc305dbead00b:d53090b6a8e7ddd3fb089e71bf9d20ca:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:8985524bba1a3f16cecab3c03b6aaa06:d614d20bfce033d8a8ab0990af085d16:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png index 3d14205f..adab820d 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 15109c86..ba671365 100644 --- a/res_built/atlas/atlas0_100.json +++ b/res_built/atlas/atlas0_100.json @@ -554,7 +554,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":1857,"y":525,"w":24,"h":32}, + "frame": {"x":1637,"y":1721,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -562,7 +562,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":1052,"y":1669,"w":28,"h":28}, + "frame": {"x":1893,"y":525,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":28,"h":28}, @@ -570,7 +570,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":1885,"y":525,"w":28,"h":28}, + "frame": {"x":1080,"y":1669,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":28,"h":28}, @@ -586,12 +586,20 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":1961,"y":918,"w":32,"h":32}, + "frame": {"x":1857,"y":525,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, "sourceSize": {"w":32,"h":32} }, +"sprites/misc/lock_direction_indicator.png": +{ + "frame": {"x":1961,"y":918,"w":48,"h":30}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":9,"w":48,"h":30}, + "sourceSize": {"w":48,"h":48} +}, "sprites/misc/slot_bad_arrow.png": { "frame": {"x":1403,"y":1554,"w":82,"h":82}, @@ -618,7 +626,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1637,"y":1721,"w":24,"h":32}, + "frame": {"x":1052,"y":1669,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -631,6 +639,6 @@ "format": "RGBA8888", "size": {"w":2014,"h":1857}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:d89b36ef407ab57010cdc305dbead00b:d53090b6a8e7ddd3fb089e71bf9d20ca:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:8985524bba1a3f16cecab3c03b6aaa06:d614d20bfce033d8a8ab0990af085d16:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.png b/res_built/atlas/atlas0_100.png index 5b047a2b..181adc30 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 5d59479a..a4aac8ed 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":825,"y":210,"w":28,"h":32}, + "frame": {"x":3,"y":1010,"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":857,"y":210,"w":28,"h":32}, + "frame": {"x":3,"y":967,"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":889,"y":210,"w":28,"h":32}, + "frame": {"x":3,"y":1046,"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":921,"y":210,"w":28,"h":32}, + "frame": {"x":35,"y":1044,"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":546,"y":207,"w":28,"h":32}, + "frame": {"x":67,"y":1044,"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":578,"y":206,"w":28,"h":32}, + "frame": {"x":133,"y":1053,"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":240,"y":207,"w":30,"h":30}, + "frame": {"x":143,"y":883,"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":274,"y":207,"w":30,"h":30}, + "frame": {"x":143,"y":917,"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":308,"y":207,"w":30,"h":30}, + "frame": {"x":143,"y":951,"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":342,"y":207,"w":30,"h":30}, + "frame": {"x":35,"y":960,"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":376,"y":207,"w":30,"h":30}, + "frame": {"x":69,"y":967,"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":410,"y":207,"w":30,"h":30}, + "frame": {"x":35,"y":994,"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":444,"y":207,"w":30,"h":30}, + "frame": {"x":103,"y":967,"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":478,"y":207,"w":30,"h":30}, + "frame": {"x":137,"y":985,"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":512,"y":207,"w":30,"h":30}, + "frame": {"x":171,"y":997,"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":610,"y":211,"w":30,"h":30}, + "frame": {"x":205,"y":1010,"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":644,"y":211,"w":30,"h":30}, + "frame": {"x":99,"y":1001,"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":678,"y":211,"w":30,"h":30}, + "frame": {"x":133,"y":1019,"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":712,"y":211,"w":30,"h":30}, + "frame": {"x":99,"y":1035,"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":746,"y":211,"w":30,"h":30}, + "frame": {"x":167,"y":1031,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -162,7 +162,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":1051,"y":101,"w":28,"h":32}, + "frame": {"x":201,"y":1044,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -170,7 +170,7 @@ }, "sprites/blueprints/cutter-quad.png": { - "frame": {"x":3,"y":192,"w":184,"h":48}, + "frame": {"x":3,"y":296,"w":184,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":184,"h":48}, @@ -178,7 +178,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":662,"y":107,"w":87,"h":48}, + "frame": {"x":155,"y":419,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -186,7 +186,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":621,"y":159,"w":47,"h":48}, + "frame": {"x":195,"y":3,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -194,7 +194,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":672,"y":159,"w":47,"h":48}, + "frame": {"x":195,"y":55,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -202,7 +202,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":583,"y":55,"w":89,"h":48}, + "frame": {"x":3,"y":808,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -210,7 +210,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":191,"y":107,"w":96,"h":96}, + "frame": {"x":3,"y":400,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -218,7 +218,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":383,"y":55,"w":96,"h":48}, + "frame": {"x":3,"y":600,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -226,7 +226,7 @@ }, "sprites/blueprints/painter-quad.png": { - "frame": {"x":191,"y":3,"w":188,"h":48}, + "frame": {"x":3,"y":3,"w":188,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":188,"h":48}, @@ -234,7 +234,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":571,"y":3,"w":96,"h":48}, + "frame": {"x":3,"y":652,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -242,7 +242,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":954,"y":3,"w":48,"h":48}, + "frame": {"x":191,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -250,7 +250,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":859,"y":55,"w":48,"h":48}, + "frame": {"x":191,"y":159,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -258,7 +258,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":844,"y":107,"w":48,"h":48}, + "frame": {"x":191,"y":211,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -266,7 +266,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":825,"y":159,"w":47,"h":47}, + "frame": {"x":103,"y":780,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -274,7 +274,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":863,"y":3,"w":87,"h":48}, + "frame": {"x":155,"y":471,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -282,7 +282,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":569,"y":107,"w":89,"h":48}, + "frame": {"x":96,"y":831,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -290,7 +290,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":391,"y":107,"w":85,"h":96}, + "frame": {"x":155,"y":627,"w":85,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":85,"h":96}, @@ -298,7 +298,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":1006,"y":3,"w":48,"h":48}, + "frame": {"x":191,"y":263,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -306,7 +306,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":569,"y":159,"w":48,"h":43}, + "frame": {"x":103,"y":503,"w":48,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":48,"h":43}, @@ -314,7 +314,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":927,"y":159,"w":48,"h":38}, + "frame": {"x":103,"y":550,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -322,7 +322,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":979,"y":158,"w":48,"h":38}, + "frame": {"x":103,"y":592,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -330,7 +330,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":953,"y":201,"w":48,"h":38}, + "frame": {"x":103,"y":634,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -338,7 +338,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":240,"y":207,"w":30,"h":30}, + "frame": {"x":143,"y":883,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -346,7 +346,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":444,"y":207,"w":30,"h":30}, + "frame": {"x":103,"y":967,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -354,7 +354,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":825,"y":210,"w":28,"h":32}, + "frame": {"x":3,"y":1010,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -362,7 +362,7 @@ }, "sprites/buildings/cutter-quad.png": { - "frame": {"x":383,"y":3,"w":184,"h":48}, + "frame": {"x":3,"y":348,"w":184,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":184,"h":48}, @@ -370,7 +370,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":768,"y":55,"w":87,"h":48}, + "frame": {"x":155,"y":523,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -378,7 +378,7 @@ }, "sprites/buildings/hub.png": { - "frame": {"x":3,"y":3,"w":184,"h":185}, + "frame": {"x":3,"y":107,"w":184,"h":185}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":184,"h":185}, @@ -386,7 +386,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":723,"y":159,"w":47,"h":48}, + "frame": {"x":103,"y":676,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -394,7 +394,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":774,"y":159,"w":47,"h":48}, + "frame": {"x":103,"y":728,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -402,7 +402,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":771,"y":3,"w":88,"h":48}, + "frame": {"x":154,"y":727,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -410,7 +410,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":291,"y":107,"w":96,"h":96}, + "frame": {"x":3,"y":500,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -418,7 +418,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":483,"y":55,"w":96,"h":48}, + "frame": {"x":3,"y":704,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -426,7 +426,7 @@ }, "sprites/buildings/painter-quad.png": { - "frame": {"x":191,"y":55,"w":188,"h":48}, + "frame": {"x":3,"y":55,"w":188,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":188,"h":48}, @@ -434,7 +434,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":671,"y":3,"w":96,"h":48}, + "frame": {"x":3,"y":756,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -442,7 +442,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":911,"y":55,"w":48,"h":48}, + "frame": {"x":191,"y":315,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -450,7 +450,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":896,"y":107,"w":48,"h":48}, + "frame": {"x":191,"y":367,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -458,7 +458,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":948,"y":107,"w":48,"h":47}, + "frame": {"x":103,"y":452,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -466,7 +466,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":876,"y":159,"w":47,"h":47}, + "frame": {"x":189,"y":831,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -474,7 +474,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":753,"y":107,"w":87,"h":48}, + "frame": {"x":155,"y":575,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -482,7 +482,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":676,"y":55,"w":88,"h":48}, + "frame": {"x":154,"y":779,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -490,7 +490,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":480,"y":107,"w":85,"h":96}, + "frame": {"x":3,"y":860,"w":85,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":85,"h":96}, @@ -498,7 +498,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":963,"y":55,"w":48,"h":48}, + "frame": {"x":103,"y":400,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -506,7 +506,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":1015,"y":55,"w":47,"h":42}, + "frame": {"x":189,"y":882,"w":47,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":47,"h":42}, @@ -514,7 +514,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1005,"y":200,"w":47,"h":38}, + "frame": {"x":92,"y":883,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -522,7 +522,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1000,"y":107,"w":47,"h":38}, + "frame": {"x":92,"y":925,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -530,7 +530,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1031,"y":149,"w":47,"h":38}, + "frame": {"x":189,"y":928,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -538,7 +538,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1058,"y":31,"w":14,"h":16}, + "frame": {"x":226,"y":970,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -546,7 +546,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":806,"y":211,"w":14,"h":16}, + "frame": {"x":226,"y":990,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -554,7 +554,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":1051,"y":137,"w":8,"h":8}, + "frame": {"x":171,"y":400,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -562,7 +562,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":1063,"y":137,"w":8,"h":8}, + "frame": {"x":177,"y":883,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -570,7 +570,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":191,"y":234,"w":8,"h":8}, + "frame": {"x":177,"y":895,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -578,7 +578,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":780,"y":211,"w":22,"h":22}, + "frame": {"x":165,"y":1065,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -586,15 +586,23 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":203,"y":234,"w":8,"h":8}, + "frame": {"x":177,"y":907,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, "sourceSize": {"w":8,"h":8} }, +"sprites/misc/lock_direction_indicator.png": +{ + "frame": {"x":155,"y":400,"w":12,"h":10}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":1,"w":12,"h":10}, + "sourceSize": {"w":12,"h":12} +}, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":780,"y":211,"w":22,"h":22}, + "frame": {"x":165,"y":1065,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -602,7 +610,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":1058,"y":3,"w":22,"h":24}, + "frame": {"x":69,"y":1001,"w":22,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":22,"h":24}, @@ -610,7 +618,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":191,"y":207,"w":45,"h":23}, + "frame": {"x":177,"y":970,"w":45,"h":23}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":45,"h":23}, @@ -618,7 +626,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":215,"y":234,"w":8,"h":8}, + "frame": {"x":177,"y":919,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -629,8 +637,8 @@ "version": "1.0", "image": "atlas0_25.png", "format": "RGBA8888", - "size": {"w":1083,"h":245}, + "size": {"w":245,"h":1090}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:d89b36ef407ab57010cdc305dbead00b:d53090b6a8e7ddd3fb089e71bf9d20ca:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:8985524bba1a3f16cecab3c03b6aaa06:d614d20bfce033d8a8ab0990af085d16:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png index e142b7de..4581d71d 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 63da20cc..f31bbb3d 100644 --- a/res_built/atlas/atlas0_50.json +++ b/res_built/atlas/atlas0_50.json @@ -554,7 +554,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":1208,"y":448,"w":14,"h":16}, + "frame": {"x":1835,"y":270,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -592,6 +592,14 @@ "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, "sourceSize": {"w":16,"h":16} }, +"sprites/misc/lock_direction_indicator.png": +{ + "frame": {"x":1208,"y":448,"w":24,"h":16}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":4,"w":24,"h":16}, + "sourceSize": {"w":24,"h":24} +}, "sprites/misc/slot_bad_arrow.png": { "frame": {"x":1971,"y":70,"w":42,"h":42}, @@ -618,7 +626,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1835,"y":270,"w":14,"h":16}, + "frame": {"x":1989,"y":340,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -631,6 +639,6 @@ "format": "RGBA8888", "size": {"w":2020,"h":492}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:d89b36ef407ab57010cdc305dbead00b:d53090b6a8e7ddd3fb089e71bf9d20ca:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:8985524bba1a3f16cecab3c03b6aaa06:d614d20bfce033d8a8ab0990af085d16:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png index 54e523a0..60e1f644 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 036e42b5..392448be 100644 --- a/res_built/atlas/atlas0_75.json +++ b/res_built/atlas/atlas0_75.json @@ -592,6 +592,14 @@ "spriteSourceSize": {"x":0,"y":0,"w":24,"h":24}, "sourceSize": {"w":24,"h":24} }, +"sprites/misc/lock_direction_indicator.png": +{ + "frame": {"x":1357,"y":733,"w":36,"h":24}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":6,"w":36,"h":24}, + "sourceSize": {"w":36,"h":36} +}, "sprites/misc/slot_bad_arrow.png": { "frame": {"x":140,"y":994,"w":62,"h":62}, @@ -618,7 +626,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1933,"y":327,"w":20,"h":24}, + "frame": {"x":1357,"y":761,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -631,6 +639,6 @@ "format": "RGBA8888", "size": {"w":2047,"h":1063}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:d89b36ef407ab57010cdc305dbead00b:d53090b6a8e7ddd3fb089e71bf9d20ca:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:8985524bba1a3f16cecab3c03b6aaa06:d614d20bfce033d8a8ab0990af085d16:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png index 7efc0151..f4844add 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/misc/lock_direction_indicator.png b/res_raw/sprites/misc/lock_direction_indicator.png new file mode 100644 index 00000000..fe693ba2 Binary files /dev/null and b/res_raw/sprites/misc/lock_direction_indicator.png differ diff --git a/src/js/game/hud/parts/building_placer.js b/src/js/game/hud/parts/building_placer.js index b9561dcd..d1c9e791 100644 --- a/src/js/game/hud/parts/building_placer.js +++ b/src/js/game/hud/parts/building_placer.js @@ -3,7 +3,7 @@ import { globalConfig } from "../../../core/config"; import { DrawParameters } from "../../../core/draw_parameters"; import { drawRotatedSprite } from "../../../core/draw_utils"; import { Loader } from "../../../core/loader"; -import { makeDiv, removeAllChildren } from "../../../core/utils"; +import { makeDiv, removeAllChildren, pulseAnimation, clamp } from "../../../core/utils"; import { enumDirectionToAngle, enumDirectionToVector, @@ -50,6 +50,8 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { this.variantsAttach = new DynamicDomAttach(this.root, this.variantsElement, {}); this.currentInterpolatedCornerTile = new Vector(); + + this.lockIndicatorSprite = Loader.getSprite("sprites/misc/lock_direction_indicator.png"); } /** @@ -319,6 +321,25 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { parameters.context.beginCircle(endLine.x, endLine.y, 4); parameters.context.fill(); + + // Draw arrows + const path = this.computeDirectionLockPath(); + for (let i = 0; i < path.length - 1; i += 1) { + const { rotation, tile } = path[i]; + const worldPos = tile.toWorldSpaceCenterOfTile(); + drawRotatedSprite({ + parameters, + sprite: this.lockIndicatorSprite, + x: worldPos.x, + y: worldPos.y, + angle: Math_radians(rotation), + size: 12, + offsetY: + -globalConfig.halfTileSize - + clamp((this.root.time.now() * 1.5) % 1.0, 0, 1) * 1 * globalConfig.tileSize + + globalConfig.halfTileSize, + }); + } } } diff --git a/src/js/game/hud/parts/building_placer_logic.js b/src/js/game/hud/parts/building_placer_logic.js index 05d2e48a..3a40cac2 100644 --- a/src/js/game/hud/parts/building_placer_logic.js +++ b/src/js/game/hud/parts/building_placer_logic.js @@ -91,6 +91,7 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart { .getBinding(KEYMAPPINGS.placement.abortBuildingPlacement) .add(this.abortPlacement, this); keyActionMapper.getBinding(KEYMAPPINGS.general.back).add(this.abortPlacement, this); + this.root.gameState.inputReciever.keyup.add(this.checkForDirectionLockSwitch, this); // BINDINGS TO GAME EVENTS this.root.hud.signals.buildingsSelectedForCopy.add(this.abortPlacement, this); @@ -211,6 +212,16 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart { } } + /** + * Checks if the direction lock key got released and if such, resets the placement + * @param {any} args + */ + checkForDirectionLockSwitch({ keyCode }) { + if (keyCode === this.root.keyMapper.getBinding(KEYMAPPINGS.placement.lockBeltDirection).keyCode) { + this.abortDragging(); + } + } + /** * Canvas click handler * @param {Vector} mousePos @@ -316,12 +327,28 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart { * releasing the mouse */ executeDirectionLockedPlacement() { + const path = this.computeDirectionLockPath(); + for (let i = 0; i < path.length; ++i) { + const { rotation, tile } = path[i]; + + this.currentBaseRotation = rotation; + this.tryPlaceCurrentBuildingAt(tile); + } + } + + /** + * Finds the path which the current direction lock will use + * @returns {Array<{ tile: Vector, rotation: number }>} + */ + computeDirectionLockPath() { const mousePosition = this.root.app.mousePosition; if (!mousePosition) { // Not on screen - return; + return []; } + let result = []; + // Figure which points the line visits const worldPos = this.root.camera.screenToWorld(mousePosition); const mouseTile = worldPos.toTileSpace(); @@ -333,10 +360,13 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart { const lengthToCorner = Math_round(pathToCorner.length()); let currentPos = startTile.copy(); - this.currentBaseRotation = (Math.round(Math_degrees(deltaToCorner.angle()) / 90) * 90 + 360) % 360; + let rotation = (Math.round(Math_degrees(deltaToCorner.angle()) / 90) * 90 + 360) % 360; for (let i = 0; i < lengthToCorner; ++i) { - this.tryPlaceCurrentBuildingAt(currentPos); + result.push({ + tile: currentPos.copy(), + rotation, + }); currentPos.addInplace(deltaToCorner); } @@ -344,12 +374,16 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart { const pathFromCorner = mouseTile.sub(this.currentDirectionLockCorner); const deltaFromCorner = pathFromCorner.normalize().round(); const lengthFromCorner = Math_round(pathFromCorner.length()); - this.currentBaseRotation = (Math.round(Math_degrees(deltaFromCorner.angle()) / 90) * 90 + 360) % 360; + rotation = (Math.round(Math_degrees(deltaFromCorner.angle()) / 90) * 90 + 360) % 360; for (let i = 0; i < lengthFromCorner + 1; ++i) { - this.tryPlaceCurrentBuildingAt(currentPos); + result.push({ + tile: currentPos.copy(), + rotation, + }); currentPos.addInplace(deltaFromCorner); } + return result; } /**