diff --git a/res/ui/building_icons/display.png b/res/ui/building_icons/display.png new file mode 100644 index 00000000..14c48d7e Binary files /dev/null and b/res/ui/building_icons/display.png differ diff --git a/res_built/atlas/atlas0_hq.json b/res_built/atlas/atlas0_hq.json index 81803977..c3364eff 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":1523,"y":704,"w":116,"h":144}, + "frame": {"x":1820,"y":732,"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":1791,"y":731,"w":116,"h":144}, + "frame": {"x":699,"y":888,"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":1163,"y":1541,"w":116,"h":144}, + "frame": {"x":696,"y":1184,"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":1283,"y":1670,"w":116,"h":144}, + "frame": {"x":960,"y":1181,"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":1403,"y":1684,"w":116,"h":144}, + "frame": {"x":690,"y":1332,"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":3,"y":1832,"w":116,"h":144}, + "frame": {"x":956,"y":1329,"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":3,"y":1644,"w":116,"h":144}, + "frame": {"x":944,"y":1477,"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":123,"y":1832,"w":116,"h":144}, + "frame": {"x":943,"y":1625,"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":123,"y":1644,"w":116,"h":144}, + "frame": {"x":3,"y":1874,"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":243,"y":1832,"w":116,"h":144}, + "frame": {"x":123,"y":1874,"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":1779,"y":1027,"w":116,"h":144}, + "frame": {"x":698,"y":1036,"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":1510,"y":1000,"w":116,"h":144}, + "frame": {"x":1539,"y":852,"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":1770,"y":1175,"w":116,"h":144}, + "frame": {"x":1537,"y":1000,"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":925,"y":1336,"w":116,"h":144}, + "frame": {"x":967,"y":1033,"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":1912,"y":590,"w":130,"h":130}, + "frame": {"x":1521,"y":1148,"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":1912,"y":724,"w":130,"h":130}, + "frame": {"x":1228,"y":1229,"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":1189,"y":1139,"w":130,"h":130}, + "frame": {"x":1214,"y":1363,"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":1045,"y":1242,"w":130,"h":130}, + "frame": {"x":1076,"y":1377,"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":1323,"y":1268,"w":130,"h":130}, + "frame": {"x":809,"y":1505,"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":1179,"y":1273,"w":130,"h":130}, + "frame": {"x":1496,"y":1282,"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":1457,"y":1282,"w":130,"h":130}, + "frame": {"x":1348,"y":1414,"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":1313,"y":1402,"w":130,"h":130}, + "frame": {"x":1210,"y":1497,"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":1591,"y":1287,"w":130,"h":130}, + "frame": {"x":1064,"y":1511,"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":1447,"y":1416,"w":130,"h":130}, + "frame": {"x":234,"y":1354,"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":1911,"y":858,"w":130,"h":130}, + "frame": {"x":1080,"y":1243,"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":1358,"y":1134,"w":130,"h":130}, + "frame": {"x":810,"y":1371,"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":1492,"y":1148,"w":130,"h":130}, + "frame": {"x":675,"y":1480,"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":1890,"y":1285,"w":130,"h":130}, + "frame": {"x":1362,"y":1280,"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":1725,"y":1323,"w":130,"h":130}, + "frame": {"x":368,"y":1472,"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":1581,"y":1421,"w":130,"h":130}, + "frame": {"x":502,"y":1552,"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":1045,"y":1376,"w":130,"h":130}, + "frame": {"x":1198,"y":1631,"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":1179,"y":1407,"w":130,"h":130}, + "frame": {"x":1063,"y":1645,"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":1313,"y":1536,"w":130,"h":130}, + "frame": {"x":3,"y":1472,"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":1447,"y":1550,"w":130,"h":130}, + "frame": {"x":137,"y":1488,"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":1581,"y":1555,"w":130,"h":130}, + "frame": {"x":3,"y":1606,"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":1715,"y":1591,"w":130,"h":130}, + "frame": {"x":271,"y":1606,"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":627,"y":1450,"w":130,"h":130}, + "frame": {"x":137,"y":1622,"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":761,"y":1470,"w":130,"h":130}, + "frame": {"x":3,"y":1740,"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":1859,"y":1419,"w":130,"h":130}, + "frame": {"x":636,"y":1614,"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":1715,"y":1457,"w":130,"h":130}, + "frame": {"x":770,"y":1639,"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":1849,"y":1553,"w":130,"h":130}, + "frame": {"x":1482,"y":1416,"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":791,"y":1336,"w":130,"h":130}, + "frame": {"x":1344,"y":1548,"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":895,"y":1484,"w":130,"h":130}, + "frame": {"x":271,"y":1740,"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":1029,"y":1510,"w":130,"h":130}, + "frame": {"x":363,"y":1874,"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":243,"y":1644,"w":116,"h":144}, + "frame": {"x":243,"y":1874,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -362,7 +362,7 @@ }, "sprites/blueprints/constant_signal.png": { - "frame": {"x":961,"y":977,"w":105,"h":127}, + "frame": {"x":1940,"y":759,"w":105,"h":127}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":105,"h":127}, @@ -378,15 +378,23 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":295,"y":299,"w":256,"h":144}, + "frame": {"x":847,"y":298,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, "sourceSize": {"w":288,"h":144} }, +"sprites/blueprints/display.png": +{ + "frame": {"x":1655,"y":1275,"w":135,"h":139}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":5,"y":5,"w":135,"h":139}, + "sourceSize": {"w":144,"h":144} +}, "sprites/blueprints/filter.png": { - "frame": {"x":847,"y":298,"w":268,"h":144}, + "frame": {"x":1107,"y":556,"w":268,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":16,"y":0,"w":268,"h":144}, @@ -394,7 +402,7 @@ }, "sprites/blueprints/lever.png": { - "frame": {"x":403,"y":887,"w":110,"h":116}, + "frame": {"x":405,"y":1748,"w":110,"h":116}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":17,"w":110,"h":116}, @@ -402,7 +410,7 @@ }, "sprites/blueprints/logic_gate-not.png": { - "frame": {"x":1512,"y":852,"w":123,"h":144}, + "frame": {"x":1545,"y":704,"w":123,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":123,"h":144}, @@ -410,7 +418,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":1074,"y":852,"w":144,"h":123}, + "frame": {"x":551,"y":888,"w":144,"h":123}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":123}, @@ -418,7 +426,7 @@ }, "sprites/blueprints/logic_gate-transistor.png": { - "frame": {"x":402,"y":1138,"w":101,"h":144}, + "frame": {"x":150,"y":1035,"w":101,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":101,"h":144}, @@ -426,7 +434,7 @@ }, "sprites/blueprints/logic_gate-xor.png": { - "frame": {"x":665,"y":741,"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}, @@ -434,7 +442,7 @@ }, "sprites/blueprints/logic_gate.png": { - "frame": {"x":813,"y":741,"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}, @@ -442,7 +450,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1639,"y":994,"w":136,"h":143}, + "frame": {"x":1800,"y":1023,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -450,7 +458,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1906,"y":992,"w":136,"h":143}, + "frame": {"x":816,"y":1224,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -458,7 +466,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":1118,"y":556,"w":261,"h":144}, + "frame": {"x":1676,"y":584,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -498,7 +506,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":517,"y":974,"w":143,"h":144}, + "frame": {"x":551,"y":1015,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -506,7 +514,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":255,"y":1171,"w":142,"h":144}, + "frame": {"x":402,"y":1196,"w":142,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":142,"h":144}, @@ -514,7 +522,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":813,"y":1049,"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}, @@ -522,7 +530,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":3,"y":1182,"w":142,"h":138}, + "frame": {"x":3,"y":1183,"w":142,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":142,"h":138}, @@ -530,7 +538,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1367,"y":992,"w":139,"h":138}, + "frame": {"x":1394,"y":992,"w":139,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, @@ -538,7 +546,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":295,"y":447,"w":256,"h":144}, + "frame": {"x":295,"y":299,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -546,7 +554,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":1383,"y":556,"w":261,"h":144}, + "frame": {"x":295,"y":594,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -554,7 +562,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":263,"y":595,"w":250,"h":288}, + "frame": {"x":847,"y":593,"w":250,"h":288}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":21,"y":0,"w":250,"h":288}, @@ -562,7 +570,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":1079,"y":704,"w":144,"h":144}, + "frame": {"x":255,"y":742,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -570,7 +578,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":658,"y":1205,"w":138,"h":125}, + "frame": {"x":1098,"y":999,"w":138,"h":125}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":19,"w":138,"h":125}, @@ -578,7 +586,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":507,"y":1249,"w":138,"h":112}, + "frame": {"x":818,"y":1108,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -586,7 +594,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":1046,"y":1126,"w":139,"h":112}, + "frame": {"x":1657,"y":1020,"w":139,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":139,"h":112}, @@ -594,7 +602,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":649,"y":1334,"w":138,"h":112}, + "frame": {"x":548,"y":1290,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":138,"h":112}, @@ -602,7 +610,7 @@ }, "sprites/blueprints/wire-cross.png": { - "frame": {"x":1227,"y":704,"w":144,"h":144}, + "frame": {"x":403,"y":742,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -610,7 +618,7 @@ }, "sprites/blueprints/wire-split.png": { - "frame": {"x":813,"y":878,"w":144,"h":82}, + "frame": {"x":819,"y":1022,"w":144,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":62,"w":144,"h":82}, @@ -618,7 +626,7 @@ }, "sprites/blueprints/wire-turn.png": { - "frame": {"x":960,"y":1108,"w":82,"h":82}, + "frame": {"x":148,"y":1331,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":62,"y":62,"w":82,"h":82}, @@ -626,7 +634,7 @@ }, "sprites/blueprints/wire.png": { - "frame": {"x":2014,"y":245,"w":20,"h":144}, + "frame": {"x":1107,"y":151,"w":20,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":62,"y":0,"w":20,"h":144}, @@ -634,7 +642,7 @@ }, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":811,"y":1197,"w":138,"h":135}, + "frame": {"x":1657,"y":1136,"w":138,"h":135}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":138,"h":135}, @@ -642,7 +650,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":1912,"y":590,"w":130,"h":130}, + "frame": {"x":1521,"y":1148,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -650,7 +658,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1725,"y":1323,"w":130,"h":130}, + "frame": {"x":368,"y":1472,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -658,7 +666,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1523,"y":704,"w":116,"h":144}, + "frame": {"x":1820,"y":732,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -666,7 +674,7 @@ }, "sprites/buildings/constant_signal.png": { - "frame": {"x":403,"y":1007,"w":104,"h":127}, + "frame": {"x":1941,"y":628,"w":104,"h":127}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":104,"h":127}, @@ -682,15 +690,23 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":819,"y":594,"w":256,"h":143}, + "frame": {"x":847,"y":446,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, "sourceSize": {"w":288,"h":144} }, +"sprites/buildings/display.png": +{ + "frame": {"x":1802,"y":880,"w":134,"h":139}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":5,"y":5,"w":134,"h":139}, + "sourceSize": {"w":144,"h":144} +}, "sprites/buildings/filter.png": { - "frame": {"x":847,"y":446,"w":267,"h":144}, + "frame": {"x":1379,"y":556,"w":267,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":267,"h":144}, @@ -706,7 +722,7 @@ }, "sprites/buildings/lever.png": { - "frame": {"x":961,"y":741,"w":109,"h":114}, + "frame": {"x":137,"y":1756,"w":109,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":18,"w":109,"h":114}, @@ -714,7 +730,7 @@ }, "sprites/buildings/logic_gate-not.png": { - "frame": {"x":1780,"y":879,"w":122,"h":144}, + "frame": {"x":972,"y":885,"w":122,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":0,"w":122,"h":144}, @@ -722,7 +738,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":511,"y":1122,"w":143,"h":123}, + "frame": {"x":549,"y":1163,"w":143,"h":123}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":123}, @@ -730,7 +746,7 @@ }, "sprites/buildings/logic_gate-transistor.png": { - "frame": {"x":151,"y":1034,"w":100,"h":144}, + "frame": {"x":151,"y":887,"w":100,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":100,"h":144}, @@ -738,7 +754,7 @@ }, "sprites/buildings/logic_gate-xor.png": { - "frame": {"x":664,"y":1058,"w":143,"h":143}, + "frame": {"x":255,"y":1060,"w":143,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":143}, @@ -746,7 +762,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":255,"y":1035,"w":143,"h":132}, + "frame": {"x":402,"y":1060,"w":143,"h":132}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":132}, @@ -754,7 +770,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1630,"y":1141,"w":136,"h":142}, + "frame": {"x":535,"y":1406,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -762,7 +778,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1899,"y":1139,"w":136,"h":142}, + "frame": {"x":1381,"y":1134,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -770,7 +786,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":1648,"y":584,"w":260,"h":143}, + "frame": {"x":560,"y":594,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -810,7 +826,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":3,"y":1324,"w":141,"h":143}, + "frame": {"x":249,"y":1207,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -818,7 +834,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":1222,"y":852,"w":141,"h":143}, + "frame": {"x":3,"y":1325,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":141,"h":143}, @@ -826,7 +842,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":1070,"y":979,"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 +850,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":1367,"y":852,"w":141,"h":136}, + "frame": {"x":1394,"y":852,"w":141,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":141,"h":136}, @@ -842,7 +858,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1215,"y":999,"w":139,"h":136}, + "frame": {"x":1659,"y":880,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -850,7 +866,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":3,"y":595,"w":256,"h":143}, + "frame": {"x":295,"y":447,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -858,7 +874,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":555,"y":594,"w":260,"h":143}, + "frame": {"x":560,"y":741,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -866,7 +882,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":3,"y":742,"w":248,"h":288}, + "frame": {"x":3,"y":595,"w":248,"h":288}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":22,"y":0,"w":248,"h":288}, @@ -874,7 +890,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":1375,"y":704,"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}, @@ -882,7 +898,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":3,"y":1471,"w":137,"h":124}, + "frame": {"x":394,"y":1344,"w":137,"h":124}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":20,"w":137,"h":124}, @@ -890,7 +906,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":486,"y":1365,"w":137,"h":111}, + "frame": {"x":1240,"y":999,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -898,7 +914,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":233,"y":1457,"w":137,"h":111}, + "frame": {"x":1240,"y":1114,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -906,7 +922,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1639,"y":879,"w":137,"h":111}, + "frame": {"x":1087,"y":1128,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -914,7 +930,7 @@ }, "sprites/buildings/wire-cross.png": { - "frame": {"x":1643,"y":731,"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}, @@ -922,7 +938,7 @@ }, "sprites/buildings/wire-split.png": { - "frame": {"x":665,"y":888,"w":144,"h":81}, + "frame": {"x":255,"y":890,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -930,7 +946,7 @@ }, "sprites/buildings/wire-turn.png": { - "frame": {"x":960,"y":1194,"w":81,"h":81}, + "frame": {"x":1940,"y":890,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -938,7 +954,7 @@ }, "sprites/buildings/wire.png": { - "frame": {"x":1975,"y":294,"w":18,"h":144}, + "frame": {"x":2027,"y":184,"w":18,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":0,"w":18,"h":144}, @@ -946,7 +962,7 @@ }, "sprites/buildings/wire_tunnel.png": { - "frame": {"x":242,"y":1319,"w":137,"h":134}, + "frame": {"x":1799,"y":1170,"w":137,"h":134}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":137,"h":134}, @@ -954,7 +970,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1997,"y":294,"w":12,"h":12}, + "frame": {"x":1107,"y":481,"w":12,"h":12}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":12,"h":12}, @@ -962,7 +978,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":1997,"y":310,"w":12,"h":12}, + "frame": {"x":1107,"y":497,"w":12,"h":12}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":12,"h":12}, @@ -970,15 +986,15 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":2014,"y":184,"w":24,"h":24}, + "frame": {"x":1975,"y":184,"w":48,"h":48}, "rotated": false, "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":24,"h":24}, - "sourceSize": {"w":24,"h":24} + "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, + "sourceSize": {"w":48,"h":48} }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":1975,"y":227,"w":35,"h":35}, + "frame": {"x":255,"y":638,"w":35,"h":35}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":35,"h":35}, @@ -986,7 +1002,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":1975,"y":184,"w":35,"h":39}, + "frame": {"x":255,"y":595,"w":35,"h":39}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":35,"h":39}, @@ -994,7 +1010,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":149,"y":1282,"w":89,"h":44}, + "frame": {"x":149,"y":1283,"w":89,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":89,"h":44}, @@ -1002,15 +1018,15 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1975,"y":266,"w":20,"h":24}, + "frame": {"x":1940,"y":1230,"w":38,"h":48}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, - "sourceSize": {"w":24,"h":24} + "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, + "sourceSize": {"w":48,"h":48} }, "sprites/wires/boolean_false.png": { - "frame": {"x":2014,"y":212,"w":22,"h":29}, + "frame": {"x":1650,"y":556,"w":22,"h":29}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":11,"w":22,"h":29}, @@ -1018,15 +1034,71 @@ }, "sprites/wires/boolean_true.png": { - "frame": {"x":1997,"y":541,"w":17,"h":30}, + "frame": {"x":1107,"y":447,"w":17,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":10,"w":17,"h":30}, "sourceSize": {"w":48,"h":48} }, +"sprites/wires/display/blue.png": +{ + "frame": {"x":1975,"y":236,"w":47,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, + "sourceSize": {"w":49,"h":49} +}, +"sprites/wires/display/cyan.png": +{ + "frame": {"x":1975,"y":287,"w":47,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, + "sourceSize": {"w":49,"h":49} +}, +"sprites/wires/display/green.png": +{ + "frame": {"x":1975,"y":338,"w":47,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, + "sourceSize": {"w":49,"h":49} +}, +"sprites/wires/display/purple.png": +{ + "frame": {"x":1975,"y":389,"w":47,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, + "sourceSize": {"w":49,"h":49} +}, +"sprites/wires/display/red.png": +{ + "frame": {"x":1975,"y":440,"w":47,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, + "sourceSize": {"w":49,"h":49} +}, +"sprites/wires/display/white.png": +{ + "frame": {"x":1975,"y":491,"w":47,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, + "sourceSize": {"w":49,"h":49} +}, +"sprites/wires/display/yellow.png": +{ + "frame": {"x":1975,"y":542,"w":47,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, + "sourceSize": {"w":49,"h":49} +}, "sprites/wires/lever_on.png": { - "frame": {"x":961,"y":859,"w":109,"h":114}, + "frame": {"x":519,"y":1686,"w":109,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":18,"w":109,"h":114}, @@ -1050,7 +1122,7 @@ }, "sprites/wires/overlay_tile.png": { - "frame": {"x":149,"y":1182,"w":96,"h":96}, + "frame": {"x":149,"y":1183,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1058,7 +1130,7 @@ }, "sprites/wires/sets/color_cross.png": { - "frame": {"x":517,"y":741,"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}, @@ -1066,7 +1138,7 @@ }, "sprites/wires/sets/color_forward.png": { - "frame": {"x":1997,"y":393,"w":18,"h":144}, + "frame": {"x":2026,"y":332,"w":18,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":0,"w":18,"h":144}, @@ -1074,7 +1146,7 @@ }, "sprites/wires/sets/color_split.png": { - "frame": {"x":813,"y":964,"w":144,"h":81}, + "frame": {"x":403,"y":890,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -1082,7 +1154,7 @@ }, "sprites/wires/sets/color_turn.png": { - "frame": {"x":401,"y":1286,"w":81,"h":81}, + "frame": {"x":1940,"y":975,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -1090,7 +1162,7 @@ }, "sprites/wires/sets/conflict_cross.png": { - "frame": {"x":255,"y":887,"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}, @@ -1098,7 +1170,7 @@ }, "sprites/wires/sets/conflict_forward.png": { - "frame": {"x":1975,"y":442,"w":18,"h":144}, + "frame": {"x":2026,"y":480,"w":18,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":0,"w":18,"h":144}, @@ -1106,7 +1178,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":517,"y":889,"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}, @@ -1114,7 +1186,7 @@ }, "sprites/wires/sets/conflict_turn.png": { - "frame": {"x":148,"y":1330,"w":81,"h":81}, + "frame": {"x":1940,"y":1060,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -1122,7 +1194,7 @@ }, "sprites/wires/sets/regular_cross.png": { - "frame": {"x":1643,"y":731,"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}, @@ -1130,7 +1202,7 @@ }, "sprites/wires/sets/regular_forward.png": { - "frame": {"x":1975,"y":294,"w":18,"h":144}, + "frame": {"x":2027,"y":184,"w":18,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":0,"w":18,"h":144}, @@ -1138,7 +1210,7 @@ }, "sprites/wires/sets/regular_split.png": { - "frame": {"x":665,"y":888,"w":144,"h":81}, + "frame": {"x":255,"y":890,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -1146,7 +1218,7 @@ }, "sprites/wires/sets/regular_turn.png": { - "frame": {"x":960,"y":1194,"w":81,"h":81}, + "frame": {"x":1940,"y":890,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -1154,7 +1226,7 @@ }, "sprites/wires/sets/shape_cross.png": { - "frame": {"x":3,"y":1034,"w":144,"h":144}, + "frame": {"x":1672,"y":732,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -1162,7 +1234,7 @@ }, "sprites/wires/sets/shape_forward.png": { - "frame": {"x":2019,"y":393,"w":18,"h":144}, + "frame": {"x":1107,"y":299,"w":18,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":0,"w":18,"h":144}, @@ -1170,7 +1242,7 @@ }, "sprites/wires/sets/shape_split.png": { - "frame": {"x":665,"y":973,"w":144,"h":81}, + "frame": {"x":403,"y":975,"w":144,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":63,"w":144,"h":81}, @@ -1178,7 +1250,7 @@ }, "sprites/wires/sets/shape_turn.png": { - "frame": {"x":148,"y":1415,"w":81,"h":81}, + "frame": {"x":1940,"y":1145,"w":81,"h":81}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":63,"y":63,"w":81,"h":81}, @@ -1191,6 +1263,6 @@ "format": "RGBA8888", "size": {"w":2048,"h":2048}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:495f928ed9092c817f98f68825f1d4ae:98823415164aea829cee3223195c589c:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:eee72ff382c462a7fb711064084446a1:51a80af95b41b9096e952641c88bcd7a:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_hq.png b/res_built/atlas/atlas0_hq.png index 48d831a5..1849096d 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 59321600..6709d59a 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":466,"y":439,"w":40,"h":48}, + "frame": {"x":198,"y":782,"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":466,"y":491,"w":40,"h":48}, + "frame": {"x":147,"y":795,"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":283,"y":832,"w":40,"h":48}, + "frame": {"x":402,"y":797,"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":327,"y":846,"w":40,"h":48}, + "frame": {"x":349,"y":803,"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":371,"y":857,"w":40,"h":48}, + "frame": {"x":296,"y":810,"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":700,"w":40,"h":48}, + "frame": {"x":242,"y":821,"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":700,"w":40,"h":48}, + "frame": {"x":191,"y":834,"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":743,"w":40,"h":48}, + "frame": {"x":143,"y":847,"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":135,"y":781,"w":40,"h":48}, + "frame": {"x":95,"y":862,"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":179,"y":815,"w":40,"h":48}, + "frame": {"x":47,"y":879,"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":419,"y":609,"w":40,"h":48}, + "frame": {"x":99,"y":810,"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":416,"y":661,"w":40,"h":48}, + "frame": {"x":51,"y":827,"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":763,"w":40,"h":48}, + "frame": {"x":3,"y":829,"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":239,"y":787,"w":40,"h":48}, + "frame": {"x":454,"y":750,"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":326,"y":399,"w":44,"h":44}, + "frame": {"x":416,"y":653,"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":326,"y":447,"w":44,"h":44}, + "frame": {"x":464,"y":654,"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":207,"y":667,"w":44,"h":44}, + "frame": {"x":105,"y":666,"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":309,"y":688,"w":44,"h":44}, + "frame": {"x":54,"y":683,"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":255,"y":691,"w":44,"h":44}, + "frame": {"x":3,"y":685,"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":357,"y":702,"w":44,"h":44}, + "frame": {"x":362,"y":659,"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":303,"y":736,"w":44,"h":44}, + "frame": {"x":310,"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":405,"y":713,"w":44,"h":44}, + "frame": {"x":258,"y":673,"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":351,"y":750,"w":44,"h":44}, + "frame": {"x":205,"y":686,"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":453,"y":739,"w":44,"h":44}, + "frame": {"x":153,"y":699,"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":326,"y":495,"w":44,"h":44}, + "frame": {"x":314,"y":618,"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":465,"y":543,"w":44,"h":44}, + "frame": {"x":262,"y":625,"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":465,"y":591,"w":44,"h":44}, + "frame": {"x":210,"y":638,"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":463,"y":639,"w":44,"h":44}, + "frame": {"x":157,"y":651,"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":399,"y":761,"w":44,"h":44}, + "frame": {"x":102,"y":714,"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":447,"y":787,"w":44,"h":44}, + "frame": {"x":51,"y":731,"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":195,"y":715,"w":44,"h":44}, + "frame": {"x":253,"y":721,"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":243,"y":739,"w":44,"h":44}, + "frame": {"x":201,"y":734,"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":291,"y":784,"w":44,"h":44}, + "frame": {"x":150,"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":339,"y":798,"w":44,"h":44}, + "frame": {"x":99,"y":762,"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":387,"y":809,"w":44,"h":44}, + "frame": {"x":51,"y":779,"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":435,"y":835,"w":44,"h":44}, + "frame": {"x":3,"y":781,"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":3,"y":652,"w":44,"h":44}, + "frame": {"x":458,"y":702,"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":51,"y":652,"w":44,"h":44}, + "frame": {"x":406,"y":749,"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":3,"y":604,"w":44,"h":44}, + "frame": {"x":3,"y":733,"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":51,"y":604,"w":44,"h":44}, + "frame": {"x":410,"y":701,"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":647,"w":44,"h":44}, + "frame": {"x":358,"y":707,"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":147,"y":685,"w":44,"h":44}, + "frame": {"x":306,"y":714,"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":99,"y":695,"w":44,"h":44}, + "frame": {"x":354,"y":755,"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":147,"y":733,"w":44,"h":44}, + "frame": {"x":301,"y":762,"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":223,"y":839,"w":40,"h":48}, + "frame": {"x":3,"y":881,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -362,7 +362,7 @@ }, "sprites/blueprints/constant_signal.png": { - "frame": {"x":426,"y":411,"w":36,"h":43}, + "frame": {"x":329,"y":386,"w":36,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":36,"h":43}, @@ -378,12 +378,20 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":95,"y":296,"w":87,"h":48}, + "frame": {"x":187,"y":315,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, "sourceSize": {"w":96,"h":48} }, +"sprites/blueprints/display.png": +{ + "frame": {"x":417,"y":602,"w":46,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":46,"h":47}, + "sourceSize": {"w":48,"h":48} +}, "sprites/blueprints/filter.png": { "frame": {"x":3,"y":244,"w":91,"h":48}, @@ -394,7 +402,7 @@ }, "sprites/blueprints/lever.png": { - "frame": {"x":267,"y":884,"w":38,"h":40}, + "frame": {"x":470,"y":257,"w":38,"h":40}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":38,"h":40}, @@ -402,7 +410,7 @@ }, "sprites/blueprints/logic_gate-not.png": { - "frame": {"x":467,"y":335,"w":42,"h":48}, + "frame": {"x":467,"y":602,"w":42,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":42,"h":48}, @@ -410,7 +418,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":159,"y":519,"w":48,"h":42}, + "frame": {"x":107,"y":500,"w":48,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":42}, @@ -418,7 +426,7 @@ }, "sprites/blueprints/logic_gate-transistor.png": { - "frame": {"x":426,"y":505,"w":35,"h":48}, + "frame": {"x":144,"y":448,"w":35,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":35,"h":48}, @@ -434,7 +442,7 @@ }, "sprites/blueprints/logic_gate.png": { - "frame": {"x":3,"y":504,"w":48,"h":45}, + "frame": {"x":427,"y":553,"w":48,"h":45}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":45}, @@ -442,7 +450,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":263,"y":597,"w":47,"h":48}, + "frame": {"x":462,"y":345,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -450,7 +458,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":314,"y":636,"w":47,"h":48}, + "frame": {"x":55,"y":589,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -506,7 +514,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":274,"y":399,"w":48,"h":48}, + "frame": {"x":285,"y":263,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -514,7 +522,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":374,"y":411,"w":48,"h":48}, + "frame": {"x":460,"y":397,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -522,7 +530,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":274,"y":451,"w":48,"h":48}, + "frame": {"x":183,"y":367,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -530,7 +538,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":3,"y":553,"w":47,"h":47}, + "frame": {"x":263,"y":574,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -538,7 +546,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":186,"y":315,"w":87,"h":48}, + "frame": {"x":278,"y":334,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -546,7 +554,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":374,"y":307,"w":89,"h":48}, + "frame": {"x":369,"y":307,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -554,7 +562,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":285,"y":299,"w":85,"h":96}, + "frame": {"x":94,"y":348,"w":85,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":85,"h":96}, @@ -562,7 +570,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":374,"y":463,"w":48,"h":48}, + "frame": {"x":277,"y":386,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -570,7 +578,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":107,"y":504,"w":48,"h":43}, + "frame": {"x":55,"y":500,"w":48,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":48,"h":43}, @@ -578,7 +586,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":211,"y":519,"w":48,"h":38}, + "frame": {"x":107,"y":546,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -586,7 +594,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":263,"y":555,"w":48,"h":38}, + "frame": {"x":55,"y":547,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -594,7 +602,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":315,"y":594,"w":48,"h":38}, + "frame": {"x":3,"y":549,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -602,7 +610,7 @@ }, "sprites/blueprints/wire-cross.png": { - "frame": {"x":374,"y":515,"w":48,"h":48}, + "frame": {"x":183,"y":419,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -610,7 +618,7 @@ }, "sprites/blueprints/wire-split.png": { - "frame": {"x":285,"y":263,"w":48,"h":28}, + "frame": {"x":211,"y":523,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -618,7 +626,7 @@ }, "sprites/blueprints/wire-turn.png": { - "frame": {"x":479,"y":187,"w":28,"h":28}, + "frame": {"x":479,"y":129,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":20,"w":28,"h":28}, @@ -626,7 +634,7 @@ }, "sprites/blueprints/wire.png": { - "frame": {"x":500,"y":64,"w":8,"h":48}, + "frame": {"x":357,"y":282,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -634,7 +642,7 @@ }, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":315,"y":543,"w":48,"h":47}, + "frame": {"x":323,"y":515,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -642,7 +650,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":326,"y":399,"w":44,"h":44}, + "frame": {"x":416,"y":653,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -650,7 +658,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":399,"y":761,"w":44,"h":44}, + "frame": {"x":102,"y":714,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -658,7 +666,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":466,"y":439,"w":40,"h":48}, + "frame": {"x":198,"y":782,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -666,7 +674,7 @@ }, "sprites/buildings/constant_signal.png": { - "frame": {"x":426,"y":458,"w":36,"h":43}, + "frame": {"x":235,"y":411,"w":36,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":36,"h":43}, @@ -682,12 +690,20 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":3,"y":348,"w":87,"h":48}, + "frame": {"x":369,"y":359,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, "sourceSize": {"w":96,"h":48} }, +"sprites/buildings/display.png": +{ + "frame": {"x":366,"y":608,"w":46,"h":47}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":1,"y":1,"w":46,"h":47}, + "sourceSize": {"w":48,"h":48} +}, "sprites/buildings/filter.png": { "frame": {"x":191,"y":263,"w":90,"h":48}, @@ -706,7 +722,7 @@ }, "sprites/buildings/lever.png": { - "frame": {"x":309,"y":898,"w":38,"h":40}, + "frame": {"x":470,"y":301,"w":38,"h":40}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":38,"h":40}, @@ -714,7 +730,7 @@ }, "sprites/buildings/logic_gate-not.png": { - "frame": {"x":466,"y":387,"w":43,"h":48}, + "frame": {"x":249,"y":769,"w":43,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":43,"h":48}, @@ -722,7 +738,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":107,"y":551,"w":48,"h":42}, + "frame": {"x":159,"y":523,"w":48,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":42}, @@ -730,7 +746,7 @@ }, "sprites/buildings/logic_gate-transistor.png": { - "frame": {"x":426,"y":557,"w":35,"h":48}, + "frame": {"x":421,"y":411,"w":35,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":35,"h":48}, @@ -738,7 +754,7 @@ }, "sprites/buildings/logic_gate-xor.png": { - "frame": {"x":3,"y":400,"w":48,"h":48}, + "frame": {"x":92,"y":448,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -746,7 +762,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":55,"y":504,"w":48,"h":45}, + "frame": {"x":3,"y":500,"w":48,"h":45}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":45}, @@ -754,7 +770,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":365,"y":650,"w":47,"h":48}, + "frame": {"x":3,"y":591,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -762,7 +778,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":460,"y":687,"w":47,"h":48}, + "frame": {"x":315,"y":566,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -770,7 +786,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":374,"y":359,"w":88,"h":48}, + "frame": {"x":3,"y":296,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -802,7 +818,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":375,"y":255,"w":96,"h":48}, + "frame": {"x":370,"y":255,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -810,7 +826,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":55,"y":400,"w":48,"h":48}, + "frame": {"x":369,"y":411,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -818,7 +834,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":107,"y":400,"w":48,"h":48}, + "frame": {"x":460,"y":449,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -826,7 +842,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":3,"y":452,"w":48,"h":48}, + "frame": {"x":275,"y":438,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -834,7 +850,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":367,"y":567,"w":48,"h":47}, + "frame": {"x":375,"y":515,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -842,7 +858,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":54,"y":553,"w":47,"h":47}, + "frame": {"x":211,"y":587,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -850,7 +866,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":94,"y":348,"w":87,"h":48}, + "frame": {"x":3,"y":348,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -858,7 +874,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":3,"y":296,"w":88,"h":48}, + "frame": {"x":95,"y":296,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -866,7 +882,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":185,"y":367,"w":85,"h":96}, + "frame": {"x":3,"y":400,"w":85,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":85,"h":96}, @@ -874,7 +890,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":55,"y":452,"w":48,"h":48}, + "frame": {"x":183,"y":471,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -882,7 +898,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":156,"y":597,"w":47,"h":42}, + "frame": {"x":106,"y":620,"w":47,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":47,"h":42}, @@ -890,7 +906,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":207,"y":625,"w":47,"h":38}, + "frame": {"x":54,"y":641,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -898,7 +914,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":156,"y":643,"w":47,"h":38}, + "frame": {"x":3,"y":643,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -906,7 +922,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":258,"y":649,"w":47,"h":38}, + "frame": {"x":366,"y":566,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -914,7 +930,7 @@ }, "sprites/buildings/wire-cross.png": { - "frame": {"x":107,"y":452,"w":48,"h":48}, + "frame": {"x":271,"y":490,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -922,7 +938,7 @@ }, "sprites/buildings/wire-split.png": { - "frame": {"x":367,"y":618,"w":48,"h":28}, + "frame": {"x":263,"y":542,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -930,7 +946,7 @@ }, "sprites/buildings/wire-turn.png": { - "frame": {"x":343,"y":195,"w":28,"h":28}, + "frame": {"x":479,"y":161,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":20,"w":28,"h":28}, @@ -938,7 +954,7 @@ }, "sprites/buildings/wire.png": { - "frame": {"x":487,"y":79,"w":8,"h":48}, + "frame": {"x":235,"y":458,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -946,7 +962,7 @@ }, "sprites/buildings/wire_tunnel.png": { - "frame": {"x":105,"y":597,"w":47,"h":46}, + "frame": {"x":159,"y":601,"w":47,"h":46}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":46}, @@ -954,7 +970,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":504,"y":30,"w":4,"h":4}, + "frame": {"x":379,"y":55,"w":4,"h":4}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":4,"h":4}, @@ -962,7 +978,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":504,"y":38,"w":4,"h":4}, + "frame": {"x":379,"y":63,"w":4,"h":4}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":4,"h":4}, @@ -970,15 +986,15 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":479,"y":131,"w":8,"h":8}, + "frame": {"x":487,"y":30,"w":16,"h":16}, "rotated": false, "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, - "sourceSize": {"w":8,"h":8} + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, + "sourceSize": {"w":16,"h":16} }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":487,"y":30,"w":13,"h":13}, + "frame": {"x":278,"y":315,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -986,7 +1002,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":487,"y":47,"w":13,"h":13}, + "frame": {"x":295,"y":315,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -994,7 +1010,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":479,"y":168,"w":30,"h":15}, + "frame": {"x":479,"y":110,"w":30,"h":15}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":30,"h":15}, @@ -1002,15 +1018,15 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":479,"y":143,"w":8,"h":8}, + "frame": {"x":349,"y":433,"w":14,"h":16}, "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, - "sourceSize": {"w":8,"h":8} + "trimmed": true, + "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, + "sourceSize": {"w":16,"h":16} }, "sprites/wires/boolean_false.png": { - "frame": {"x":487,"y":64,"w":9,"h":11}, + "frame": {"x":357,"y":267,"w":9,"h":11}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":3,"w":9,"h":11}, @@ -1018,15 +1034,71 @@ }, "sprites/wires/boolean_true.png": { - "frame": {"x":499,"y":283,"w":7,"h":12}, + "frame": {"x":312,"y":315,"w":7,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":2,"w":7,"h":12}, "sourceSize": {"w":16,"h":16} }, +"sprites/wires/display/blue.png": +{ + "frame": {"x":487,"y":50,"w":16,"h":16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, + "sourceSize": {"w":16,"h":16} +}, +"sprites/wires/display/cyan.png": +{ + "frame": {"x":487,"y":70,"w":16,"h":16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, + "sourceSize": {"w":16,"h":16} +}, +"sprites/wires/display/green.png": +{ + "frame": {"x":487,"y":90,"w":16,"h":16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, + "sourceSize": {"w":16,"h":16} +}, +"sprites/wires/display/purple.png": +{ + "frame": {"x":337,"y":267,"w":16,"h":16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, + "sourceSize": {"w":16,"h":16} +}, +"sprites/wires/display/red.png": +{ + "frame": {"x":337,"y":287,"w":16,"h":16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, + "sourceSize": {"w":16,"h":16} +}, +"sprites/wires/display/white.png": +{ + "frame": {"x":337,"y":307,"w":16,"h":16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, + "sourceSize": {"w":16,"h":16} +}, +"sprites/wires/display/yellow.png": +{ + "frame": {"x":329,"y":433,"w":16,"h":16}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, + "sourceSize": {"w":16,"h":16} +}, "sprites/wires/lever_on.png": { - "frame": {"x":3,"y":942,"w":38,"h":40}, + "frame": {"x":235,"y":367,"w":38,"h":40}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":38,"h":40}, @@ -1034,7 +1106,7 @@ }, "sprites/wires/logical_acceptor.png": { - "frame": {"x":343,"y":259,"w":23,"h":36}, + "frame": {"x":343,"y":227,"w":23,"h":36}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":23,"h":36}, @@ -1058,7 +1130,7 @@ }, "sprites/wires/sets/color_cross.png": { - "frame": {"x":159,"y":467,"w":48,"h":48}, + "frame": {"x":339,"y":463,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1066,7 +1138,7 @@ }, "sprites/wires/sets/color_forward.png": { - "frame": {"x":499,"y":116,"w":8,"h":48}, + "frame": {"x":247,"y":458,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -1074,7 +1146,7 @@ }, "sprites/wires/sets/color_split.png": { - "frame": {"x":211,"y":561,"w":48,"h":28}, + "frame": {"x":211,"y":555,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -1082,7 +1154,7 @@ }, "sprites/wires/sets/color_turn.png": { - "frame": {"x":475,"y":219,"w":28,"h":28}, + "frame": {"x":479,"y":193,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":20,"w":28,"h":28}, @@ -1090,7 +1162,7 @@ }, "sprites/wires/sets/conflict_cross.png": { - "frame": {"x":211,"y":467,"w":48,"h":48}, + "frame": {"x":391,"y":463,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1098,7 +1170,7 @@ }, "sprites/wires/sets/conflict_forward.png": { - "frame": {"x":475,"y":283,"w":8,"h":48}, + "frame": {"x":259,"y":458,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -1106,7 +1178,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":159,"y":565,"w":48,"h":28}, + "frame": {"x":159,"y":569,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -1114,7 +1186,7 @@ }, "sprites/wires/sets/conflict_turn.png": { - "frame": {"x":475,"y":251,"w":28,"h":28}, + "frame": {"x":343,"y":195,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":20,"w":28,"h":28}, @@ -1122,7 +1194,7 @@ }, "sprites/wires/sets/regular_cross.png": { - "frame": {"x":107,"y":452,"w":48,"h":48}, + "frame": {"x":271,"y":490,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1130,7 +1202,7 @@ }, "sprites/wires/sets/regular_forward.png": { - "frame": {"x":487,"y":79,"w":8,"h":48}, + "frame": {"x":235,"y":458,"w":8,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":8,"h":48}, @@ -1138,7 +1210,7 @@ }, "sprites/wires/sets/regular_split.png": { - "frame": {"x":367,"y":618,"w":48,"h":28}, + "frame": {"x":263,"y":542,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -1146,7 +1218,7 @@ }, "sprites/wires/sets/regular_turn.png": { - "frame": {"x":343,"y":195,"w":28,"h":28}, + "frame": {"x":479,"y":161,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":20,"w":28,"h":28}, @@ -1154,7 +1226,7 @@ }, "sprites/wires/sets/shape_cross.png": { - "frame": {"x":263,"y":503,"w":48,"h":48}, + "frame": {"x":443,"y":501,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1162,7 +1234,7 @@ }, "sprites/wires/sets/shape_forward.png": { - "frame": {"x":487,"y":283,"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}, @@ -1170,7 +1242,7 @@ }, "sprites/wires/sets/shape_split.png": { - "frame": {"x":211,"y":593,"w":48,"h":28}, + "frame": {"x":107,"y":588,"w":48,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":20,"w":48,"h":28}, @@ -1178,7 +1250,7 @@ }, "sprites/wires/sets/shape_turn.png": { - "frame": {"x":343,"y":227,"w":28,"h":28}, + "frame": {"x":475,"y":225,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":20,"w":28,"h":28}, @@ -1191,6 +1263,6 @@ "format": "RGBA8888", "size": {"w":512,"h":1024}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:495f928ed9092c817f98f68825f1d4ae:98823415164aea829cee3223195c589c:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:eee72ff382c462a7fb711064084446a1:51a80af95b41b9096e952641c88bcd7a:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_lq.png b/res_built/atlas/atlas0_lq.png index 2013c80c..7ce717c9 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 97d9b26c..4b449f54 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":372,"y":1385,"w":78,"h":96}, + "frame": {"x":272,"y":1361,"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":276,"y":1429,"w":78,"h":96}, + "frame": {"x":354,"y":1394,"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":942,"y":1324,"w":78,"h":96}, + "frame": {"x":764,"y":1604,"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":759,"y":1354,"w":78,"h":96}, + "frame": {"x":846,"y":1613,"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":655,"y":1362,"w":78,"h":96}, + "frame": {"x":928,"y":1613,"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":555,"y":1459,"w":78,"h":96}, + "frame": {"x":3,"y":1370,"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":454,"y":1469,"w":78,"h":96}, + "frame": {"x":85,"y":1370,"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":1485,"w":78,"h":96}, + "frame": {"x":167,"y":1425,"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":1529,"w":78,"h":96}, + "frame": {"x":249,"y":1461,"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":1598,"w":78,"h":96}, + "frame": {"x":331,"y":1494,"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":185,"y":1498,"w":78,"h":96}, + "frame": {"x":436,"y":1412,"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":94,"y":1530,"w":78,"h":96}, + "frame": {"x":518,"y":1462,"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":3,"y":1607,"w":78,"h":96}, + "frame": {"x":600,"y":1517,"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":860,"y":1324,"w":78,"h":96}, + "frame": {"x":682,"y":1523,"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":496,"y":1096,"w":87,"h":87}, + "frame": {"x":640,"y":808,"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":395,"y":1112,"w":87,"h":87}, + "frame": {"x":638,"y":899,"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":793,"y":990,"w":87,"h":87}, + "frame": {"x":3,"y":1097,"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":884,"y":1051,"w":87,"h":87}, + "frame": {"x":94,"y":1097,"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":793,"y":1081,"w":87,"h":87}, + "frame": {"x":185,"y":1143,"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":691,"y":1089,"w":87,"h":87}, + "frame": {"x":276,"y":1179,"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":587,"y":1177,"w":87,"h":87}, + "frame": {"x":367,"y":1212,"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":486,"y":1187,"w":87,"h":87}, + "frame": {"x":458,"y":1230,"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":386,"y":1203,"w":87,"h":87}, + "frame": {"x":549,"y":1280,"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":287,"y":1247,"w":87,"h":87}, + "frame": {"x":640,"y":1335,"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":295,"y":1156,"w":87,"h":87}, + "frame": {"x":575,"y":1189,"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":196,"y":1225,"w":87,"h":87}, + "frame": {"x":666,"y":1244,"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":99,"y":1257,"w":87,"h":87}, + "frame": {"x":757,"y":1250,"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":3,"y":1334,"w":87,"h":87}, + "frame": {"x":848,"y":1331,"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":190,"y":1316,"w":87,"h":87}, + "frame": {"x":731,"y":1341,"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":94,"y":1348,"w":87,"h":87}, + "frame": {"x":822,"y":1422,"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":577,"y":1268,"w":87,"h":87}, + "frame": {"x":276,"y":1270,"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":477,"y":1278,"w":87,"h":87}, + "frame": {"x":367,"y":1303,"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":378,"y":1294,"w":87,"h":87}, + "frame": {"x":458,"y":1321,"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":281,"y":1338,"w":87,"h":87}, + "frame": {"x":549,"y":1371,"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":185,"y":1407,"w":87,"h":87}, + "frame": {"x":640,"y":1426,"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":94,"y":1439,"w":87,"h":87}, + "frame": {"x":731,"y":1432,"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":3,"y":1516,"w":87,"h":87}, + "frame": {"x":822,"y":1513,"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":873,"y":1233,"w":87,"h":87}, + "frame": {"x":913,"y":1522,"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":3,"y":1425,"w":87,"h":87}, + "frame": {"x":913,"y":1431,"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":884,"y":1142,"w":87,"h":87}, + "frame": {"x":3,"y":1188,"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":782,"y":1172,"w":87,"h":87}, + "frame": {"x":94,"y":1188,"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":678,"y":1180,"w":87,"h":87}, + "frame": {"x":185,"y":1234,"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":769,"y":1263,"w":87,"h":87}, + "frame": {"x":3,"y":1279,"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":668,"y":1271,"w":87,"h":87}, + "frame": {"x":94,"y":1279,"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":1630,"w":78,"h":96}, + "frame": {"x":413,"y":1512,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -378,12 +378,20 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":752,"y":594,"w":172,"h":96}, + "frame": {"x":745,"y":594,"w":172,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":172,"h":96}, "sourceSize": {"w":192,"h":96} }, +"sprites/blueprints/display.png": +{ + "frame": {"x":386,"y":1115,"w":91,"h":93}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":3,"y":3,"w":91,"h":93}, + "sourceSize": {"w":96,"h":96} +}, "sprites/blueprints/filter.png": { "frame": {"x":569,"y":303,"w":180,"h":96}, @@ -394,7 +402,7 @@ }, "sprites/blueprints/lever.png": { - "frame": {"x":449,"y":703,"w":74,"h":78}, + "frame": {"x":831,"y":794,"w":74,"h":78}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":11,"w":74,"h":78}, @@ -402,7 +410,7 @@ }, "sprites/blueprints/logic_gate-not.png": { - "frame": {"x":568,"y":1359,"w":83,"h":96}, + "frame": {"x":185,"y":1325,"w":83,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":83,"h":96}, @@ -410,7 +418,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":203,"y":866,"w":96,"h":82}, + "frame": {"x":103,"y":874,"w":96,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":82}, @@ -418,7 +426,7 @@ }, "sprites/blueprints/logic_gate-transistor.png": { - "frame": {"x":826,"y":890,"w":68,"h":96}, + "frame": {"x":828,"y":956,"w":68,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":68,"h":96}, @@ -426,7 +434,7 @@ }, "sprites/blueprints/logic_gate-xor.png": { - "frame": {"x":903,"y":751,"w":96,"h":96}, + "frame": {"x":921,"y":654,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -434,7 +442,7 @@ }, "sprites/blueprints/logic_gate.png": { - "frame": {"x":103,"y":774,"w":96,"h":89}, + "frame": {"x":340,"y":799,"w":96,"h":89}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":89}, @@ -442,7 +450,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":602,"y":978,"w":92,"h":96}, + "frame": {"x":593,"y":1089,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -450,7 +458,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":500,"y":996,"w":92,"h":96}, + "frame": {"x":689,"y":1144,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -498,7 +506,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":903,"y":851,"w":96,"h":96}, + "frame": {"x":910,"y":754,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -506,7 +514,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":303,"y":890,"w":95,"h":96}, + "frame": {"x":440,"y":857,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":95,"h":96}, @@ -514,7 +522,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":3,"y":674,"w":96,"h":96}, + "frame": {"x":731,"y":794,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -522,7 +530,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":503,"y":899,"w":95,"h":93}, + "frame": {"x":729,"y":952,"w":95,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":95,"h":93}, @@ -530,7 +538,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":928,"y":654,"w":93,"h":93}, + "frame": {"x":537,"y":957,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":1,"w":93,"h":93}, @@ -538,7 +546,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":3,"y":574,"w":171,"h":96}, + "frame": {"x":735,"y":694,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -554,7 +562,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":528,"y":603,"w":167,"h":192}, + "frame": {"x":353,"y":603,"w":167,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":167,"h":192}, @@ -562,7 +570,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":103,"y":674,"w":96,"h":96}, + "frame": {"x":909,"y":854,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -570,7 +578,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":3,"y":1089,"w":93,"h":84}, + "frame": {"x":302,"y":992,"w":93,"h":84}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":12,"w":93,"h":84}, @@ -578,7 +586,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":3,"y":1177,"w":93,"h":75}, + "frame": {"x":399,"y":1036,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":21,"w":93,"h":75}, @@ -586,7 +594,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":302,"y":990,"w":94,"h":75}, + "frame": {"x":439,"y":957,"w":94,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":94,"h":75}, @@ -594,7 +602,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":602,"y":899,"w":93,"h":75}, + "frame": {"x":496,"y":1054,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":93,"h":75}, @@ -602,7 +610,7 @@ }, "sprites/blueprints/wire-cross.png": { - "frame": {"x":203,"y":674,"w":96,"h":96}, + "frame": {"x":908,"y":954,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -610,7 +618,7 @@ }, "sprites/blueprints/wire-split.png": { - "frame": {"x":103,"y":867,"w":96,"h":55}, + "frame": {"x":103,"y":960,"w":96,"h":55}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":41,"w":96,"h":55}, @@ -626,7 +634,7 @@ }, "sprites/blueprints/wire.png": { - "frame": {"x":699,"y":603,"w":14,"h":96}, + "frame": {"x":717,"y":597,"w":14,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":41,"y":0,"w":14,"h":96}, @@ -634,7 +642,7 @@ }, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":202,"y":1052,"w":93,"h":91}, + "frame": {"x":729,"y":1049,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":93,"h":91}, @@ -642,7 +650,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":496,"y":1096,"w":87,"h":87}, + "frame": {"x":640,"y":808,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -650,7 +658,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":190,"y":1316,"w":87,"h":87}, + "frame": {"x":731,"y":1341,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -658,7 +666,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":372,"y":1385,"w":78,"h":96}, + "frame": {"x":272,"y":1361,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -682,12 +690,20 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":178,"y":574,"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}, "sourceSize": {"w":192,"h":96} }, +"sprites/buildings/display.png": +{ + "frame": {"x":481,"y":1133,"w":90,"h":93}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":3,"y":3,"w":90,"h":93}, + "sourceSize": {"w":96,"h":96} +}, "sprites/buildings/filter.png": { "frame": {"x":569,"y":403,"w":179,"h":96}, @@ -714,7 +730,7 @@ }, "sprites/buildings/logic_gate-not.png": { - "frame": {"x":469,"y":1369,"w":82,"h":96}, + "frame": {"x":939,"y":1331,"w":82,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":82,"h":96}, @@ -722,7 +738,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":303,"y":803,"w":96,"h":83}, + "frame": {"x":3,"y":874,"w":96,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":83}, @@ -730,7 +746,7 @@ }, "sprites/buildings/logic_gate-transistor.png": { - "frame": {"x":3,"y":1707,"w":68,"h":96}, + "frame": {"x":826,"y":1056,"w":68,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":68,"h":96}, @@ -738,7 +754,7 @@ }, "sprites/buildings/logic_gate-xor.png": { - "frame": {"x":3,"y":774,"w":96,"h":95}, + "frame": {"x":203,"y":774,"w":96,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":95}, @@ -746,7 +762,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":203,"y":774,"w":96,"h":88}, + "frame": {"x":203,"y":873,"w":96,"h":88}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":88}, @@ -754,7 +770,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":698,"y":990,"w":91,"h":95}, + "frame": {"x":634,"y":990,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -762,7 +778,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":596,"y":1078,"w":91,"h":95}, + "frame": {"x":291,"y":1080,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -810,7 +826,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":203,"y":952,"w":95,"h":96}, + "frame": {"x":340,"y":892,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -818,7 +834,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":103,"y":984,"w":95,"h":96}, + "frame": {"x":203,"y":965,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":95,"h":96}, @@ -826,7 +842,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":3,"y":989,"w":95,"h":96}, + "frame": {"x":539,"y":857,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -834,7 +850,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":402,"y":923,"w":94,"h":91}, + "frame": {"x":900,"y":1054,"w":94,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":94,"h":91}, @@ -842,7 +858,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":102,"y":1084,"w":93,"h":91}, + "frame": {"x":898,"y":1149,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, @@ -850,7 +866,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":353,"y":603,"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}, @@ -866,7 +882,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":733,"y":694,"w":166,"h":192}, + "frame": {"x":524,"y":603,"w":166,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":166,"h":192}, @@ -874,7 +890,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":349,"y":703,"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}, @@ -882,7 +898,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":299,"y":1069,"w":92,"h":83}, + "frame": {"x":881,"y":1244,"w":92,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":13,"w":92,"h":83}, @@ -890,7 +906,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":199,"y":1147,"w":92,"h":74}, + "frame": {"x":3,"y":1019,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":22,"w":92,"h":74}, @@ -898,7 +914,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":100,"y":1179,"w":92,"h":74}, + "frame": {"x":99,"y":1019,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -906,7 +922,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":3,"y":1256,"w":92,"h":74}, + "frame": {"x":195,"y":1065,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -914,7 +930,7 @@ }, "sprites/buildings/wire-cross.png": { - "frame": {"x":526,"y":799,"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}, @@ -922,7 +938,7 @@ }, "sprites/buildings/wire-split.png": { - "frame": {"x":3,"y":873,"w":96,"h":54}, + "frame": {"x":3,"y":961,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -946,7 +962,7 @@ }, "sprites/buildings/wire_tunnel.png": { - "frame": {"x":400,"y":1018,"w":92,"h":90}, + "frame": {"x":785,"y":1156,"w":92,"h":90}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":92,"h":90}, @@ -970,15 +986,15 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":717,"y":561,"w":16,"h":16}, + "frame": {"x":303,"y":946,"w":32,"h":32}, "rotated": false, "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16} + "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, + "sourceSize": {"w":32,"h":32} }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":717,"y":533,"w":24,"h":24}, + "frame": {"x":717,"y":569,"w":24,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":24,"h":24}, @@ -986,7 +1002,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":717,"y":503,"w":24,"h":26}, + "frame": {"x":717,"y":539,"w":24,"h":26}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":24,"h":26}, @@ -1002,15 +1018,15 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":928,"y":594,"w":14,"h":16}, + "frame": {"x":717,"y":503,"w":26,"h":32}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, - "sourceSize": {"w":16,"h":16} + "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, + "sourceSize": {"w":32,"h":32} }, "sprites/wires/boolean_false.png": { - "frame": {"x":717,"y":581,"w":15,"h":20}, + "frame": {"x":921,"y":594,"w":15,"h":20}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":7,"w":15,"h":20}, @@ -1018,15 +1034,71 @@ }, "sprites/wires/boolean_true.png": { - "frame": {"x":928,"y":614,"w":12,"h":21}, + "frame": {"x":921,"y":618,"w":12,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":6,"w":12,"h":21}, "sourceSize": {"w":32,"h":32} }, +"sprites/wires/display/blue.png": +{ + "frame": {"x":694,"y":697,"w":33,"h":33}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, + "sourceSize": {"w":33,"h":33} +}, +"sprites/wires/display/cyan.png": +{ + "frame": {"x":694,"y":734,"w":33,"h":33}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, + "sourceSize": {"w":33,"h":33} +}, +"sprites/wires/display/green.png": +{ + "frame": {"x":694,"y":771,"w":33,"h":33}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, + "sourceSize": {"w":33,"h":33} +}, +"sprites/wires/display/purple.png": +{ + "frame": {"x":303,"y":798,"w":33,"h":33}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, + "sourceSize": {"w":33,"h":33} +}, +"sprites/wires/display/red.png": +{ + "frame": {"x":303,"y":835,"w":33,"h":33}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, + "sourceSize": {"w":33,"h":33} +}, +"sprites/wires/display/white.png": +{ + "frame": {"x":303,"y":872,"w":33,"h":33}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, + "sourceSize": {"w":33,"h":33} +}, +"sprites/wires/display/yellow.png": +{ + "frame": {"x":303,"y":909,"w":33,"h":33}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, + "sourceSize": {"w":33,"h":33} +}, "sprites/wires/lever_on.png": { - "frame": {"x":449,"y":785,"w":73,"h":76}, + "frame": {"x":831,"y":876,"w":73,"h":76}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":12,"w":73,"h":76}, @@ -1058,7 +1130,7 @@ }, "sprites/wires/sets/color_cross.png": { - "frame": {"x":626,"y":799,"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}, @@ -1074,7 +1146,7 @@ }, "sprites/wires/sets/color_split.png": { - "frame": {"x":103,"y":926,"w":96,"h":54}, + "frame": {"x":440,"y":799,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -1090,7 +1162,7 @@ }, "sprites/wires/sets/conflict_cross.png": { - "frame": {"x":726,"y":890,"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}, @@ -1098,7 +1170,7 @@ }, "sprites/wires/sets/conflict_forward.png": { - "frame": {"x":736,"y":581,"w":12,"h":96}, + "frame": {"x":1009,"y":854,"w":12,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":42,"y":0,"w":12,"h":96}, @@ -1106,7 +1178,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":3,"y":931,"w":96,"h":54}, + "frame": {"x":540,"y":799,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -1122,7 +1194,7 @@ }, "sprites/wires/sets/regular_cross.png": { - "frame": {"x":526,"y":799,"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}, @@ -1138,7 +1210,7 @@ }, "sprites/wires/sets/regular_split.png": { - "frame": {"x":3,"y":873,"w":96,"h":54}, + "frame": {"x":3,"y":961,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -1154,7 +1226,7 @@ }, "sprites/wires/sets/shape_cross.png": { - "frame": {"x":898,"y":951,"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}, @@ -1162,7 +1234,7 @@ }, "sprites/wires/sets/shape_forward.png": { - "frame": {"x":717,"y":605,"w":12,"h":96}, + "frame": {"x":1008,"y":954,"w":12,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":42,"y":0,"w":12,"h":96}, @@ -1170,7 +1242,7 @@ }, "sprites/wires/sets/shape_split.png": { - "frame": {"x":403,"y":865,"w":96,"h":54}, + "frame": {"x":731,"y":894,"w":96,"h":54}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":42,"w":96,"h":54}, @@ -1191,6 +1263,6 @@ "format": "RGBA8888", "size": {"w":1024,"h":2048}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:495f928ed9092c817f98f68825f1d4ae:98823415164aea829cee3223195c589c:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:eee72ff382c462a7fb711064084446a1:51a80af95b41b9096e952641c88bcd7a:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_mq.png b/res_built/atlas/atlas0_mq.png index d8755e05..1a6dccdf 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 new file mode 100644 index 00000000..8e5a8ba5 Binary files /dev/null and b/res_raw/sprites/blueprints/display.png differ diff --git a/res_raw/sprites/buildings/display.png b/res_raw/sprites/buildings/display.png new file mode 100644 index 00000000..9cf23ea1 Binary files /dev/null and b/res_raw/sprites/buildings/display.png differ diff --git a/res_raw/sprites/wires/display/blue.png b/res_raw/sprites/wires/display/blue.png new file mode 100644 index 00000000..c131ed84 Binary files /dev/null and b/res_raw/sprites/wires/display/blue.png differ diff --git a/res_raw/sprites/wires/display/cyan.png b/res_raw/sprites/wires/display/cyan.png new file mode 100644 index 00000000..9cc20690 Binary files /dev/null and b/res_raw/sprites/wires/display/cyan.png differ diff --git a/res_raw/sprites/wires/display/green.png b/res_raw/sprites/wires/display/green.png new file mode 100644 index 00000000..cf390a5b Binary files /dev/null and b/res_raw/sprites/wires/display/green.png differ diff --git a/res_raw/sprites/wires/display/purple.png b/res_raw/sprites/wires/display/purple.png new file mode 100644 index 00000000..1285a151 Binary files /dev/null and b/res_raw/sprites/wires/display/purple.png differ diff --git a/res_raw/sprites/wires/display/red.png b/res_raw/sprites/wires/display/red.png new file mode 100644 index 00000000..fabf484c Binary files /dev/null and b/res_raw/sprites/wires/display/red.png differ diff --git a/res_raw/sprites/wires/display/white.png b/res_raw/sprites/wires/display/white.png new file mode 100644 index 00000000..0430f042 Binary files /dev/null and b/res_raw/sprites/wires/display/white.png differ diff --git a/res_raw/sprites/wires/display/yellow.png b/res_raw/sprites/wires/display/yellow.png new file mode 100644 index 00000000..02018a71 Binary files /dev/null and b/res_raw/sprites/wires/display/yellow.png differ diff --git a/src/css/icons.scss b/src/css/icons.scss index 01e28b62..38c32fd5 100644 --- a/src/css/icons.scss +++ b/src/css/icons.scss @@ -1,5 +1,5 @@ $buildings: belt, cutter, miner, mixer, painter, rotater, splitter, stacker, trash, underground_belt, wire, - constant_signal, logic_gate, lever, filter, wire_tunnel; + constant_signal, logic_gate, lever, filter, wire_tunnel, display; @each $building in $buildings { [data-icon="building_icons/#{$building}.png"] { diff --git a/src/js/game/buildings/display.js b/src/js/game/buildings/display.js new file mode 100644 index 00000000..9a7cb62a --- /dev/null +++ b/src/js/game/buildings/display.js @@ -0,0 +1,47 @@ +import { enumDirection, Vector } from "../../core/vector"; +import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; +import { Entity } from "../entity"; +import { MetaBuilding } from "../meta_building"; +import { GameRoot } from "../root"; +import { DisplayComponent } from "../components/display"; + +export class MetaDisplayBuilding extends MetaBuilding { + constructor() { + super("display"); + } + + getSilhouetteColor() { + return "#aaaaaa"; + } + + /** + * @param {GameRoot} root + */ + getIsUnlocked(root) { + // @todo + return true; + } + + getDimensions() { + return new Vector(1, 1); + } + + /** + * Creates the entity at the given location + * @param {Entity} entity + */ + setupEntityComponents(entity) { + entity.addComponent( + new WiredPinsComponent({ + slots: [ + { + pos: new Vector(0, 0), + direction: enumDirection.bottom, + type: enumPinSlotType.logicalAcceptor, + }, + ], + }) + ); + entity.addComponent(new DisplayComponent()); + } +} diff --git a/src/js/game/component_registry.js b/src/js/game/component_registry.js index b1a67bad..84e6307a 100644 --- a/src/js/game/component_registry.js +++ b/src/js/game/component_registry.js @@ -15,6 +15,7 @@ import { ConstantSignalComponent } from "./components/constant_signal"; import { LogicGateComponent } from "./components/logic_gate"; import { LeverComponent } from "./components/lever"; import { WireTunnelComponent } from "./components/wire_tunnel"; +import { DisplayComponent } from "./components/display"; export function initComponentRegistry() { gComponentRegistry.register(StaticMapEntityComponent); @@ -33,6 +34,7 @@ export function initComponentRegistry() { gComponentRegistry.register(LogicGateComponent); gComponentRegistry.register(LeverComponent); gComponentRegistry.register(WireTunnelComponent); + gComponentRegistry.register(DisplayComponent); // IMPORTANT ^^^^^ UPDATE ENTITY COMPONENT STORAGE AFTERWARDS diff --git a/src/js/game/components/display.js b/src/js/game/components/display.js new file mode 100644 index 00000000..720bf8c7 --- /dev/null +++ b/src/js/game/components/display.js @@ -0,0 +1,11 @@ +import { Component } from "../component"; + +export class DisplayComponent extends Component { + static getId() { + return "Display"; + } + + duplicateWithoutContents() { + return new DisplayComponent(); + } +} diff --git a/src/js/game/entity_components.js b/src/js/game/entity_components.js index 7bc7b8e7..8d8b56c4 100644 --- a/src/js/game/entity_components.js +++ b/src/js/game/entity_components.js @@ -15,6 +15,7 @@ import { ConstantSignalComponent } from "./components/constant_signal"; import { LogicGateComponent } from "./components/logic_gate"; import { LeverComponent } from "./components/lever"; import { WireTunnelComponent } from "./components/wire_tunnel"; +import { DisplayComponent } from "./components/display"; /* typehints:end */ /** @@ -73,6 +74,9 @@ export class EntityComponentStorage { /** @type {WireTunnelComponent} */ this.WireTunnel; + /** @type {DisplayComponent} */ + this.Display; + /* typehints:end */ } } diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index 863ecefa..afcaf194 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -19,6 +19,7 @@ import { WireSystem } from "./systems/wire"; import { ConstantSignalSystem } from "./systems/constant_signal"; import { LogicGateSystem } from "./systems/logic_gate"; import { LeverSystem } from "./systems/lever"; +import { DisplaySystem } from "./systems/display"; const logger = createLogger("game_system_manager"); @@ -80,6 +81,9 @@ export class GameSystemManager { /** @type {LeverSystem} */ lever: null, + /** @type {DisplaySystem} */ + display: null, + /* typehints:end */ }; this.systemUpdateOrder = []; @@ -137,6 +141,8 @@ export class GameSystemManager { // Wires must be after all gate, signal etc logic! add("wire", WireSystem); + add("display", DisplaySystem); + logger.log("📦 There are", this.systemUpdateOrder.length, "game systems"); } diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js index 5b8bc4fc..be46f239 100644 --- a/src/js/game/hud/parts/buildings_toolbar.js +++ b/src/js/game/hud/parts/buildings_toolbar.js @@ -12,6 +12,7 @@ import { enumLayer } from "../../root"; import { HUDBaseToolbar } from "./base_toolbar"; import { MetaLeverBuilding } from "../../buildings/lever"; import { MetaFilterBuilding } from "../../buildings/filter"; +import { MetaDisplayBuilding } from "../../buildings/display"; const supportedBuildings = [ MetaBeltBaseBuilding, @@ -26,6 +27,7 @@ const supportedBuildings = [ MetaTrashBuilding, MetaLeverBuilding, MetaFilterBuilding, + MetaDisplayBuilding, ]; export class HUDBuildingsToolbar extends HUDBaseToolbar { diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js index a5b05811..f88e5a22 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -55,12 +55,14 @@ export const KEYMAPPINGS = { painter: { keyCode: key("9") }, trash: { keyCode: key("0") }, + lever: { keyCode: key("L") }, + filter: { keyCode: key("B") }, + display: { keyCode: key("N") }, + wire: { keyCode: key("1") }, wire_tunnel: { keyCode: key("2") }, constant_signal: { keyCode: key("3") }, logic_gate: { keyCode: key("4") }, - lever: { keyCode: key("5") }, - filter: { keyCode: key("6") }, }, placement: { diff --git a/src/js/game/map_chunk.js b/src/js/game/map_chunk.js index 189a62cd..e6e76b13 100644 --- a/src/js/game/map_chunk.js +++ b/src/js/game/map_chunk.js @@ -40,7 +40,7 @@ export class MapChunk { /** * Which entities this chunk contains, sorted by layer - * @type {Object>} + * @type {Object>} */ this.containedEntitiesByLayer = { [enumLayer.regular]: [], diff --git a/src/js/game/map_chunk_view.js b/src/js/game/map_chunk_view.js index 17d4d4b8..850e1ca6 100644 --- a/src/js/game/map_chunk_view.js +++ b/src/js/game/map_chunk_view.js @@ -53,6 +53,7 @@ export class MapChunkView extends MapChunk { systems.miner.drawChunk(parameters, this); systems.staticMapEntities.drawChunk(parameters, this); systems.lever.drawChunk(parameters, this); + systems.display.drawChunk(parameters, this); } /** diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js index 15578d18..9d15b452 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -20,6 +20,7 @@ import { MetaLogicGateBuilding, enumLogicGateVariants } from "./buildings/logic_ import { MetaLeverBuilding } from "./buildings/lever"; import { MetaFilterBuilding } from "./buildings/filter"; import { MetaWireTunnelBuilding } from "./buildings/wire_tunnel"; +import { MetaDisplayBuilding } from "./buildings/display"; const logger = createLogger("building_registry"); @@ -41,6 +42,7 @@ export function initMetaBuildingRegistry() { gMetaBuildingRegistry.register(MetaLeverBuilding); gMetaBuildingRegistry.register(MetaFilterBuilding); gMetaBuildingRegistry.register(MetaWireTunnelBuilding); + gMetaBuildingRegistry.register(MetaDisplayBuilding); // Belt registerBuildingVariant(1, MetaBeltBaseBuilding, defaultBuildingVariant, 0); @@ -115,6 +117,9 @@ export function initMetaBuildingRegistry() { // Wire tunnel registerBuildingVariant(39, MetaWireTunnelBuilding); + // Display + registerBuildingVariant(40, MetaDisplayBuilding); + // Propagate instances for (const key in gBuildingVariants) { gBuildingVariants[key].metaInstance = gMetaBuildingRegistry.findByClass( diff --git a/src/js/game/systems/display.js b/src/js/game/systems/display.js new file mode 100644 index 00000000..b3ae0197 --- /dev/null +++ b/src/js/game/systems/display.js @@ -0,0 +1,99 @@ +import { globalConfig } from "../../core/config"; +import { Loader } from "../../core/loader"; +import { BaseItem, enumItemType } from "../base_item"; +import { enumColors } from "../colors"; +import { DisplayComponent } from "../components/display"; +import { GameSystemWithFilter } from "../game_system_with_filter"; +import { ColorItem, COLOR_ITEM_SINGLETONS } from "../items/color_item"; +import { MapChunkView } from "../map_chunk_view"; +import { enumLayer } from "../root"; +import { BooleanItem } from "../items/boolean_item"; + +export class DisplaySystem extends GameSystemWithFilter { + constructor(root) { + super(root, [DisplayComponent]); + + /** @type {Object} */ + this.displaySprites = {}; + + for (const colorId in enumColors) { + if (colorId === enumColors.uncolored) { + continue; + } + this.displaySprites[colorId] = Loader.getSprite("sprites/wires/display/" + colorId + ".png"); + } + } + + /** + * Returns the color / value a display should show + * @param {BaseItem} value + * @returns {BaseItem} + */ + getDisplayItem(value) { + if (!value) { + return null; + } + + switch (value.getItemType()) { + case enumItemType.boolean: { + return /** @type {BooleanItem} */ (value).value + ? COLOR_ITEM_SINGLETONS[enumColors.white] + : null; + } + + case enumItemType.color: { + const item = /**@type {ColorItem} */ (value); + return item.color === enumColors.uncolored ? null : item; + } + + case enumItemType.shape: { + return value; + } + + default: + assertAlways(false, "Unknown item type: " + value.getItemType()); + } + } + + /** + * Draws a given chunk + * @param {import("../../core/draw_utils").DrawParameters} parameters + * @param {MapChunkView} chunk + */ + drawChunk(parameters, chunk) { + const contents = chunk.containedEntitiesByLayer[enumLayer.regular]; + for (let i = 0; i < contents.length; ++i) { + const entity = contents[i]; + if (entity && entity.components.Display) { + const pinsComp = entity.components.WiredPins; + const network = pinsComp.slots[0].linkedNetwork; + if (!network || !network.currentValue) { + continue; + } + const value = this.getDisplayItem(network.currentValue); + + if (!value) { + continue; + } + + const origin = entity.components.StaticMapEntity.origin; + if (value.getItemType() === enumItemType.color) { + this.displaySprites[/** @type {ColorItem} */ (value).color].drawCachedCentered( + parameters, + (origin.x + 0.5) * globalConfig.tileSize, + (origin.y + 0.5) * globalConfig.tileSize, + globalConfig.tileSize + 3 + ); + } else if (value.getItemType() === enumItemType.shape) { + // @todo + value.draw( + (origin.x + 0.5) * globalConfig.tileSize, + (origin.y + 0.5) * globalConfig.tileSize, + parameters, + 30 + ); + } + } + } + } +} diff --git a/translations/base-en.yaml b/translations/base-en.yaml index b1a53f21..a1a6289e 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -581,6 +581,12 @@ buildings: # TEMP description: Only leaves through items who match exactly the provided shape / color. If you put in a boolean 1, it leaves everything through, if you put in a 0 it will leave nothing through. + display: + default: + name: &display Display + # TEMP + description: Can be connected on the wires layer to show a color or shape. When inputting a boolean item, the display will be white if the value is 1. + storyRewards: # Those are the rewards gained from completing the store reward_cutter_and_trash: @@ -871,6 +877,7 @@ keybindings: lever: *lever filter: *filter wire_tunnel: *wire_tunnel + display: *display # --- pipette: Pipette