diff --git a/res_built/atlas/atlas0_hq.json b/res_built/atlas/atlas0_hq.json index 2736a1d9..93e5417c 100644 --- a/res_built/atlas/atlas0_hq.json +++ b/res_built/atlas/atlas0_hq.json @@ -2,7 +2,7 @@ "sprites/belt/built/forward_0.png": { - "frame": {"x":1925,"y":1008,"w":116,"h":144}, + "frame": {"x":440,"y":742,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -10,7 +10,7 @@ }, "sprites/belt/built/forward_1.png": { - "frame": {"x":699,"y":888,"w":116,"h":144}, + "frame": {"x":1925,"y":1008,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -18,7 +18,7 @@ }, "sprites/belt/built/forward_2.png": { - "frame": {"x":964,"y":1181,"w":116,"h":144}, + "frame": {"x":3,"y":1506,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -26,7 +26,7 @@ }, "sprites/belt/built/forward_3.png": { - "frame": {"x":1805,"y":1118,"w":116,"h":144}, + "frame": {"x":123,"y":1853,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -34,7 +34,7 @@ }, "sprites/belt/built/forward_4.png": { - "frame": {"x":1540,"y":1139,"w":116,"h":144}, + "frame": {"x":123,"y":1674,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -42,7 +42,7 @@ }, "sprites/belt/built/forward_5.png": { - "frame": {"x":1925,"y":1156,"w":116,"h":144}, + "frame": {"x":123,"y":1506,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -50,7 +50,7 @@ }, "sprites/belt/built/forward_6.png": { - "frame": {"x":1802,"y":1266,"w":116,"h":144}, + "frame": {"x":235,"y":1355,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -58,7 +58,7 @@ }, "sprites/belt/built/forward_7.png": { - "frame": {"x":1922,"y":1304,"w":116,"h":144}, + "frame": {"x":243,"y":1853,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -66,7 +66,7 @@ }, "sprites/belt/built/forward_8.png": { - "frame": {"x":1530,"y":1287,"w":116,"h":144}, + "frame": {"x":243,"y":1674,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -74,7 +74,7 @@ }, "sprites/belt/built/forward_9.png": { - "frame": {"x":1791,"y":1414,"w":116,"h":144}, + "frame": {"x":243,"y":1506,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -82,7 +82,7 @@ }, "sprites/belt/built/forward_10.png": { - "frame": {"x":699,"y":1036,"w":116,"h":144}, + "frame": {"x":438,"y":890,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -90,7 +90,7 @@ }, "sprites/belt/built/forward_11.png": { - "frame": {"x":1542,"y":991,"w":116,"h":144}, + "frame": {"x":1923,"y":1437,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -98,7 +98,7 @@ }, "sprites/belt/built/forward_12.png": { - "frame": {"x":967,"y":1033,"w":116,"h":144}, + "frame": {"x":3,"y":1853,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -106,7 +106,7 @@ }, "sprites/belt/built/forward_13.png": { - "frame": {"x":696,"y":1184,"w":116,"h":144}, + "frame": {"x":3,"y":1674,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -114,7 +114,7 @@ }, "sprites/belt/built/left_0.png": { - "frame": {"x":1911,"y":1452,"w":130,"h":130}, + "frame": {"x":1357,"y":1369,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -122,7 +122,7 @@ }, "sprites/belt/built/left_1.png": { - "frame": {"x":1512,"y":1435,"w":130,"h":130}, + "frame": {"x":1810,"y":1303,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -130,7 +130,7 @@ }, "sprites/belt/built/left_2.png": { - "frame": {"x":3,"y":1543,"w":130,"h":130}, + "frame": {"x":1625,"y":1455,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -138,7 +138,7 @@ }, "sprites/belt/built/left_3.png": { - "frame": {"x":3,"y":1377,"w":130,"h":130}, + "frame": {"x":1491,"y":1540,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -146,7 +146,7 @@ }, "sprites/belt/built/left_4.png": { - "frame": {"x":3,"y":1206,"w":130,"h":130}, + "frame": {"x":1759,"y":1571,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -154,7 +154,7 @@ }, "sprites/belt/built/left_5.png": { - "frame": {"x":137,"y":1866,"w":130,"h":130}, + "frame": {"x":1625,"y":1589,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -162,7 +162,7 @@ }, "sprites/belt/built/left_6.png": { - "frame": {"x":137,"y":1715,"w":130,"h":130}, + "frame": {"x":1893,"y":1585,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -170,7 +170,7 @@ }, "sprites/belt/built/left_7.png": { - "frame": {"x":137,"y":1543,"w":130,"h":130}, + "frame": {"x":1759,"y":1705,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -178,7 +178,7 @@ }, "sprites/belt/built/left_8.png": { - "frame": {"x":137,"y":1377,"w":130,"h":130}, + "frame": {"x":1893,"y":1719,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -186,7 +186,7 @@ }, "sprites/belt/built/left_9.png": { - "frame": {"x":137,"y":1206,"w":130,"h":130}, + "frame": {"x":363,"y":1853,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -194,7 +194,7 @@ }, "sprites/belt/built/left_10.png": { - "frame": {"x":1640,"y":1696,"w":130,"h":130}, + "frame": {"x":1655,"y":1321,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -202,7 +202,7 @@ }, "sprites/belt/built/left_11.png": { - "frame": {"x":1859,"y":1729,"w":130,"h":130}, + "frame": {"x":1491,"y":1406,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -210,7 +210,7 @@ }, "sprites/belt/built/left_12.png": { - "frame": {"x":3,"y":1866,"w":130,"h":130}, + "frame": {"x":1357,"y":1503,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -218,7 +218,7 @@ }, "sprites/belt/built/left_13.png": { - "frame": {"x":3,"y":1715,"w":130,"h":130}, + "frame": {"x":1789,"y":1437,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -226,7 +226,7 @@ }, "sprites/belt/built/right_0.png": { - "frame": {"x":271,"y":1866,"w":130,"h":130}, + "frame": {"x":363,"y":1674,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -234,7 +234,7 @@ }, "sprites/belt/built/right_1.png": { - "frame": {"x":405,"y":1123,"w":130,"h":130}, + "frame": {"x":363,"y":1506,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -242,7 +242,7 @@ }, "sprites/belt/built/right_2.png": { - "frame": {"x":271,"y":1257,"w":130,"h":130}, + "frame": {"x":765,"y":1248,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -250,7 +250,7 @@ }, "sprites/belt/built/right_3.png": { - "frame": {"x":673,"y":1332,"w":130,"h":130}, + "frame": {"x":631,"y":1248,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -258,7 +258,7 @@ }, "sprites/belt/built/right_4.png": { - "frame": {"x":539,"y":1340,"w":130,"h":130}, + "frame": {"x":475,"y":1250,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -266,7 +266,7 @@ }, "sprites/belt/built/right_5.png": { - "frame": {"x":405,"y":1391,"w":130,"h":130}, + "frame": {"x":899,"y":1290,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -274,7 +274,7 @@ }, "sprites/belt/built/right_6.png": { - "frame": {"x":271,"y":1391,"w":130,"h":130}, + "frame": {"x":765,"y":1382,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -282,7 +282,7 @@ }, "sprites/belt/built/right_7.png": { - "frame": {"x":807,"y":1377,"w":130,"h":130}, + "frame": {"x":631,"y":1382,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -290,7 +290,7 @@ }, "sprites/belt/built/right_8.png": { - "frame": {"x":673,"y":1466,"w":130,"h":130}, + "frame": {"x":631,"y":1674,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -298,7 +298,7 @@ }, "sprites/belt/built/right_9.png": { - "frame": {"x":539,"y":1474,"w":130,"h":130}, + "frame": {"x":631,"y":1516,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -306,7 +306,7 @@ }, "sprites/belt/built/right_10.png": { - "frame": {"x":271,"y":1123,"w":130,"h":130}, + "frame": {"x":497,"y":1853,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -314,7 +314,7 @@ }, "sprites/belt/built/right_11.png": { - "frame": {"x":271,"y":1715,"w":130,"h":130}, + "frame": {"x":497,"y":1674,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -322,7 +322,7 @@ }, "sprites/belt/built/right_12.png": { - "frame": {"x":539,"y":1206,"w":130,"h":130}, + "frame": {"x":497,"y":1506,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -330,7 +330,7 @@ }, "sprites/belt/built/right_13.png": { - "frame": {"x":405,"y":1257,"w":130,"h":130}, + "frame": {"x":631,"y":1853,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -338,7 +338,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":405,"y":1525,"w":130,"h":130}, + "frame": {"x":1033,"y":1392,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -346,7 +346,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":271,"y":1525,"w":130,"h":130}, + "frame": {"x":899,"y":1424,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -354,7 +354,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":959,"y":1329,"w":116,"h":144}, + "frame": {"x":355,"y":1355,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -386,10 +386,10 @@ }, "sprites/blueprints/display.png": { - "frame": {"x":1879,"y":1586,"w":135,"h":139}, + "frame": {"x":1539,"y":991,"w":128,"h":136}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":5,"y":5,"w":135,"h":139}, + "spriteSourceSize": {"x":8,"y":8,"w":128,"h":136}, "sourceSize": {"w":144,"h":144} }, "sprites/blueprints/filter.png": @@ -418,7 +418,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":824,"y":885,"w":144,"h":123}, + "frame": {"x":560,"y":888,"w":144,"h":123}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":123}, @@ -434,7 +434,7 @@ }, "sprites/blueprints/logic_gate-xor.png": { - "frame": {"x":1672,"y":880,"w":144,"h":143}, + "frame": {"x":1101,"y":852,"w":144,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":143}, @@ -442,7 +442,7 @@ }, "sprites/blueprints/logic_gate.png": { - "frame": {"x":1101,"y":852,"w":144,"h":133}, + "frame": {"x":824,"y":885,"w":144,"h":133}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":133}, @@ -450,7 +450,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1646,"y":1549,"w":136,"h":143}, + "frame": {"x":1909,"y":1156,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -458,7 +458,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1220,"y":1396,"w":136,"h":143}, + "frame": {"x":1217,"y":1359,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -506,7 +506,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":255,"y":975,"w":143,"h":144}, + "frame": {"x":551,"y":1100,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -514,7 +514,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":1396,"y":852,"w":142,"h":144}, + "frame": {"x":235,"y":1207,"w":142,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":142,"h":144}, @@ -522,7 +522,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":402,"y":975,"w":143,"h":144}, + "frame": {"x":3,"y":1035,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -530,7 +530,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":1249,"y":979,"w":142,"h":138}, + "frame": {"x":3,"y":1319,"w":142,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":142,"h":138}, @@ -538,7 +538,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1087,"y":1136,"w":139,"h":138}, + "frame": {"x":949,"y":1033,"w":139,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, @@ -570,7 +570,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":255,"y":742,"w":144,"h":144}, + "frame": {"x":292,"y":742,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -578,7 +578,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":1660,"y":1282,"w":138,"h":125}, + "frame": {"x":1528,"y":1131,"w":138,"h":125}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":19,"w":138,"h":125}, @@ -586,7 +586,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":1388,"y":1147,"w":138,"h":112}, + "frame": {"x":1243,"y":1115,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -594,7 +594,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":1662,"y":1027,"w":139,"h":112}, + "frame": {"x":1243,"y":999,"w":139,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":139,"h":112}, @@ -602,7 +602,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":1388,"y":1263,"w":138,"h":112}, + "frame": {"x":1385,"y":1138,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":138,"h":112}, @@ -610,7 +610,7 @@ }, "sprites/blueprints/wire-cross.png": { - "frame": {"x":403,"y":742,"w":144,"h":144}, + "frame": {"x":3,"y":887,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -618,7 +618,7 @@ }, "sprites/blueprints/wire-split.png": { - "frame": {"x":551,"y":888,"w":144,"h":82}, + "frame": {"x":801,"y":1022,"w":144,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":62,"w":144,"h":82}, @@ -626,7 +626,7 @@ }, "sprites/blueprints/wire-turn.png": { - "frame": {"x":1786,"y":1610,"w":82,"h":82}, + "frame": {"x":706,"y":1036,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":62,"y":62,"w":82,"h":82}, @@ -640,9 +640,17 @@ "spriteSourceSize": {"x":62,"y":0,"w":20,"h":144}, "sourceSize": {"w":144,"h":144} }, +"sprites/blueprints/wire_tunnel-coating.png": +{ + "frame": {"x":255,"y":677,"w":33,"h":135}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":55,"y":4,"w":33,"h":135}, + "sourceSize": {"w":144,"h":144} +}, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":1660,"y":1143,"w":138,"h":135}, + "frame": {"x":1386,"y":999,"w":138,"h":135}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":138,"h":135}, @@ -650,7 +658,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":1911,"y":1452,"w":130,"h":130}, + "frame": {"x":1357,"y":1369,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -658,7 +666,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":271,"y":1866,"w":130,"h":130}, + "frame": {"x":363,"y":1674,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -666,7 +674,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1925,"y":1008,"w":116,"h":144}, + "frame": {"x":440,"y":742,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -738,7 +746,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":1249,"y":852,"w":143,"h":123}, + "frame": {"x":382,"y":1123,"w":143,"h":123}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":123}, @@ -754,7 +762,7 @@ }, "sprites/buildings/logic_gate-xor.png": { - "frame": {"x":549,"y":1059,"w":143,"h":143}, + "frame": {"x":235,"y":1060,"w":143,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":143}, @@ -762,7 +770,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":3,"y":1035,"w":143,"h":132}, + "frame": {"x":3,"y":1183,"w":143,"h":132}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":132}, @@ -770,7 +778,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1360,"y":1494,"w":136,"h":142}, + "frame": {"x":1670,"y":1175,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -778,7 +786,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1500,"y":1569,"w":136,"h":142}, + "frame": {"x":1515,"y":1260,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -826,7 +834,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":1098,"y":989,"w":141,"h":143}, + "frame": {"x":1249,"y":852,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -834,7 +842,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":1395,"y":1000,"w":141,"h":143}, + "frame": {"x":1394,"y":852,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":141,"h":143}, @@ -842,7 +850,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":1243,"y":1121,"w":141,"h":143}, + "frame": {"x":1671,"y":1028,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -850,7 +858,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":819,"y":1097,"w":141,"h":136}, + "frame": {"x":1098,"y":999,"w":141,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":141,"h":136}, @@ -858,7 +866,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":816,"y":1237,"w":139,"h":136}, + "frame": {"x":792,"y":1108,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -890,7 +898,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":3,"y":887,"w":144,"h":144}, + "frame": {"x":1101,"y":704,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -898,7 +906,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":1230,"y":1268,"w":137,"h":124}, + "frame": {"x":1233,"y":1231,"w":137,"h":124}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":20,"w":137,"h":124}, @@ -906,7 +914,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1084,"y":1278,"w":137,"h":111}, + "frame": {"x":1374,"y":1254,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -914,7 +922,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1079,"y":1393,"w":137,"h":111}, + "frame": {"x":935,"y":1175,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -922,7 +930,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1371,"y":1379,"w":137,"h":111}, + "frame": {"x":1076,"y":1277,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -930,7 +938,7 @@ }, "sprites/buildings/wire-cross.png": { - "frame": {"x":1101,"y":704,"w":144,"h":144}, + "frame": {"x":1249,"y":704,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -938,7 +946,7 @@ }, "sprites/buildings/wire-split.png": { - "frame": {"x":819,"y":1012,"w":144,"h":81}, + "frame": {"x":290,"y":890,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -946,7 +954,7 @@ }, "sprites/buildings/wire-turn.png": { - "frame": {"x":1774,"y":1696,"w":81,"h":81}, + "frame": {"x":150,"y":1035,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -960,9 +968,17 @@ "spriteSourceSize": {"x":63,"y":0,"w":18,"h":144}, "sourceSize": {"w":144,"h":144} }, +"sprites/buildings/wire_tunnel-coating.png": +{ + "frame": {"x":255,"y":816,"w":31,"h":134}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":56,"y":5,"w":31,"h":134}, + "sourceSize": {"w":144,"h":144} +}, "sprites/buildings/wire_tunnel.png": { - "frame": {"x":1650,"y":1411,"w":137,"h":134}, + "frame": {"x":1092,"y":1139,"w":137,"h":134}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":137,"h":134}, @@ -1010,7 +1026,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":1786,"y":1562,"w":89,"h":44}, + "frame": {"x":708,"y":988,"w":89,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":89,"h":44}, @@ -1018,7 +1034,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1993,"y":1780,"w":38,"h":48}, + "frame": {"x":1867,"y":1118,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -1090,7 +1106,7 @@ }, "sprites/wires/display/yellow.png": { - "frame": {"x":1993,"y":1729,"w":47,"h":47}, + "frame": {"x":1816,"y":1118,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, @@ -1122,7 +1138,7 @@ }, "sprites/wires/overlay_tile.png": { - "frame": {"x":150,"y":1035,"w":96,"h":96}, + "frame": {"x":708,"y":888,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1130,7 +1146,7 @@ }, "sprites/wires/sets/color_cross.png": { - "frame": {"x":1249,"y":704,"w":144,"h":144}, + "frame": {"x":1397,"y":704,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -1146,7 +1162,7 @@ }, "sprites/wires/sets/color_split.png": { - "frame": {"x":255,"y":890,"w":144,"h":81}, + "frame": {"x":558,"y":1015,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -1154,7 +1170,7 @@ }, "sprites/wires/sets/color_turn.png": { - "frame": {"x":1774,"y":1781,"w":81,"h":81}, + "frame": {"x":150,"y":1120,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -1162,7 +1178,7 @@ }, "sprites/wires/sets/conflict_cross.png": { - "frame": {"x":1397,"y":704,"w":144,"h":144}, + "frame": {"x":1675,"y":732,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -1178,7 +1194,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":403,"y":890,"w":144,"h":81}, + "frame": {"x":255,"y":975,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -1186,7 +1202,7 @@ }, "sprites/wires/sets/conflict_turn.png": { - "frame": {"x":941,"y":1477,"w":81,"h":81}, + "frame": {"x":150,"y":1205,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -1194,7 +1210,7 @@ }, "sprites/wires/sets/regular_cross.png": { - "frame": {"x":1101,"y":704,"w":144,"h":144}, + "frame": {"x":1249,"y":704,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -1210,7 +1226,7 @@ }, "sprites/wires/sets/regular_split.png": { - "frame": {"x":819,"y":1012,"w":144,"h":81}, + "frame": {"x":290,"y":890,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -1218,7 +1234,7 @@ }, "sprites/wires/sets/regular_turn.png": { - "frame": {"x":1774,"y":1696,"w":81,"h":81}, + "frame": {"x":150,"y":1035,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -1226,7 +1242,7 @@ }, "sprites/wires/sets/shape_cross.png": { - "frame": {"x":1675,"y":732,"w":144,"h":144}, + "frame": {"x":1672,"y":880,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -1242,7 +1258,7 @@ }, "sprites/wires/sets/shape_split.png": { - "frame": {"x":551,"y":974,"w":144,"h":81}, + "frame": {"x":403,"y":1038,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -1250,7 +1266,7 @@ }, "sprites/wires/sets/shape_turn.png": { - "frame": {"x":807,"y":1511,"w":81,"h":81}, + "frame": {"x":150,"y":1290,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -1271,6 +1287,6 @@ "format": "RGBA8888", "size": {"w":2048,"h":2048}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:cd3efb179b186695586b2a19b2f23e1a:1f2545bea0c9df078662c1e6b25aa6f5:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:2d1cf13d72f57d35286eff6ea2dc4baf:37ea54415549690e46769bf06ba5be07:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_hq.png b/res_built/atlas/atlas0_hq.png index 19509931..a284f4c9 100644 Binary files a/res_built/atlas/atlas0_hq.png and b/res_built/atlas/atlas0_hq.png differ diff --git a/res_built/atlas/atlas0_lq.json b/res_built/atlas/atlas0_lq.json index 9a71e571..bbe3cc6f 100644 --- a/res_built/atlas/atlas0_lq.json +++ b/res_built/atlas/atlas0_lq.json @@ -2,7 +2,7 @@ "sprites/belt/built/forward_0.png": { - "frame": {"x":403,"y":738,"w":40,"h":48}, + "frame": {"x":415,"y":463,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -10,7 +10,7 @@ }, "sprites/belt/built/forward_1.png": { - "frame": {"x":345,"y":749,"w":40,"h":48}, + "frame": {"x":337,"y":762,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -18,7 +18,7 @@ }, "sprites/belt/built/forward_2.png": { - "frame": {"x":99,"y":876,"w":40,"h":48}, + "frame": {"x":147,"y":833,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -26,7 +26,7 @@ }, "sprites/belt/built/forward_3.png": { - "frame": {"x":51,"y":902,"w":40,"h":48}, + "frame": {"x":99,"y":850,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -34,7 +34,7 @@ }, "sprites/belt/built/forward_4.png": { - "frame": {"x":3,"y":908,"w":40,"h":48}, + "frame": {"x":51,"y":864,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -42,7 +42,7 @@ }, "sprites/belt/built/forward_5.png": { - "frame": {"x":3,"y":960,"w":40,"h":48}, + "frame": {"x":3,"y":866,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -50,7 +50,7 @@ }, "sprites/belt/built/forward_6.png": { - "frame": {"x":47,"y":954,"w":40,"h":48}, + "frame": {"x":239,"y":789,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -58,7 +58,7 @@ }, "sprites/belt/built/forward_7.png": { - "frame": {"x":91,"y":954,"w":40,"h":48}, + "frame": {"x":283,"y":814,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -66,7 +66,7 @@ }, "sprites/belt/built/forward_8.png": { - "frame": {"x":447,"y":752,"w":40,"h":48}, + "frame": {"x":327,"y":814,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -74,7 +74,7 @@ }, "sprites/belt/built/forward_9.png": { - "frame": {"x":389,"y":790,"w":40,"h":48}, + "frame": {"x":371,"y":847,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -82,7 +82,7 @@ }, "sprites/belt/built/forward_10.png": { - "frame": {"x":294,"y":756,"w":40,"h":48}, + "frame": {"x":381,"y":795,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -90,7 +90,7 @@ }, "sprites/belt/built/forward_11.png": { - "frame": {"x":243,"y":788,"w":40,"h":48}, + "frame": {"x":425,"y":796,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -98,7 +98,7 @@ }, "sprites/belt/built/forward_12.png": { - "frame": {"x":195,"y":799,"w":40,"h":48}, + "frame": {"x":469,"y":796,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -106,7 +106,7 @@ }, "sprites/belt/built/forward_13.png": { - "frame": {"x":147,"y":840,"w":40,"h":48}, + "frame": {"x":195,"y":789,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -114,7 +114,7 @@ }, "sprites/belt/built/left_0.png": { - "frame": {"x":54,"y":662,"w":44,"h":44}, + "frame": {"x":51,"y":624,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -122,7 +122,7 @@ }, "sprites/belt/built/left_1.png": { - "frame": {"x":3,"y":668,"w":44,"h":44}, + "frame": {"x":99,"y":658,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -130,7 +130,7 @@ }, "sprites/belt/built/left_2.png": { - "frame": {"x":51,"y":710,"w":44,"h":44}, + "frame": {"x":99,"y":706,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -138,7 +138,7 @@ }, "sprites/belt/built/left_3.png": { - "frame": {"x":3,"y":716,"w":44,"h":44}, + "frame": {"x":51,"y":720,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -146,7 +146,7 @@ }, "sprites/belt/built/left_4.png": { - "frame": {"x":358,"y":653,"w":44,"h":44}, + "frame": {"x":3,"y":722,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -154,7 +154,7 @@ }, "sprites/belt/built/left_5.png": { - "frame": {"x":307,"y":660,"w":44,"h":44}, + "frame": {"x":253,"y":645,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -162,7 +162,7 @@ }, "sprites/belt/built/left_6.png": { - "frame": {"x":201,"y":655,"w":44,"h":44}, + "frame": {"x":301,"y":666,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -170,7 +170,7 @@ }, "sprites/belt/built/left_7.png": { - "frame": {"x":150,"y":696,"w":44,"h":44}, + "frame": {"x":349,"y":666,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -178,7 +178,7 @@ }, "sprites/belt/built/left_8.png": { - "frame": {"x":99,"y":732,"w":44,"h":44}, + "frame": {"x":397,"y":699,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -186,7 +186,7 @@ }, "sprites/belt/built/left_9.png": { - "frame": {"x":51,"y":758,"w":44,"h":44}, + "frame": {"x":445,"y":700,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -194,7 +194,7 @@ }, "sprites/belt/built/left_10.png": { - "frame": {"x":310,"y":612,"w":44,"h":44}, + "frame": {"x":51,"y":672,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -202,7 +202,7 @@ }, "sprites/belt/built/left_11.png": { - "frame": {"x":259,"y":644,"w":44,"h":44}, + "frame": {"x":3,"y":674,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -210,7 +210,7 @@ }, "sprites/belt/built/left_12.png": { - "frame": {"x":153,"y":648,"w":44,"h":44}, + "frame": {"x":205,"y":645,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -218,7 +218,7 @@ }, "sprites/belt/built/left_13.png": { - "frame": {"x":102,"y":684,"w":44,"h":44}, + "frame": {"x":147,"y":689,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -226,7 +226,7 @@ }, "sprites/belt/built/right_0.png": { - "frame": {"x":3,"y":764,"w":44,"h":44}, + "frame": {"x":195,"y":693,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -234,7 +234,7 @@ }, "sprites/belt/built/right_1.png": { - "frame": {"x":249,"y":692,"w":44,"h":44}, + "frame": {"x":147,"y":737,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -242,7 +242,7 @@ }, "sprites/belt/built/right_2.png": { - "frame": {"x":3,"y":812,"w":44,"h":44}, + "frame": {"x":291,"y":714,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -250,7 +250,7 @@ }, "sprites/belt/built/right_3.png": { - "frame": {"x":406,"y":690,"w":44,"h":44}, + "frame": {"x":339,"y":714,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -258,7 +258,7 @@ }, "sprites/belt/built/right_4.png": { - "frame": {"x":355,"y":701,"w":44,"h":44}, + "frame": {"x":387,"y":747,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -266,7 +266,7 @@ }, "sprites/belt/built/right_5.png": { - "frame": {"x":297,"y":708,"w":44,"h":44}, + "frame": {"x":435,"y":748,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -274,7 +274,7 @@ }, "sprites/belt/built/right_6.png": { - "frame": {"x":246,"y":740,"w":44,"h":44}, + "frame": {"x":195,"y":741,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -282,7 +282,7 @@ }, "sprites/belt/built/right_7.png": { - "frame": {"x":195,"y":751,"w":44,"h":44}, + "frame": {"x":147,"y":785,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -290,7 +290,7 @@ }, "sprites/belt/built/right_8.png": { - "frame": {"x":147,"y":792,"w":44,"h":44}, + "frame": {"x":99,"y":802,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -298,7 +298,7 @@ }, "sprites/belt/built/right_9.png": { - "frame": {"x":99,"y":828,"w":44,"h":44}, + "frame": {"x":51,"y":816,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -306,7 +306,7 @@ }, "sprites/belt/built/right_10.png": { - "frame": {"x":198,"y":703,"w":44,"h":44}, + "frame": {"x":99,"y":754,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -314,7 +314,7 @@ }, "sprites/belt/built/right_11.png": { - "frame": {"x":147,"y":744,"w":44,"h":44}, + "frame": {"x":51,"y":768,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -322,7 +322,7 @@ }, "sprites/belt/built/right_12.png": { - "frame": {"x":99,"y":780,"w":44,"h":44}, + "frame": {"x":3,"y":770,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -330,7 +330,7 @@ }, "sprites/belt/built/right_13.png": { - "frame": {"x":51,"y":806,"w":44,"h":44}, + "frame": {"x":243,"y":693,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -338,7 +338,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":51,"y":854,"w":44,"h":44}, + "frame": {"x":3,"y":818,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -346,7 +346,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":3,"y":860,"w":44,"h":44}, + "frame": {"x":243,"y":741,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -354,7 +354,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":338,"y":801,"w":40,"h":48}, + "frame": {"x":191,"y":841,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -386,10 +386,10 @@ }, "sprites/blueprints/display.png": { - "frame": {"x":209,"y":562,"w":46,"h":47}, + "frame": {"x":157,"y":639,"w":44,"h":46}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":1,"y":1,"w":46,"h":47}, + "spriteSourceSize": {"x":2,"y":2,"w":44,"h":46}, "sourceSize": {"w":48,"h":48} }, "sprites/blueprints/filter.png": @@ -410,7 +410,7 @@ }, "sprites/blueprints/logic_gate-not.png": { - "frame": {"x":467,"y":648,"w":42,"h":48}, + "frame": {"x":291,"y":762,"w":42,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":42,"h":48}, @@ -418,7 +418,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":311,"y":566,"w":48,"h":42}, + "frame": {"x":426,"y":602,"w":48,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":42}, @@ -442,7 +442,7 @@ }, "sprites/blueprints/logic_gate.png": { - "frame": {"x":369,"y":515,"w":48,"h":45}, + "frame": {"x":426,"y":553,"w":48,"h":45}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":45}, @@ -458,7 +458,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":107,"y":532,"w":47,"h":48}, + "frame": {"x":211,"y":593,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -538,7 +538,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":158,"y":555,"w":47,"h":47}, + "frame": {"x":364,"y":615,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -578,7 +578,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":369,"y":564,"w":48,"h":43}, + "frame": {"x":315,"y":567,"w":48,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":48,"h":43}, @@ -586,7 +586,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":363,"y":611,"w":48,"h":38}, + "frame": {"x":55,"y":500,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -594,7 +594,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":415,"y":648,"w":48,"h":38}, + "frame": {"x":107,"y":500,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -602,7 +602,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":3,"y":500,"w":48,"h":38}, + "frame": {"x":159,"y":523,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -618,7 +618,7 @@ }, "sprites/blueprints/wire-split.png": { - "frame": {"x":55,"y":500,"w":48,"h":28}, + "frame": {"x":211,"y":561,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -640,9 +640,17 @@ "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, "sourceSize": {"w":48,"h":48} }, +"sprites/blueprints/wire_tunnel-coating.png": +{ + "frame": {"x":253,"y":458,"w":13,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":17,"y":0,"w":13,"h":47}, + "sourceSize": {"w":48,"h":48} +}, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":317,"y":515,"w":48,"h":47}, + "frame": {"x":263,"y":542,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -650,7 +658,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":54,"y":662,"w":44,"h":44}, + "frame": {"x":51,"y":624,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -658,7 +666,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":3,"y":764,"w":44,"h":44}, + "frame": {"x":195,"y":693,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -666,7 +674,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":403,"y":738,"w":40,"h":48}, + "frame": {"x":415,"y":463,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -698,7 +706,7 @@ }, "sprites/buildings/display.png": { - "frame": {"x":105,"y":634,"w":44,"h":46}, + "frame": {"x":3,"y":624,"w":44,"h":46}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":44,"h":46}, @@ -730,7 +738,7 @@ }, "sprites/buildings/logic_gate-not.png": { - "frame": {"x":454,"y":700,"w":43,"h":48}, + "frame": {"x":466,"y":648,"w":43,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":43,"h":48}, @@ -738,7 +746,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":421,"y":602,"w":48,"h":42}, + "frame": {"x":3,"y":500,"w":48,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":42}, @@ -762,7 +770,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":421,"y":553,"w":48,"h":45}, + "frame": {"x":374,"y":566,"w":48,"h":45}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":45}, @@ -770,7 +778,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":55,"y":564,"w":47,"h":48}, + "frame": {"x":262,"y":593,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -778,7 +786,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":3,"y":574,"w":47,"h":48}, + "frame": {"x":313,"y":614,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -850,7 +858,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":259,"y":542,"w":48,"h":47}, + "frame": {"x":374,"y":515,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -858,7 +866,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":259,"y":593,"w":47,"h":47}, + "frame": {"x":415,"y":648,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -898,7 +906,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":54,"y":616,"w":47,"h":42}, + "frame": {"x":3,"y":578,"w":47,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":47,"h":42}, @@ -906,7 +914,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":3,"y":626,"w":47,"h":38}, + "frame": {"x":106,"y":574,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -914,7 +922,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":157,"y":606,"w":47,"h":38}, + "frame": {"x":157,"y":597,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -922,7 +930,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":208,"y":613,"w":47,"h":38}, + "frame": {"x":106,"y":616,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -930,7 +938,7 @@ }, "sprites/buildings/wire-cross.png": { - "frame": {"x":265,"y":490,"w":48,"h":48}, + "frame": {"x":270,"y":490,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -938,7 +946,7 @@ }, "sprites/buildings/wire-split.png": { - "frame": {"x":107,"y":500,"w":48,"h":28}, + "frame": {"x":55,"y":542,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -954,15 +962,23 @@ }, "sprites/buildings/wire.png": { - "frame": {"x":253,"y":458,"w":8,"h":48}, + "frame": {"x":327,"y":453,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, "sourceSize": {"w":48,"h":48} }, +"sprites/buildings/wire_tunnel-coating.png": +{ + "frame": {"x":235,"y":478,"w":12,"h":46}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":18,"y":1,"w":12,"h":46}, + "sourceSize": {"w":48,"h":48} +}, "sprites/buildings/wire_tunnel.png": { - "frame": {"x":106,"y":584,"w":47,"h":46}, + "frame": {"x":55,"y":574,"w":47,"h":46}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":46}, @@ -1130,7 +1146,7 @@ }, "sprites/wires/sets/color_cross.png": { - "frame": {"x":339,"y":463,"w":48,"h":48}, + "frame": {"x":363,"y":463,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1138,7 +1154,7 @@ }, "sprites/wires/sets/color_forward.png": { - "frame": {"x":235,"y":478,"w":8,"h":48}, + "frame": {"x":251,"y":509,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -1146,7 +1162,7 @@ }, "sprites/wires/sets/color_split.png": { - "frame": {"x":159,"y":523,"w":48,"h":28}, + "frame": {"x":3,"y":546,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -1162,7 +1178,7 @@ }, "sprites/wires/sets/conflict_cross.png": { - "frame": {"x":391,"y":463,"w":48,"h":48}, + "frame": {"x":459,"y":501,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1170,7 +1186,7 @@ }, "sprites/wires/sets/conflict_forward.png": { - "frame": {"x":327,"y":453,"w":8,"h":48}, + "frame": {"x":339,"y":453,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -1178,7 +1194,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":55,"y":532,"w":48,"h":28}, + "frame": {"x":107,"y":542,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -1194,7 +1210,7 @@ }, "sprites/wires/sets/regular_cross.png": { - "frame": {"x":265,"y":490,"w":48,"h":48}, + "frame": {"x":270,"y":490,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1202,7 +1218,7 @@ }, "sprites/wires/sets/regular_forward.png": { - "frame": {"x":253,"y":458,"w":8,"h":48}, + "frame": {"x":327,"y":453,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -1210,7 +1226,7 @@ }, "sprites/wires/sets/regular_split.png": { - "frame": {"x":107,"y":500,"w":48,"h":28}, + "frame": {"x":55,"y":542,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -1226,7 +1242,7 @@ }, "sprites/wires/sets/shape_cross.png": { - "frame": {"x":443,"y":501,"w":48,"h":48}, + "frame": {"x":322,"y":515,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1234,7 +1250,7 @@ }, "sprites/wires/sets/shape_forward.png": { - "frame": {"x":247,"y":510,"w":8,"h":48}, + "frame": {"x":351,"y":453,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -1242,7 +1258,7 @@ }, "sprites/wires/sets/shape_split.png": { - "frame": {"x":3,"y":542,"w":48,"h":28}, + "frame": {"x":159,"y":565,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -1271,6 +1287,6 @@ "format": "RGBA8888", "size": {"w":512,"h":1024}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:cd3efb179b186695586b2a19b2f23e1a:1f2545bea0c9df078662c1e6b25aa6f5:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:2d1cf13d72f57d35286eff6ea2dc4baf:37ea54415549690e46769bf06ba5be07:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_lq.png b/res_built/atlas/atlas0_lq.png index 8f5b6dac..dfd0dad7 100644 Binary files a/res_built/atlas/atlas0_lq.png and b/res_built/atlas/atlas0_lq.png differ diff --git a/res_built/atlas/atlas0_mq.json b/res_built/atlas/atlas0_mq.json index a11cedf6..ccd1535b 100644 --- a/res_built/atlas/atlas0_mq.json +++ b/res_built/atlas/atlas0_mq.json @@ -2,7 +2,7 @@ "sprites/belt/built/forward_0.png": { - "frame": {"x":458,"y":1404,"w":78,"h":96}, + "frame": {"x":940,"y":816,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -10,7 +10,7 @@ }, "sprites/belt/built/forward_1.png": { - "frame": {"x":367,"y":1488,"w":78,"h":96}, + "frame": {"x":560,"y":1376,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -18,7 +18,7 @@ }, "sprites/belt/built/forward_2.png": { - "frame": {"x":838,"y":1249,"w":78,"h":96}, + "frame": {"x":94,"y":1598,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -26,7 +26,7 @@ }, "sprites/belt/built/forward_3.png": { - "frame": {"x":741,"y":1338,"w":78,"h":96}, + "frame": {"x":3,"y":1668,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -34,7 +34,7 @@ }, "sprites/belt/built/forward_4.png": { - "frame": {"x":640,"y":1435,"w":78,"h":96}, + "frame": {"x":843,"y":1305,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -42,7 +42,7 @@ }, "sprites/belt/built/forward_5.png": { - "frame": {"x":540,"y":1450,"w":78,"h":96}, + "frame": {"x":743,"y":1402,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -50,7 +50,7 @@ }, "sprites/belt/built/forward_6.png": { - "frame": {"x":449,"y":1504,"w":78,"h":96}, + "frame": {"x":925,"y":1305,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -58,7 +58,7 @@ }, "sprites/belt/built/forward_7.png": { - "frame": {"x":358,"y":1588,"w":78,"h":96}, + "frame": {"x":642,"y":1458,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -66,7 +66,7 @@ }, "sprites/belt/built/forward_8.png": { - "frame": {"x":267,"y":1652,"w":78,"h":96}, + "frame": {"x":545,"y":1476,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -74,7 +74,7 @@ }, "sprites/belt/built/forward_9.png": { - "frame": {"x":176,"y":1704,"w":78,"h":96}, + "frame": {"x":449,"y":1553,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -82,7 +82,7 @@ }, "sprites/belt/built/forward_10.png": { - "frame": {"x":276,"y":1552,"w":78,"h":96}, + "frame": {"x":463,"y":1453,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -90,7 +90,7 @@ }, "sprites/belt/built/forward_11.png": { - "frame": {"x":185,"y":1604,"w":78,"h":96}, + "frame": {"x":367,"y":1514,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -98,7 +98,7 @@ }, "sprites/belt/built/forward_12.png": { - "frame": {"x":94,"y":1639,"w":78,"h":96}, + "frame": {"x":276,"y":1553,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -106,7 +106,7 @@ }, "sprites/belt/built/forward_13.png": { - "frame": {"x":3,"y":1646,"w":78,"h":96}, + "frame": {"x":185,"y":1594,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -114,7 +114,7 @@ }, "sprites/belt/built/left_0.png": { - "frame": {"x":640,"y":808,"w":87,"h":87}, + "frame": {"x":392,"y":1150,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -122,7 +122,7 @@ }, "sprites/belt/built/left_1.png": { - "frame": {"x":638,"y":899,"w":87,"h":87}, + "frame": {"x":293,"y":1189,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -130,7 +130,7 @@ }, "sprites/belt/built/left_2.png": { - "frame": {"x":190,"y":1240,"w":87,"h":87}, + "frame": {"x":483,"y":1180,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -138,7 +138,7 @@ }, "sprites/belt/built/left_3.png": { - "frame": {"x":94,"y":1275,"w":87,"h":87}, + "frame": {"x":384,"y":1241,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -146,7 +146,7 @@ }, "sprites/belt/built/left_4.png": { - "frame": {"x":3,"y":1282,"w":87,"h":87}, + "frame": {"x":287,"y":1280,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -154,7 +154,7 @@ }, "sprites/belt/built/left_5.png": { - "frame": {"x":477,"y":1131,"w":87,"h":87}, + "frame": {"x":190,"y":1321,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -162,7 +162,7 @@ }, "sprites/belt/built/left_6.png": { - "frame": {"x":381,"y":1215,"w":87,"h":87}, + "frame": {"x":94,"y":1325,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -170,7 +170,7 @@ }, "sprites/belt/built/left_7.png": { - "frame": {"x":281,"y":1279,"w":87,"h":87}, + "frame": {"x":3,"y":1395,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -178,7 +178,7 @@ }, "sprites/belt/built/left_8.png": { - "frame": {"x":185,"y":1331,"w":87,"h":87}, + "frame": {"x":679,"y":1176,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -186,7 +186,7 @@ }, "sprites/belt/built/left_9.png": { - "frame": {"x":94,"y":1366,"w":87,"h":87}, + "frame": {"x":574,"y":1194,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -194,7 +194,7 @@ }, "sprites/belt/built/left_10.png": { - "frame": {"x":99,"y":1184,"w":87,"h":87}, + "frame": {"x":196,"y":1230,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -202,7 +202,7 @@ }, "sprites/belt/built/left_11.png": { - "frame": {"x":3,"y":1191,"w":87,"h":87}, + "frame": {"x":99,"y":1234,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -210,7 +210,7 @@ }, "sprites/belt/built/left_12.png": { - "frame": {"x":386,"y":1124,"w":87,"h":87}, + "frame": {"x":3,"y":1304,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -218,7 +218,7 @@ }, "sprites/belt/built/left_13.png": { - "frame": {"x":290,"y":1188,"w":87,"h":87}, + "frame": {"x":588,"y":1103,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -226,7 +226,7 @@ }, "sprites/belt/built/right_0.png": { - "frame": {"x":3,"y":1373,"w":87,"h":87}, + "frame": {"x":475,"y":1271,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -234,7 +234,7 @@ }, "sprites/belt/built/right_1.png": { - "frame": {"x":568,"y":1168,"w":87,"h":87}, + "frame": {"x":378,"y":1332,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -242,7 +242,7 @@ }, "sprites/belt/built/right_2.png": { - "frame": {"x":94,"y":1457,"w":87,"h":87}, + "frame": {"x":770,"y":1211,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -250,7 +250,7 @@ }, "sprites/belt/built/right_3.png": { - "frame": {"x":3,"y":1464,"w":87,"h":87}, + "frame": {"x":665,"y":1267,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -258,7 +258,7 @@ }, "sprites/belt/built/right_4.png": { - "frame": {"x":659,"y":1244,"w":87,"h":87}, + "frame": {"x":566,"y":1285,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -266,7 +266,7 @@ }, "sprites/belt/built/right_5.png": { - "frame": {"x":563,"y":1259,"w":87,"h":87}, + "frame": {"x":469,"y":1362,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -274,7 +274,7 @@ }, "sprites/belt/built/right_6.png": { - "frame": {"x":463,"y":1313,"w":87,"h":87}, + "frame": {"x":372,"y":1423,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -282,7 +282,7 @@ }, "sprites/belt/built/right_7.png": { - "frame": {"x":367,"y":1397,"w":87,"h":87}, + "frame": {"x":276,"y":1462,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -290,7 +290,7 @@ }, "sprites/belt/built/right_8.png": { - "frame": {"x":276,"y":1461,"w":87,"h":87}, + "frame": {"x":185,"y":1503,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -298,7 +298,7 @@ }, "sprites/belt/built/right_9.png": { - "frame": {"x":185,"y":1513,"w":87,"h":87}, + "frame": {"x":94,"y":1507,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -306,7 +306,7 @@ }, "sprites/belt/built/right_10.png": { - "frame": {"x":472,"y":1222,"w":87,"h":87}, + "frame": {"x":281,"y":1371,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -314,7 +314,7 @@ }, "sprites/belt/built/right_11.png": { - "frame": {"x":372,"y":1306,"w":87,"h":87}, + "frame": {"x":185,"y":1412,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -322,7 +322,7 @@ }, "sprites/belt/built/right_12.png": { - "frame": {"x":276,"y":1370,"w":87,"h":87}, + "frame": {"x":94,"y":1416,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -330,7 +330,7 @@ }, "sprites/belt/built/right_13.png": { - "frame": {"x":185,"y":1422,"w":87,"h":87}, + "frame": {"x":3,"y":1486,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -338,7 +338,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":94,"y":1548,"w":87,"h":87}, + "frame": {"x":3,"y":1577,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -346,7 +346,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":3,"y":1555,"w":87,"h":87}, + "frame": {"x":861,"y":1214,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -354,7 +354,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":85,"y":1739,"w":78,"h":96}, + "frame": {"x":358,"y":1614,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -386,10 +386,10 @@ }, "sprites/blueprints/display.png": { - "frame": {"x":195,"y":1143,"w":91,"h":93}, + "frame": {"x":640,"y":914,"w":86,"h":91}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":3,"y":3,"w":91,"h":93}, + "spriteSourceSize": {"x":5,"y":5,"w":86,"h":91}, "sourceSize": {"w":96,"h":96} }, "sprites/blueprints/filter.png": @@ -402,7 +402,7 @@ }, "sprites/blueprints/lever.png": { - "frame": {"x":831,"y":794,"w":74,"h":78}, + "frame": {"x":946,"y":734,"w":74,"h":78}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":11,"w":74,"h":78}, @@ -410,7 +410,7 @@ }, "sprites/blueprints/logic_gate-not.png": { - "frame": {"x":654,"y":1335,"w":83,"h":96}, + "frame": {"x":756,"y":1302,"w":83,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":83,"h":96}, @@ -418,7 +418,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":103,"y":874,"w":96,"h":82}, + "frame": {"x":730,"y":990,"w":96,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":82}, @@ -426,7 +426,7 @@ }, "sprites/blueprints/logic_gate-transistor.png": { - "frame": {"x":828,"y":956,"w":68,"h":96}, + "frame": {"x":449,"y":703,"w":68,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":68,"h":96}, @@ -434,7 +434,7 @@ }, "sprites/blueprints/logic_gate-xor.png": { - "frame": {"x":921,"y":654,"w":96,"h":96}, + "frame": {"x":3,"y":674,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -442,7 +442,7 @@ }, "sprites/blueprints/logic_gate.png": { - "frame": {"x":340,"y":799,"w":96,"h":89}, + "frame": {"x":440,"y":899,"w":96,"h":89}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":89}, @@ -450,7 +450,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":726,"y":1144,"w":92,"h":96}, + "frame": {"x":396,"y":1050,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -458,7 +458,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":898,"y":1149,"w":92,"h":96}, + "frame": {"x":296,"y":1089,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -506,7 +506,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":910,"y":754,"w":96,"h":96}, + "frame": {"x":103,"y":674,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -514,7 +514,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":440,"y":857,"w":95,"h":96}, + "frame": {"x":728,"y":1076,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":95,"h":96}, @@ -522,7 +522,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":731,"y":794,"w":96,"h":96}, + "frame": {"x":203,"y":674,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -530,7 +530,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":729,"y":952,"w":95,"h":93}, + "frame": {"x":102,"y":874,"w":95,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":95,"h":93}, @@ -538,7 +538,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":338,"y":992,"w":93,"h":93}, + "frame": {"x":102,"y":971,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":1,"w":93,"h":93}, @@ -546,7 +546,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":735,"y":694,"w":171,"h":96}, + "frame": {"x":3,"y":574,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -562,7 +562,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":353,"y":603,"w":167,"h":192}, + "frame": {"x":528,"y":603,"w":167,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":167,"h":192}, @@ -570,7 +570,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":909,"y":854,"w":96,"h":96}, + "frame": {"x":349,"y":703,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -578,7 +578,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":435,"y":1036,"w":93,"h":84}, + "frame": {"x":199,"y":1048,"w":93,"h":84}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":12,"w":93,"h":84}, @@ -586,7 +586,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":532,"y":1052,"w":93,"h":75}, + "frame": {"x":100,"y":1068,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":21,"w":93,"h":75}, @@ -594,7 +594,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":439,"y":957,"w":94,"h":75}, + "frame": {"x":201,"y":969,"w":94,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":94,"h":75}, @@ -602,7 +602,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":629,"y":1089,"w":93,"h":75}, + "frame": {"x":3,"y":1069,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":93,"h":75}, @@ -610,7 +610,7 @@ }, "sprites/blueprints/wire-cross.png": { - "frame": {"x":908,"y":954,"w":96,"h":96}, + "frame": {"x":521,"y":799,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -618,7 +618,7 @@ }, "sprites/blueprints/wire-split.png": { - "frame": {"x":103,"y":960,"w":96,"h":55}, + "frame": {"x":830,"y":994,"w":96,"h":55}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":41,"w":96,"h":55}, @@ -634,15 +634,23 @@ }, "sprites/blueprints/wire.png": { - "frame": {"x":717,"y":597,"w":14,"h":96}, + "frame": {"x":699,"y":603,"w":14,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":41,"y":0,"w":14,"h":96}, "sourceSize": {"w":96,"h":96} }, +"sprites/blueprints/wire_tunnel-coating.png": +{ + "frame": {"x":921,"y":594,"w":23,"h":91}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":36,"y":2,"w":23,"h":91}, + "sourceSize": {"w":96,"h":96} +}, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":537,"y":957,"w":93,"h":91}, + "frame": {"x":3,"y":974,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":93,"h":91}, @@ -650,7 +658,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":640,"y":808,"w":87,"h":87}, + "frame": {"x":392,"y":1150,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -658,7 +666,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":3,"y":1373,"w":87,"h":87}, + "frame": {"x":475,"y":1271,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -666,7 +674,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":458,"y":1404,"w":78,"h":96}, + "frame": {"x":940,"y":816,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -690,7 +698,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":3,"y":574,"w":171,"h":96}, + "frame": {"x":178,"y":574,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -698,7 +706,7 @@ }, "sprites/buildings/display.png": { - "frame": {"x":750,"y":1244,"w":84,"h":90}, + "frame": {"x":640,"y":1009,"w":84,"h":90}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":84,"h":90}, @@ -730,7 +738,7 @@ }, "sprites/buildings/logic_gate-not.png": { - "frame": {"x":554,"y":1350,"w":82,"h":96}, + "frame": {"x":657,"y":1358,"w":82,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":82,"h":96}, @@ -738,7 +746,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":3,"y":874,"w":96,"h":83}, + "frame": {"x":540,"y":899,"w":96,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":83}, @@ -746,7 +754,7 @@ }, "sprites/buildings/logic_gate-transistor.png": { - "frame": {"x":826,"y":1056,"w":68,"h":96}, + "frame": {"x":621,"y":799,"w":68,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":68,"h":96}, @@ -754,7 +762,7 @@ }, "sprites/buildings/logic_gate-xor.png": { - "frame": {"x":203,"y":774,"w":96,"h":95}, + "frame": {"x":340,"y":803,"w":96,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":95}, @@ -762,7 +770,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":203,"y":873,"w":96,"h":88}, + "frame": {"x":339,"y":902,"w":96,"h":88}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":88}, @@ -770,7 +778,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":634,"y":990,"w":91,"h":95}, + "frame": {"x":930,"y":916,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -778,7 +786,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":291,"y":1089,"w":91,"h":95}, + "frame": {"x":930,"y":1015,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -826,7 +834,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":340,"y":892,"w":95,"h":96}, + "frame": {"x":827,"y":1111,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -834,7 +842,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":203,"y":965,"w":95,"h":96}, + "frame": {"x":926,"y":1114,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":95,"h":96}, @@ -842,7 +850,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":539,"y":857,"w":95,"h":96}, + "frame": {"x":3,"y":874,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -850,7 +858,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":900,"y":1054,"w":94,"h":91}, + "frame": {"x":201,"y":874,"w":94,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":94,"h":91}, @@ -858,7 +866,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":729,"y":1049,"w":93,"h":91}, + "frame": {"x":299,"y":994,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, @@ -866,7 +874,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":178,"y":574,"w":171,"h":96}, + "frame": {"x":353,"y":603,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -882,7 +890,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":524,"y":603,"w":166,"h":192}, + "frame": {"x":733,"y":694,"w":166,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":166,"h":192}, @@ -890,7 +898,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":3,"y":674,"w":96,"h":96}, + "frame": {"x":730,"y":890,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -898,7 +906,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":99,"y":1019,"w":92,"h":83}, + "frame": {"x":100,"y":1147,"w":92,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":13,"w":92,"h":83}, @@ -906,7 +914,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":195,"y":1065,"w":92,"h":74}, + "frame": {"x":3,"y":1148,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":22,"w":92,"h":74}, @@ -914,7 +922,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":99,"y":1106,"w":92,"h":74}, + "frame": {"x":3,"y":1226,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -922,7 +930,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":3,"y":1113,"w":92,"h":74}, + "frame": {"x":492,"y":1102,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -930,7 +938,7 @@ }, "sprites/buildings/wire-cross.png": { - "frame": {"x":103,"y":674,"w":96,"h":96}, + "frame": {"x":830,"y":894,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -938,7 +946,7 @@ }, "sprites/buildings/wire-split.png": { - "frame": {"x":3,"y":961,"w":96,"h":54}, + "frame": {"x":830,"y":1053,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -960,9 +968,17 @@ "spriteSourceSize": {"x":42,"y":0,"w":12,"h":96}, "sourceSize": {"w":96,"h":96} }, +"sprites/buildings/wire_tunnel-coating.png": +{ + "frame": {"x":921,"y":689,"w":21,"h":90}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":37,"y":3,"w":21,"h":90}, + "sourceSize": {"w":96,"h":96} +}, "sprites/buildings/wire_tunnel.png": { - "frame": {"x":3,"y":1019,"w":92,"h":90}, + "frame": {"x":197,"y":1136,"w":92,"h":90}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":92,"h":90}, @@ -986,7 +1002,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":303,"y":946,"w":32,"h":32}, + "frame": {"x":303,"y":835,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, @@ -1026,7 +1042,7 @@ }, "sprites/wires/boolean_false.png": { - "frame": {"x":921,"y":594,"w":15,"h":20}, + "frame": {"x":717,"y":597,"w":15,"h":20}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":7,"w":15,"h":20}, @@ -1034,7 +1050,7 @@ }, "sprites/wires/boolean_true.png": { - "frame": {"x":921,"y":618,"w":12,"h":21}, + "frame": {"x":715,"y":721,"w":12,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":6,"w":12,"h":21}, @@ -1042,7 +1058,7 @@ }, "sprites/wires/display/blue.png": { - "frame": {"x":694,"y":697,"w":33,"h":33}, + "frame": {"x":903,"y":783,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1050,7 +1066,7 @@ }, "sprites/wires/display/cyan.png": { - "frame": {"x":694,"y":734,"w":33,"h":33}, + "frame": {"x":903,"y":820,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1058,7 +1074,7 @@ }, "sprites/wires/display/green.png": { - "frame": {"x":694,"y":771,"w":33,"h":33}, + "frame": {"x":903,"y":857,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1066,7 +1082,7 @@ }, "sprites/wires/display/purple.png": { - "frame": {"x":303,"y":798,"w":33,"h":33}, + "frame": {"x":693,"y":803,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1074,7 +1090,7 @@ }, "sprites/wires/display/red.png": { - "frame": {"x":303,"y":835,"w":33,"h":33}, + "frame": {"x":693,"y":840,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1082,7 +1098,7 @@ }, "sprites/wires/display/white.png": { - "frame": {"x":303,"y":872,"w":33,"h":33}, + "frame": {"x":693,"y":877,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1090,7 +1106,7 @@ }, "sprites/wires/display/yellow.png": { - "frame": {"x":303,"y":909,"w":33,"h":33}, + "frame": {"x":303,"y":798,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1098,7 +1114,7 @@ }, "sprites/wires/lever_on.png": { - "frame": {"x":831,"y":876,"w":73,"h":76}, + "frame": {"x":948,"y":654,"w":73,"h":76}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":12,"w":73,"h":76}, @@ -1130,7 +1146,7 @@ }, "sprites/wires/sets/color_cross.png": { - "frame": {"x":203,"y":674,"w":96,"h":96}, + "frame": {"x":3,"y":774,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1146,7 +1162,7 @@ }, "sprites/wires/sets/color_split.png": { - "frame": {"x":440,"y":799,"w":96,"h":54}, + "frame": {"x":540,"y":986,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -1162,7 +1178,7 @@ }, "sprites/wires/sets/conflict_cross.png": { - "frame": {"x":3,"y":774,"w":96,"h":96}, + "frame": {"x":103,"y":774,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1170,7 +1186,7 @@ }, "sprites/wires/sets/conflict_forward.png": { - "frame": {"x":1009,"y":854,"w":12,"h":96}, + "frame": {"x":717,"y":621,"w":12,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":42,"y":0,"w":12,"h":96}, @@ -1178,7 +1194,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":540,"y":799,"w":96,"h":54}, + "frame": {"x":439,"y":992,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -1194,7 +1210,7 @@ }, "sprites/wires/sets/regular_cross.png": { - "frame": {"x":103,"y":674,"w":96,"h":96}, + "frame": {"x":830,"y":894,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1210,7 +1226,7 @@ }, "sprites/wires/sets/regular_split.png": { - "frame": {"x":3,"y":961,"w":96,"h":54}, + "frame": {"x":830,"y":1053,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -1226,7 +1242,7 @@ }, "sprites/wires/sets/shape_cross.png": { - "frame": {"x":103,"y":774,"w":96,"h":96}, + "frame": {"x":203,"y":774,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1234,7 +1250,7 @@ }, "sprites/wires/sets/shape_forward.png": { - "frame": {"x":1008,"y":954,"w":12,"h":96}, + "frame": {"x":699,"y":703,"w":12,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":42,"y":0,"w":12,"h":96}, @@ -1242,7 +1258,7 @@ }, "sprites/wires/sets/shape_split.png": { - "frame": {"x":731,"y":894,"w":96,"h":54}, + "frame": {"x":539,"y":1044,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -1258,7 +1274,7 @@ }, "sprites/wires/wires_preview.png": { - "frame": {"x":302,"y":982,"w":32,"h":32}, + "frame": {"x":303,"y":871,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, @@ -1271,6 +1287,6 @@ "format": "RGBA8888", "size": {"w":1024,"h":2048}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:cd3efb179b186695586b2a19b2f23e1a:1f2545bea0c9df078662c1e6b25aa6f5:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:2d1cf13d72f57d35286eff6ea2dc4baf:37ea54415549690e46769bf06ba5be07:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_mq.png b/res_built/atlas/atlas0_mq.png index 3cc258e1..95701326 100644 Binary files a/res_built/atlas/atlas0_mq.png and b/res_built/atlas/atlas0_mq.png differ diff --git a/res_raw/sprites/blueprints/display.png b/res_raw/sprites/blueprints/display.png index 8e5a8ba5..bb0319f2 100644 Binary files a/res_raw/sprites/blueprints/display.png and b/res_raw/sprites/blueprints/display.png differ diff --git a/res_raw/sprites/blueprints/wire_tunnel-coating.png b/res_raw/sprites/blueprints/wire_tunnel-coating.png new file mode 100644 index 00000000..381e628a Binary files /dev/null and b/res_raw/sprites/blueprints/wire_tunnel-coating.png differ diff --git a/res_raw/sprites/buildings/wire_tunnel-coating.png b/res_raw/sprites/buildings/wire_tunnel-coating.png new file mode 100644 index 00000000..aed6c8cb Binary files /dev/null and b/res_raw/sprites/buildings/wire_tunnel-coating.png differ diff --git a/src/css/common.scss b/src/css/common.scss index b8f02d40..368af699 100644 --- a/src/css/common.scss +++ b/src/css/common.scss @@ -318,9 +318,9 @@ input { canvas { pointer-events: all; - image-rendering: pixelated; + // image-rendering: pixelated; // &.smoothed { - // } + // }1 // &.unsmoothed { // } letter-spacing: 0 !important; diff --git a/src/js/game/buildings/wire_tunnel.js b/src/js/game/buildings/wire_tunnel.js index 9dd570e6..80ab8799 100644 --- a/src/js/game/buildings/wire_tunnel.js +++ b/src/js/game/buildings/wire_tunnel.js @@ -1,8 +1,19 @@ import { Vector } from "../../core/vector"; import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; +import { MetaBuilding, defaultBuildingVariant } from "../meta_building"; import { GameRoot, enumLayer } from "../root"; import { WireTunnelComponent } from "../components/wire_tunnel"; +import { generateMatrixRotations } from "../../core/utils"; + +/** @enum {string} */ +export const enumWireTunnelVariants = { + coating: "coating", +}; + +const wireTunnelOverlayMatrices = { + [defaultBuildingVariant]: generateMatrixRotations([0, 1, 0, 1, 1, 1, 0, 1, 0]), + [enumWireTunnelVariants.coating]: generateMatrixRotations([0, 1, 0, 0, 1, 0, 0, 1, 0]), +}; export class MetaWireTunnelBuilding extends MetaBuilding { constructor() { @@ -10,7 +21,7 @@ export class MetaWireTunnelBuilding extends MetaBuilding { } getSilhouetteColor() { - return "#25fff2"; + return "#777a86"; } /** @@ -21,23 +32,55 @@ export class MetaWireTunnelBuilding extends MetaBuilding { return true; } - getIsRotateable() { - return false; + /** + * + * @param {number} rotation + * @param {number} rotationVariant + * @param {string} variant + * @param {Entity} entity + */ + getSpecialOverlayRenderMatrix(rotation, rotationVariant, variant, entity) { + return wireTunnelOverlayMatrices[variant][rotation]; + } + + getIsRotateable(variant) { + return variant !== defaultBuildingVariant; } getDimensions() { return new Vector(1, 1); } + getAvailableVariants() { + return [defaultBuildingVariant, enumWireTunnelVariants.coating]; + } + getLayer() { return enumLayer.wires; } + getRotateAutomaticallyWhilePlacing() { + return true; + } + + getStayInPlacementMode() { + return true; + } + /** * Creates the entity at the given location * @param {Entity} entity */ setupEntityComponents(entity) { - entity.addComponent(new WireTunnelComponent()); + entity.addComponent(new WireTunnelComponent({})); + } + + /** + * @param {Entity} entity + * @param {number} rotationVariant + * @param {string} variant + */ + updateVariants(entity, rotationVariant, variant) { + entity.components.WireTunnel.multipleDirections = variant === defaultBuildingVariant; } } diff --git a/src/js/game/components/wire_tunnel.js b/src/js/game/components/wire_tunnel.js index 226630ca..c365c680 100644 --- a/src/js/game/components/wire_tunnel.js +++ b/src/js/game/components/wire_tunnel.js @@ -6,6 +6,15 @@ export class WireTunnelComponent extends Component { } duplicateWithoutContents() { - return new WireTunnelComponent(); + return new WireTunnelComponent({ multipleDirections: this.multipleDirections }); + } + + /** + * @param {object} param0 + * @param {boolean=} param0.multipleDirections + */ + constructor({ multipleDirections = true }) { + super(); + this.multipleDirections = multipleDirections; } } diff --git a/src/js/game/logic.js b/src/js/game/logic.js index 28690baf..fe2bb5bb 100644 --- a/src/js/game/logic.js +++ b/src/js/game/logic.js @@ -1,13 +1,7 @@ import { createLogger } from "../core/logging"; import { STOP_PROPAGATION } from "../core/signal"; import { round2Digits } from "../core/utils"; -import { - enumDirection, - enumDirectionToAngle, - enumDirectionToVector, - enumInvertedDirections, - Vector, -} from "../core/vector"; +import { enumDirection, enumDirectionToVector, enumInvertedDirections, Vector } from "../core/vector"; import { Entity } from "./entity"; import { MetaBuilding } from "./meta_building"; import { enumLayer, GameRoot } from "./root"; @@ -17,7 +11,6 @@ const logger = createLogger("ingame/logic"); /** @enum {number} */ export const enumWireEdgeFlag = { empty: 0, - filled: 1, connected: 2, }; @@ -215,10 +208,6 @@ export class GameLogic { return false; } - if (neighbourStatus === enumWireEdgeFlag.filled) { - return true; - } - if (neighbourStatus === enumWireEdgeFlag.connected) { return true; } @@ -273,10 +262,21 @@ export class GameLogic { return enumWireEdgeFlag.empty; } + const targetStaticComp = targetEntity.components.StaticMapEntity; + // Check if its a crossing const wireTunnelComp = targetEntity.components.WireTunnel; if (wireTunnelComp) { - return enumWireEdgeFlag.filled; + // Check if the crossing is connected + if (wireTunnelComp.multipleDirections) { + return enumWireEdgeFlag.connected; + } else { + // Its a coating, check if it matches the direction + const referenceDirection = targetStaticComp.localDirectionToWorld(enumDirection.top); + return referenceDirection === edge || enumInvertedDirections[referenceDirection] === edge + ? enumWireEdgeFlag.connected + : enumWireEdgeFlag.empty; + } } // Check if its a wire @@ -285,15 +285,9 @@ export class GameLogic { return enumWireEdgeFlag.empty; } - const refAngle = enumDirectionToAngle[edge]; - const refRotation = targetEntity.components.StaticMapEntity.originalRotation; - const canConnectRemotely = refRotation === refAngle || (refRotation + 180) % 360 === refAngle; - - // Check if the wire points towards the right direction - if (!canConnectRemotely) { - // Seems its not the right direction - well, still its filled - return enumWireEdgeFlag.filled; - } + // const refAngle = enumDirectionToAngle[edge]; + // const refRotation = targetEntity.components.StaticMapEntity.originalRotation; + // const canConnectRemotely = refRotation === refAngle || (refRotation + 180) % 360 === refAngle; // Actually connected return enumWireEdgeFlag.connected; diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js index 9d15b452..7bf3b097 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -19,7 +19,7 @@ import { MetaConstantSignalBuilding } from "./buildings/constant_signal"; import { MetaLogicGateBuilding, enumLogicGateVariants } from "./buildings/logic_gate"; import { MetaLeverBuilding } from "./buildings/lever"; import { MetaFilterBuilding } from "./buildings/filter"; -import { MetaWireTunnelBuilding } from "./buildings/wire_tunnel"; +import { MetaWireTunnelBuilding, enumWireTunnelVariants } from "./buildings/wire_tunnel"; import { MetaDisplayBuilding } from "./buildings/display"; const logger = createLogger("building_registry"); @@ -116,6 +116,7 @@ export function initMetaBuildingRegistry() { // Wire tunnel registerBuildingVariant(39, MetaWireTunnelBuilding); + registerBuildingVariant(41, MetaWireTunnelBuilding, enumWireTunnelVariants.coating); // Display registerBuildingVariant(40, MetaDisplayBuilding); diff --git a/src/js/game/systems/wire.js b/src/js/game/systems/wire.js index bd6a3f17..dfc2e193 100644 --- a/src/js/game/systems/wire.js +++ b/src/js/game/systems/wire.js @@ -125,7 +125,7 @@ export class WireSystem extends GameSystemWithFilter { if (!this.root.gameInitialized) { return; } - if (entity.components.Wire || entity.components.WiredPins) { + if (entity.components.Wire || entity.components.WiredPins || entity.components.WireTunnel) { this.needsRecompute = true; this.networks = []; } @@ -335,6 +335,7 @@ export class WireSystem extends GameSystemWithFilter { ); // Link the initial tile to the initial entities, since it may change + /** @type {Array<{entity: Entity, tile: Vector}>} */ const contents = []; for (let j = 0; j < initialContents.length; ++j) { contents.push({ @@ -384,40 +385,59 @@ export class WireSystem extends GameSystemWithFilter { }); } } + + // Pin slots mean it can be nothing else + continue; } // Check if its a tunnel, if so, go to the forwarded item - if (entity.components.WireTunnel) { - if (!visitedTunnels.has(entity.uid)) { - // Compute where this tunnel connects to - const forwardedTile = entity.components.StaticMapEntity.origin.add(offset); - VERBOSE_WIRES && - logger.log( - " Found tunnel", - entity.uid, - "at", - tile, - "-> forwarding to", - forwardedTile - ); + const tunnelComp = entity.components.WireTunnel; + if (tunnelComp) { + if (visitedTunnels.has(entity.uid)) { + continue; + } - // Figure out which entities are connected - const connectedContents = this.root.map.getLayersContentsMultipleXY( - forwardedTile.x, - forwardedTile.y + const staticComp = entity.components.StaticMapEntity; + + if ( + !tunnelComp.multipleDirections && + !( + direction === staticComp.localDirectionToWorld(enumDirection.top) || + direction === staticComp.localDirectionToWorld(enumDirection.bottom) + ) + ) { + // It's a coating, and it doesn't connect here + continue; + } + + // Compute where this tunnel connects to + const forwardedTile = staticComp.origin.add(offset); + VERBOSE_WIRES && + logger.log( + " Found tunnel", + entity.uid, + "at", + tile, + "-> forwarding to", + forwardedTile ); - // Attach the entities and the tile we search at, because it may change - for (let h = 0; h < connectedContents.length; ++h) { - contents.push({ - entity: connectedContents[h], - tile: forwardedTile, - }); - } + // Figure out which entities are connected + const connectedContents = this.root.map.getLayersContentsMultipleXY( + forwardedTile.x, + forwardedTile.y + ); - // Remember this tunnel - visitedTunnels.add(entity.uid); + // Attach the entities and the tile we search at, because it may change + for (let h = 0; h < connectedContents.length; ++h) { + contents.push({ + entity: connectedContents[h], + tile: forwardedTile, + }); } + + // Remember this tunnel + visitedTunnels.add(entity.uid); } } } diff --git a/translations/base-en.yaml b/translations/base-en.yaml index a1a6289e..eec5556b 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -547,6 +547,10 @@ buildings: name: &wire_tunnel Wire Tunnel description: Allows to cross two wires without connecting them. + coating: + name: Wire Coating + description: Allows to pass through signals without connecting to other wires on the sides. + constant_signal: default: name: &constant_signal Constant Signal