diff --git a/res/ui/building_icons/comparator.png b/res/ui/building_icons/comparator.png index d8c95df5..25955e22 100644 Binary files a/res/ui/building_icons/comparator.png and b/res/ui/building_icons/comparator.png differ diff --git a/res/ui/building_tutorials/comparator.png b/res/ui/building_tutorials/comparator.png new file mode 100644 index 00000000..8dfed981 Binary files /dev/null and b/res/ui/building_tutorials/comparator.png differ diff --git a/res/ui/building_tutorials/virtual_processor-rotater.png b/res/ui/building_tutorials/virtual_processor-rotater.png index 25eccaf6..61f8e866 100644 Binary files a/res/ui/building_tutorials/virtual_processor-rotater.png and b/res/ui/building_tutorials/virtual_processor-rotater.png differ diff --git a/res_built/atlas/atlas0_hq.json b/res_built/atlas/atlas0_hq.json index a5f01acf..bdf43f0e 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":381,"y":1767,"w":116,"h":144}, + "frame": {"x":626,"y":1691,"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":503,"y":1762,"w":116,"h":144}, + "frame": {"x":668,"y":1880,"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":871,"y":1811,"w":116,"h":144}, + "frame": {"x":1034,"y":1880,"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":858,"y":1257,"w":116,"h":144}, + "frame": {"x":1156,"y":1880,"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":945,"y":1407,"w":116,"h":144}, + "frame": {"x":1168,"y":1724,"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":980,"y":1257,"w":116,"h":144}, + "frame": {"x":1278,"y":1880,"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":991,"y":1557,"w":116,"h":144}, + "frame": {"x":1400,"y":1880,"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":1067,"y":1407,"w":116,"h":144}, + "frame": {"x":1522,"y":1880,"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":1102,"y":1167,"w":116,"h":144}, + "frame": {"x":1880,"y":1645,"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":1224,"y":1181,"w":116,"h":144}, + "frame": {"x":1730,"y":1713,"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":625,"y":1758,"w":116,"h":144}, + "frame": {"x":748,"y":1724,"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":747,"y":1728,"w":116,"h":144}, + "frame": {"x":790,"y":1880,"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":823,"y":1511,"w":116,"h":144}, + "frame": {"x":1046,"y":1688,"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":869,"y":1661,"w":116,"h":144}, + "frame": {"x":912,"y":1811,"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":592,"y":1912,"w":130,"h":130}, + "frame": {"x":1221,"y":1040,"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":1488,"y":1189,"w":130,"h":130}, + "frame": {"x":1911,"y":965,"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":1896,"y":1255,"w":130,"h":130}, + "frame": {"x":1200,"y":1316,"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":1760,"y":1335,"w":130,"h":130}, + "frame": {"x":1050,"y":1416,"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":1896,"y":1391,"w":130,"h":130}, + "frame": {"x":848,"y":1533,"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":1331,"y":1337,"w":130,"h":130}, + "frame": {"x":699,"y":1554,"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":1467,"y":1461,"w":130,"h":130}, + "frame": {"x":545,"y":1555,"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":1331,"y":1473,"w":130,"h":130}, + "frame": {"x":399,"y":1647,"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":1189,"y":1479,"w":130,"h":130}, + "frame": {"x":252,"y":1771,"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":1603,"y":1462,"w":130,"h":130}, + "frame": {"x":280,"y":1907,"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":1624,"y":1190,"w":130,"h":130}, + "frame": {"x":1911,"y":1101,"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":1488,"y":1325,"w":130,"h":130}, + "frame": {"x":1911,"y":1237,"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":1760,"y":1199,"w":130,"h":130}, + "frame": {"x":1910,"y":1373,"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":1624,"y":1326,"w":130,"h":130}, + "frame": {"x":1347,"y":1268,"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":1467,"y":1597,"w":130,"h":130}, + "frame": {"x":1483,"y":1336,"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":1325,"y":1609,"w":130,"h":130}, + "frame": {"x":1336,"y":1404,"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":1739,"y":1607,"w":130,"h":130}, + "frame": {"x":1322,"y":1540,"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":1597,"y":1734,"w":130,"h":130}, + "frame": {"x":1185,"y":1588,"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":1875,"y":1663,"w":130,"h":130}, + "frame": {"x":1755,"y":1441,"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":1733,"y":1743,"w":130,"h":130}, + "frame": {"x":1608,"y":1516,"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":1115,"y":1879,"w":130,"h":130}, + "frame": {"x":1458,"y":1608,"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":1251,"y":1879,"w":130,"h":130}, + "frame": {"x":1321,"y":1676,"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":1387,"y":1879,"w":130,"h":130}, + "frame": {"x":1891,"y":1509,"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":1523,"y":1879,"w":130,"h":130}, + "frame": {"x":1744,"y":1577,"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":1739,"y":1471,"w":130,"h":130}, + "frame": {"x":1186,"y":1452,"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":1603,"y":1598,"w":130,"h":130}, + "frame": {"x":1049,"y":1552,"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":1461,"y":1733,"w":130,"h":130}, + "frame": {"x":1619,"y":1380,"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":1875,"y":1527,"w":130,"h":130}, + "frame": {"x":1472,"y":1472,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -346,7 +346,7 @@ }, "sprites/blueprints/balancer-merger-inverse.png": { - "frame": {"x":710,"y":1247,"w":142,"h":138}, + "frame": {"x":1507,"y":898,"w":142,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":142,"h":138}, @@ -362,7 +362,7 @@ }, "sprites/blueprints/balancer-splitter-inverse.png": { - "frame": {"x":561,"y":1250,"w":142,"h":138}, + "frame": {"x":1507,"y":1042,"w":142,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":142,"h":138}, @@ -370,7 +370,7 @@ }, "sprites/blueprints/balancer-splitter.png": { - "frame": {"x":416,"y":1236,"w":139,"h":138}, + "frame": {"x":415,"y":1236,"w":139,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, @@ -386,7 +386,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":1659,"y":1879,"w":130,"h":130}, + "frame": {"x":1594,"y":1652,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -394,7 +394,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":1795,"y":1879,"w":130,"h":130}, + "frame": {"x":1457,"y":1744,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -402,7 +402,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":993,"y":1869,"w":116,"h":144}, + "frame": {"x":1644,"y":1863,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -410,7 +410,7 @@ }, "sprites/blueprints/comparator.png": { - "frame": {"x":861,"y":860,"w":144,"h":133}, + "frame": {"x":1071,"y":890,"w":144,"h":133}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":133}, @@ -442,7 +442,7 @@ }, "sprites/blueprints/display.png": { - "frame": {"x":993,"y":1707,"w":128,"h":136}, + "frame": {"x":912,"y":1669,"w":128,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":128,"h":136}, @@ -458,7 +458,7 @@ }, "sprites/blueprints/lever.png": { - "frame": {"x":411,"y":1522,"w":100,"h":116}, + "frame": {"x":1804,"y":1319,"w":100,"h":116}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":22,"y":9,"w":100,"h":116}, @@ -474,7 +474,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":861,"y":999,"w":144,"h":123}, + "frame": {"x":1357,"y":898,"w":144,"h":123}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":123}, @@ -490,7 +490,7 @@ }, "sprites/blueprints/logic_gate.png": { - "frame": {"x":1071,"y":890,"w":144,"h":133}, + "frame": {"x":1071,"y":1029,"w":144,"h":133}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":133}, @@ -506,7 +506,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1898,"y":1106,"w":136,"h":143}, + "frame": {"x":403,"y":1498,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -554,7 +554,7 @@ }, "sprites/blueprints/reader.png": { - "frame": {"x":262,"y":1444,"w":141,"h":144}, + "frame": {"x":860,"y":1006,"w":141,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":144}, @@ -562,7 +562,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":711,"y":1097,"w":143,"h":144}, + "frame": {"x":1357,"y":1118,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -570,7 +570,7 @@ }, "sprites/blueprints/rotater-rotate180.png": { - "frame": {"x":561,"y":1100,"w":143,"h":144}, + "frame": {"x":1655,"y":1081,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -578,7 +578,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":6,"y":1345,"w":143,"h":144}, + "frame": {"x":1506,"y":1186,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -602,7 +602,7 @@ }, "sprites/blueprints/transistor-mirrored.png": { - "frame": {"x":155,"y":1527,"w":100,"h":144}, + "frame": {"x":1805,"y":899,"w":100,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":44,"y":0,"w":100,"h":144}, @@ -610,7 +610,7 @@ }, "sprites/blueprints/transistor.png": { - "frame": {"x":156,"y":1257,"w":102,"h":144}, + "frame": {"x":156,"y":1259,"w":102,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":102,"h":144}, @@ -626,7 +626,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":448,"y":1917,"w":138,"h":125}, + "frame": {"x":6,"y":1636,"w":138,"h":125}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":19,"w":138,"h":125}, @@ -634,7 +634,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":517,"y":1522,"w":138,"h":112}, + "frame": {"x":1060,"y":1168,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -642,7 +642,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":439,"y":1644,"w":139,"h":112}, + "frame": {"x":411,"y":1380,"w":139,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":139,"h":112}, @@ -650,7 +650,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":584,"y":1640,"w":138,"h":112}, + "frame": {"x":853,"y":1298,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":138,"h":112}, @@ -666,7 +666,7 @@ }, "sprites/blueprints/virtual_processor-rotater.png": { - "frame": {"x":134,"y":1784,"w":118,"h":144}, + "frame": {"x":544,"y":1874,"w":118,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":118,"h":144}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":1904,"y":965,"w":138,"h":135}, + "frame": {"x":259,"y":1482,"w":138,"h":135}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":138,"h":135}, @@ -714,7 +714,7 @@ }, "sprites/buildings/balancer-merger-inverse.png": { - "frame": {"x":1356,"y":1047,"w":141,"h":136}, + "frame": {"x":857,"y":1156,"w":141,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":141,"h":136}, @@ -722,7 +722,7 @@ }, "sprites/buildings/balancer-merger.png": { - "frame": {"x":1503,"y":1047,"w":139,"h":136}, + "frame": {"x":708,"y":1295,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -730,7 +730,7 @@ }, "sprites/buildings/balancer-splitter-inverse.png": { - "frame": {"x":413,"y":1380,"w":142,"h":136}, + "frame": {"x":6,"y":1345,"w":142,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":142,"h":136}, @@ -738,7 +738,7 @@ }, "sprites/buildings/balancer-splitter.png": { - "frame": {"x":1648,"y":1048,"w":139,"h":136}, + "frame": {"x":560,"y":1296,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -754,7 +754,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":592,"y":1912,"w":130,"h":130}, + "frame": {"x":1221,"y":1040,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":14,"w":130,"h":130}, @@ -762,7 +762,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1467,"y":1597,"w":130,"h":130}, + "frame": {"x":1483,"y":1336,"w":130,"h":130}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":14,"w":130,"h":130}, @@ -770,7 +770,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":381,"y":1767,"w":116,"h":144}, + "frame": {"x":626,"y":1691,"w":116,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":116,"h":144}, @@ -778,7 +778,7 @@ }, "sprites/buildings/comparator.png": { - "frame": {"x":6,"y":1495,"w":143,"h":133}, + "frame": {"x":711,"y":1006,"w":143,"h":133}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":133}, @@ -786,10 +786,10 @@ }, "sprites/buildings/constant_signal.png": { - "frame": {"x":156,"y":1048,"w":104,"h":127}, + "frame": {"x":156,"y":1048,"w":104,"h":129}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":20,"y":0,"w":104,"h":127}, + "spriteSourceSize": {"x":20,"y":0,"w":104,"h":129}, "sourceSize": {"w":144,"h":144} }, "sprites/buildings/cutter-quad.png": @@ -810,7 +810,7 @@ }, "sprites/buildings/display.png": { - "frame": {"x":1224,"y":1040,"w":126,"h":135}, + "frame": {"x":148,"y":1907,"w":126,"h":135}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":126,"h":135}, @@ -834,7 +834,7 @@ }, "sprites/buildings/lever.png": { - "frame": {"x":335,"y":1647,"w":98,"h":114}, + "frame": {"x":153,"y":1559,"w":98,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":10,"w":98,"h":114}, @@ -842,7 +842,7 @@ }, "sprites/buildings/logic_gate-not.png": { - "frame": {"x":6,"y":1784,"w":122,"h":144}, + "frame": {"x":416,"y":1874,"w":122,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":0,"w":122,"h":144}, @@ -850,7 +850,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":860,"y":1128,"w":143,"h":123}, + "frame": {"x":266,"y":1204,"w":143,"h":123}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":123}, @@ -858,7 +858,7 @@ }, "sprites/buildings/logic_gate-xor.png": { - "frame": {"x":264,"y":1295,"w":143,"h":143}, + "frame": {"x":1655,"y":1231,"w":143,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":143}, @@ -866,7 +866,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":1071,"y":1029,"w":143,"h":132}, + "frame": {"x":561,"y":1009,"w":143,"h":132}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":132}, @@ -874,7 +874,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1346,"y":1189,"w":136,"h":142}, + "frame": {"x":257,"y":1623,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -882,7 +882,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1189,"y":1331,"w":136,"h":142}, + "frame": {"x":6,"y":1767,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -930,7 +930,7 @@ }, "sprites/buildings/reader.png": { - "frame": {"x":6,"y":1634,"w":141,"h":144}, + "frame": {"x":710,"y":1145,"w":141,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":144}, @@ -938,7 +938,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":1357,"y":898,"w":141,"h":143}, + "frame": {"x":561,"y":1147,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -946,7 +946,7 @@ }, "sprites/buildings/rotater-rotate180.png": { - "frame": {"x":1504,"y":898,"w":141,"h":143}, + "frame": {"x":264,"y":1333,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -954,7 +954,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":1651,"y":899,"w":141,"h":143}, + "frame": {"x":6,"y":1487,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -978,7 +978,7 @@ }, "sprites/buildings/transistor-mirrored.png": { - "frame": {"x":1793,"y":1049,"w":99,"h":144}, + "frame": {"x":154,"y":1409,"w":99,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":45,"y":0,"w":99,"h":144}, @@ -986,7 +986,7 @@ }, "sprites/buildings/transistor.png": { - "frame": {"x":1798,"y":899,"w":100,"h":144}, + "frame": {"x":1805,"y":1049,"w":100,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":100,"h":144}, @@ -1002,7 +1002,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":305,"y":1918,"w":137,"h":124}, + "frame": {"x":1057,"y":1286,"w":137,"h":124}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":20,"w":137,"h":124}, @@ -1010,7 +1010,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":561,"y":1394,"w":137,"h":111}, + "frame": {"x":853,"y":1416,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -1018,7 +1018,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":661,"y":1511,"w":137,"h":111}, + "frame": {"x":705,"y":1437,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -1026,7 +1026,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":704,"y":1394,"w":137,"h":111}, + "frame": {"x":556,"y":1438,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -1042,10 +1042,10 @@ }, "sprites/buildings/virtual_processor-rotater.png": { - "frame": {"x":258,"y":1768,"w":117,"h":144}, + "frame": {"x":711,"y":860,"w":144,"h":140}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":14,"y":0,"w":117,"h":144}, + "spriteSourceSize": {"x":0,"y":4,"w":144,"h":140}, "sourceSize": {"w":144,"h":144} }, "sprites/buildings/virtual_processor-stacker.png": @@ -1066,7 +1066,7 @@ }, "sprites/buildings/virtual_processor.png": { - "frame": {"x":711,"y":860,"w":144,"h":140}, + "frame": {"x":861,"y":860,"w":144,"h":140}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":144,"h":140}, @@ -1074,7 +1074,7 @@ }, "sprites/buildings/wire_tunnel.png": { - "frame": {"x":728,"y":1908,"w":137,"h":134}, + "frame": {"x":1204,"y":1176,"w":137,"h":134}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":137,"h":134}, @@ -1162,7 +1162,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":1011,"y":1040,"w":48,"h":48}, + "frame": {"x":1007,"y":1040,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1186,7 +1186,7 @@ }, "sprites/misc/reader_overlay.png": { - "frame": {"x":156,"y":1181,"w":104,"h":70}, + "frame": {"x":156,"y":1183,"w":104,"h":70}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":38,"w":104,"h":70}, @@ -1210,7 +1210,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":728,"y":1628,"w":89,"h":44}, + "frame": {"x":148,"y":1781,"w":89,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":89,"h":44}, @@ -1218,7 +1218,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":261,"y":1594,"w":38,"h":48}, + "frame": {"x":148,"y":1831,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -1242,7 +1242,7 @@ }, "sprites/wires/display/blue.png": { - "frame": {"x":1009,"y":1148,"w":47,"h":47}, + "frame": {"x":1007,"y":1148,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, @@ -1250,7 +1250,7 @@ }, "sprites/wires/display/cyan.png": { - "frame": {"x":305,"y":1594,"w":47,"h":47}, + "frame": {"x":1004,"y":1201,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, @@ -1258,7 +1258,7 @@ }, "sprites/wires/display/green.png": { - "frame": {"x":199,"y":1934,"w":47,"h":47}, + "frame": {"x":1004,"y":1254,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, @@ -1266,7 +1266,7 @@ }, "sprites/wires/display/purple.png": { - "frame": {"x":199,"y":1987,"w":47,"h":47}, + "frame": {"x":997,"y":1307,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, @@ -1274,7 +1274,7 @@ }, "sprites/wires/display/red.png": { - "frame": {"x":252,"y":1934,"w":47,"h":47}, + "frame": {"x":997,"y":1360,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, @@ -1282,7 +1282,7 @@ }, "sprites/wires/display/white.png": { - "frame": {"x":252,"y":1987,"w":47,"h":47}, + "frame": {"x":997,"y":1413,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, @@ -1290,7 +1290,7 @@ }, "sprites/wires/display/yellow.png": { - "frame": {"x":358,"y":1594,"w":47,"h":47}, + "frame": {"x":996,"y":1466,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":47,"h":47}, @@ -1298,7 +1298,7 @@ }, "sprites/wires/lever_on.png": { - "frame": {"x":155,"y":1407,"w":101,"h":114}, + "frame": {"x":1804,"y":1199,"w":101,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":21,"y":10,"w":101,"h":114}, @@ -1322,7 +1322,7 @@ }, "sprites/wires/network_conflict.png": { - "frame": {"x":728,"y":1678,"w":47,"h":44}, + "frame": {"x":996,"y":1519,"w":47,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":2,"w":47,"h":44}, @@ -1338,7 +1338,7 @@ }, "sprites/wires/overlay_tile.png": { - "frame": {"x":6,"y":1934,"w":96,"h":96}, + "frame": {"x":150,"y":1679,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1362,7 +1362,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":711,"y":1006,"w":144,"h":85}, + "frame": {"x":1357,"y":1027,"w":144,"h":85}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":59,"w":144,"h":85}, @@ -1370,7 +1370,7 @@ }, "sprites/wires/sets/conflict_turn.png": { - "frame": {"x":108,"y":1934,"w":85,"h":85}, + "frame": {"x":388,"y":1783,"w":85,"h":85}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":59,"y":59,"w":85,"h":85}, @@ -1394,7 +1394,7 @@ }, "sprites/wires/sets/first_split.png": { - "frame": {"x":561,"y":1009,"w":144,"h":85}, + "frame": {"x":1655,"y":899,"w":144,"h":85}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":59,"w":144,"h":85}, @@ -1402,7 +1402,7 @@ }, "sprites/wires/sets/first_turn.png": { - "frame": {"x":153,"y":1677,"w":85,"h":85}, + "frame": {"x":479,"y":1783,"w":85,"h":85}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":59,"y":59,"w":85,"h":85}, @@ -1426,7 +1426,7 @@ }, "sprites/wires/sets/second_split.png": { - "frame": {"x":266,"y":1204,"w":144,"h":85}, + "frame": {"x":1655,"y":990,"w":144,"h":85}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":59,"w":144,"h":85}, @@ -1434,7 +1434,7 @@ }, "sprites/wires/sets/second_turn.png": { - "frame": {"x":244,"y":1677,"w":85,"h":85}, + "frame": {"x":535,"y":1691,"w":85,"h":85}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":59,"y":59,"w":85,"h":85}, @@ -1442,7 +1442,7 @@ }, "sprites/wires/wires_preview.png": { - "frame": {"x":1011,"y":1094,"w":48,"h":48}, + "frame": {"x":1007,"y":1094,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1455,6 +1455,6 @@ "format": "RGBA8888", "size": {"w":2048,"h":2048}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:c61d9c7c8f387e344954d344de26c19e:20296b3e09d5b363b1e55eee3b673411:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:e2ebe660317d3aa17f637059013d3269:c2adc6dc90c9e20713ac1fde2cecfe9f:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_hq.png b/res_built/atlas/atlas0_hq.png index 4fd522ec..d4447c94 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 b3ebc4c1..290b4ce3 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":978,"y":383,"w":40,"h":48}, + "frame": {"x":978,"y":484,"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":531,"y":422,"w":40,"h":48}, + "frame": {"x":827,"y":518,"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":411,"y":518,"w":40,"h":48}, + "frame": {"x":381,"y":423,"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":289,"y":565,"w":40,"h":48}, + "frame": {"x":327,"y":461,"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":234,"y":596,"w":40,"h":48}, + "frame": {"x":273,"y":493,"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":155,"y":611,"w":40,"h":48}, + "frame": {"x":189,"y":496,"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":102,"y":647,"w":40,"h":48}, + "frame": {"x":133,"y":547,"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":52,"y":675,"w":40,"h":48}, + "frame": {"x":59,"y":571,"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":6,"y":679,"w":40,"h":48}, + "frame": {"x":6,"y":584,"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":678,"y":375,"w":40,"h":48}, + "frame": {"x":483,"y":422,"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":109,"y":593,"w":40,"h":48}, + "frame": {"x":873,"y":518,"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":56,"y":621,"w":40,"h":48}, + "frame": {"x":919,"y":534,"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":6,"y":625,"w":40,"h":48}, + "frame": {"x":965,"y":538,"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":365,"y":518,"w":40,"h":48}, + "frame": {"x":437,"y":422,"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":628,"y":275,"w":44,"h":44}, + "frame": {"x":631,"y":276,"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":678,"y":275,"w":44,"h":44}, + "frame": {"x":631,"y":326,"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":578,"y":327,"w":44,"h":44}, + "frame": {"x":835,"y":318,"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":482,"y":372,"w":44,"h":44}, + "frame": {"x":735,"y":325,"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":381,"y":418,"w":44,"h":44}, + "frame": {"x":785,"y":325,"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":431,"y":418,"w":44,"h":44}, + "frame": {"x":681,"y":327,"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":265,"y":496,"w":44,"h":44}, + "frame": {"x":628,"y":376,"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":189,"y":511,"w":44,"h":44}, + "frame": {"x":577,"y":378,"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":134,"y":543,"w":44,"h":44}, + "frame": {"x":835,"y":368,"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":59,"y":571,"w":44,"h":44}, + "frame": {"x":885,"y":368,"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":728,"y":275,"w":44,"h":44}, + "frame": {"x":578,"y":328,"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":778,"y":275,"w":44,"h":44}, + "frame": {"x":482,"y":372,"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":828,"y":318,"w":44,"h":44}, + "frame": {"x":735,"y":275,"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":628,"y":325,"w":44,"h":44}, + "frame": {"x":785,"y":275,"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":6,"y":575,"w":44,"h":44}, + "frame": {"x":935,"y":384,"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":678,"y":325,"w":44,"h":44}, + "frame": {"x":731,"y":375,"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":928,"y":383,"w":44,"h":44}, + "frame": {"x":881,"y":418,"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":628,"y":375,"w":44,"h":44}, + "frame": {"x":931,"y":434,"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":577,"y":377,"w":44,"h":44}, + "frame": {"x":728,"y":425,"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":481,"y":422,"w":44,"h":44}, + "frame": {"x":677,"y":427,"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":381,"y":468,"w":44,"h":44}, + "frame": {"x":778,"y":425,"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":431,"y":468,"w":44,"h":44}, + "frame": {"x":828,"y":468,"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":481,"y":472,"w":44,"h":44}, + "frame": {"x":878,"y":468,"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":315,"y":515,"w":44,"h":44}, + "frame": {"x":928,"y":484,"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":728,"y":325,"w":44,"h":44}, + "frame": {"x":678,"y":377,"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":778,"y":325,"w":44,"h":44}, + "frame": {"x":627,"y":426,"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":828,"y":368,"w":44,"h":44}, + "frame": {"x":781,"y":375,"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":878,"y":368,"w":44,"h":44}, + "frame": {"x":831,"y":418,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -354,7 +354,7 @@ }, "sprites/blueprints/balancer-merger.png": { - "frame": {"x":632,"y":222,"w":47,"h":47}, + "frame": {"x":578,"y":275,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -386,7 +386,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":239,"y":546,"w":44,"h":44}, + "frame": {"x":727,"y":475,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -394,7 +394,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":184,"y":561,"w":44,"h":44}, + "frame": {"x":777,"y":475,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -402,7 +402,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":627,"y":425,"w":40,"h":48}, + "frame": {"x":529,"y":422,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -410,7 +410,7 @@ }, "sprites/blueprints/comparator.png": { - "frame": {"x":389,"y":270,"w":48,"h":45}, + "frame": {"x":281,"y":353,"w":48,"h":45}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":45}, @@ -418,7 +418,7 @@ }, "sprites/blueprints/constant_signal.png": { - "frame": {"x":239,"y":305,"w":36,"h":43}, + "frame": {"x":239,"y":355,"w":36,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":36,"h":43}, @@ -442,7 +442,7 @@ }, "sprites/blueprints/display.png": { - "frame": {"x":947,"y":331,"w":44,"h":46}, + "frame": {"x":947,"y":332,"w":44,"h":46}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":44,"h":46}, @@ -466,7 +466,7 @@ }, "sprites/blueprints/logic_gate-not.png": { - "frame": {"x":232,"y":403,"w":42,"h":48}, + "frame": {"x":286,"y":404,"w":42,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":42,"h":48}, @@ -474,7 +474,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":280,"y":404,"w":48,"h":42}, + "frame": {"x":232,"y":404,"w":48,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":42}, @@ -490,7 +490,7 @@ }, "sprites/blueprints/logic_gate.png": { - "frame": {"x":281,"y":353,"w":48,"h":45}, + "frame": {"x":178,"y":359,"w":48,"h":45}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":45}, @@ -498,7 +498,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":212,"y":457,"w":47,"h":48}, + "frame": {"x":136,"y":493,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -506,7 +506,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":136,"y":489,"w":47,"h":48}, + "frame": {"x":80,"y":517,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -626,7 +626,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":387,"y":321,"w":48,"h":43}, + "frame": {"x":383,"y":374,"w":48,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":48,"h":43}, @@ -634,7 +634,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":280,"y":452,"w":48,"h":38}, + "frame": {"x":84,"y":438,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -642,7 +642,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":143,"y":410,"w":48,"h":38}, + "frame": {"x":6,"y":486,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -650,7 +650,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":84,"y":438,"w":48,"h":38}, + "frame": {"x":219,"y":452,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":951,"y":180,"w":48,"h":47}, + "frame": {"x":578,"y":222,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -714,7 +714,7 @@ }, "sprites/buildings/balancer-merger-inverse.png": { - "frame": {"x":578,"y":222,"w":48,"h":47}, + "frame": {"x":483,"y":268,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -730,7 +730,7 @@ }, "sprites/buildings/balancer-splitter-inverse.png": { - "frame": {"x":483,"y":268,"w":48,"h":47}, + "frame": {"x":389,"y":270,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -754,7 +754,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":628,"y":275,"w":44,"h":44}, + "frame": {"x":631,"y":276,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":44,"h":44}, @@ -762,7 +762,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":6,"y":575,"w":44,"h":44}, + "frame": {"x":935,"y":384,"w":44,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":44,"h":44}, @@ -770,7 +770,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":978,"y":383,"w":40,"h":48}, + "frame": {"x":978,"y":484,"w":40,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":40,"h":48}, @@ -778,7 +778,7 @@ }, "sprites/buildings/comparator.png": { - "frame": {"x":178,"y":359,"w":48,"h":45}, + "frame": {"x":482,"y":321,"w":48,"h":45}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":45}, @@ -786,10 +786,10 @@ }, "sprites/buildings/constant_signal.png": { - "frame": {"x":239,"y":354,"w":36,"h":43}, + "frame": {"x":239,"y":305,"w":36,"h":44}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":6,"y":0,"w":36,"h":43}, + "spriteSourceSize": {"x":6,"y":0,"w":36,"h":44}, "sourceSize": {"w":48,"h":48} }, "sprites/buildings/cutter-quad.png": @@ -810,7 +810,7 @@ }, "sprites/buildings/display.png": { - "frame": {"x":578,"y":275,"w":44,"h":46}, + "frame": {"x":685,"y":275,"w":44,"h":46}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":44,"h":46}, @@ -850,7 +850,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":383,"y":370,"w":48,"h":42}, + "frame": {"x":143,"y":410,"w":48,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":42}, @@ -866,7 +866,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":482,"y":321,"w":48,"h":45}, + "frame": {"x":387,"y":323,"w":48,"h":45}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":45}, @@ -874,7 +874,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":81,"y":517,"w":47,"h":48}, + "frame": {"x":6,"y":530,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -882,7 +882,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":6,"y":521,"w":47,"h":48}, + "frame": {"x":632,"y":222,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -1010,7 +1010,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":950,"y":233,"w":47,"h":38}, + "frame": {"x":950,"y":234,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -1034,7 +1034,7 @@ }, "sprites/buildings/virtual_processor-painter.png": { - "frame": {"x":950,"y":277,"w":44,"h":48}, + "frame": {"x":950,"y":278,"w":44,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":44,"h":48}, @@ -1042,10 +1042,10 @@ }, "sprites/buildings/virtual_processor-rotater.png": { - "frame": {"x":334,"y":461,"w":41,"h":48}, + "frame": {"x":632,"y":168,"w":48,"h":48}, "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":4,"y":0,"w":41,"h":48}, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, "sourceSize": {"w":48,"h":48} }, "sprites/buildings/virtual_processor-stacker.png": @@ -1058,7 +1058,7 @@ }, "sprites/buildings/virtual_processor-unstacker.png": { - "frame": {"x":632,"y":168,"w":48,"h":48}, + "frame": {"x":686,"y":168,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1066,7 +1066,7 @@ }, "sprites/buildings/virtual_processor.png": { - "frame": {"x":686,"y":168,"w":48,"h":48}, + "frame": {"x":740,"y":168,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1218,7 +1218,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":192,"y":454,"w":14,"h":16}, + "frame": {"x":60,"y":498,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1330,7 +1330,7 @@ }, "sprites/wires/network_empty.png": { - "frame": {"x":60,"y":498,"w":15,"h":16}, + "frame": {"x":197,"y":454,"w":15,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":15,"h":16}, @@ -1346,7 +1346,7 @@ }, "sprites/wires/sets/conflict_cross.png": { - "frame": {"x":740,"y":168,"w":48,"h":48}, + "frame": {"x":794,"y":168,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1362,7 +1362,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":6,"y":486,"w":48,"h":29}, + "frame": {"x":138,"y":458,"w":48,"h":29}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":19,"w":48,"h":29}, @@ -1378,7 +1378,7 @@ }, "sprites/wires/sets/first_cross.png": { - "frame": {"x":794,"y":168,"w":48,"h":48}, + "frame": {"x":848,"y":168,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1394,7 +1394,7 @@ }, "sprites/wires/sets/first_split.png": { - "frame": {"x":138,"y":454,"w":48,"h":29}, + "frame": {"x":82,"y":482,"w":48,"h":29}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":19,"w":48,"h":29}, @@ -1410,7 +1410,7 @@ }, "sprites/wires/sets/second_cross.png": { - "frame": {"x":848,"y":168,"w":48,"h":48}, + "frame": {"x":951,"y":180,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1426,7 +1426,7 @@ }, "sprites/wires/sets/second_split.png": { - "frame": {"x":82,"y":482,"w":48,"h":29}, + "frame": {"x":273,"y":458,"w":48,"h":29}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":19,"w":48,"h":29}, @@ -1455,6 +1455,6 @@ "format": "RGBA8888", "size": {"w":1024,"h":1024}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:c61d9c7c8f387e344954d344de26c19e:20296b3e09d5b363b1e55eee3b673411:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:e2ebe660317d3aa17f637059013d3269:c2adc6dc90c9e20713ac1fde2cecfe9f:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_lq.png b/res_built/atlas/atlas0_lq.png index 1d33b061..b7858c03 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 47e1845c..f7a59c78 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":659,"y":883,"w":78,"h":96}, + "frame": {"x":659,"y":781,"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":94,"y":1900,"w":78,"h":96}, + "frame": {"x":659,"y":883,"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":262,"y":1918,"w":78,"h":96}, + "frame": {"x":178,"y":1941,"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":346,"y":1918,"w":78,"h":96}, + "frame": {"x":179,"y":1839,"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":430,"y":1853,"w":78,"h":96}, + "frame": {"x":262,"y":1941,"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":835,"y":1509,"w":78,"h":96}, + "frame": {"x":263,"y":1839,"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":734,"y":1597,"w":78,"h":96}, + "frame": {"x":346,"y":1941,"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":919,"y":1509,"w":78,"h":96}, + "frame": {"x":347,"y":1839,"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":560,"y":1674,"w":78,"h":96}, + "frame": {"x":430,"y":1941,"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":644,"y":1674,"w":78,"h":96}, + "frame": {"x":431,"y":1839,"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":178,"y":1871,"w":78,"h":96}, + "frame": {"x":836,"y":1040,"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":476,"y":1672,"w":78,"h":96}, + "frame": {"x":836,"y":1142,"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":378,"y":1751,"w":78,"h":96}, + "frame": {"x":94,"y":1941,"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":285,"y":1816,"w":78,"h":96}, + "frame": {"x":95,"y":1839,"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":799,"y":1318,"w":87,"h":87}, + "frame": {"x":406,"y":1459,"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":699,"y":1395,"w":87,"h":87}, + "frame": {"x":304,"y":1475,"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":176,"y":1406,"w":87,"h":87}, + "frame": {"x":397,"y":1552,"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":370,"y":1444,"w":87,"h":87}, + "frame": {"x":903,"y":1374,"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":269,"y":1493,"w":87,"h":87}, + "frame": {"x":796,"y":1433,"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":463,"y":1472,"w":87,"h":87}, + "frame": {"x":698,"y":1515,"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":362,"y":1537,"w":87,"h":87}, + "frame": {"x":592,"y":1539,"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":556,"y":1486,"w":87,"h":87}, + "frame": {"x":490,"y":1575,"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":455,"y":1565,"w":87,"h":87}, + "frame": {"x":164,"y":1472,"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":649,"y":1488,"w":87,"h":87}, + "frame": {"x":889,"y":1467,"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":892,"y":1323,"w":87,"h":87}, + "frame": {"x":810,"y":1340,"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":792,"y":1411,"w":87,"h":87}, + "frame": {"x":703,"y":1422,"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":885,"y":1416,"w":87,"h":87}, + "frame": {"x":605,"y":1446,"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":277,"y":1400,"w":87,"h":87}, + "frame": {"x":499,"y":1482,"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":548,"y":1579,"w":87,"h":87}, + "frame": {"x":791,"y":1526,"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":742,"y":1504,"w":87,"h":87}, + "frame": {"x":685,"y":1608,"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":99,"y":1592,"w":87,"h":87}, + "frame": {"x":871,"y":1653,"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":6,"y":1618,"w":87,"h":87}, + "frame": {"x":769,"y":1712,"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":290,"y":1630,"w":87,"h":87}, + "frame": {"x":6,"y":1501,"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":192,"y":1679,"w":87,"h":87}, + "frame": {"x":862,"y":1746,"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":99,"y":1685,"w":87,"h":87}, + "frame": {"x":598,"y":1936,"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":6,"y":1711,"w":87,"h":87}, + "frame": {"x":607,"y":1839,"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":383,"y":1658,"w":87,"h":87}, + "frame": {"x":6,"y":1725,"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":285,"y":1723,"w":87,"h":87}, + "frame": {"x":99,"y":1725,"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":641,"y":1581,"w":87,"h":87}, + "frame": {"x":583,"y":1632,"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":104,"y":1499,"w":87,"h":87}, + "frame": {"x":884,"y":1560,"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":6,"y":1525,"w":87,"h":87}, + "frame": {"x":778,"y":1619,"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":197,"y":1586,"w":87,"h":87}, + "frame": {"x":676,"y":1701,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -346,7 +346,7 @@ }, "sprites/blueprints/balancer-merger-inverse.png": { - "frame": {"x":530,"y":1080,"w":95,"h":93}, + "frame": {"x":182,"y":1017,"w":95,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":95,"h":93}, @@ -354,7 +354,7 @@ }, "sprites/blueprints/balancer-merger.png": { - "frame": {"x":733,"y":1008,"w":93,"h":93}, + "frame": {"x":322,"y":1091,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":1,"w":93,"h":93}, @@ -362,7 +362,7 @@ }, "sprites/blueprints/balancer-splitter-inverse.png": { - "frame": {"x":425,"y":1083,"w":95,"h":93}, + "frame": {"x":6,"y":1114,"w":95,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":95,"h":93}, @@ -370,7 +370,7 @@ }, "sprites/blueprints/balancer-splitter.png": { - "frame": {"x":631,"y":1087,"w":93,"h":93}, + "frame": {"x":181,"y":1116,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":1,"w":93,"h":93}, @@ -386,7 +386,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":192,"y":1772,"w":87,"h":87}, + "frame": {"x":192,"y":1565,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -394,7 +394,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":99,"y":1778,"w":87,"h":87}, + "frame": {"x":99,"y":1565,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -402,7 +402,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":818,"y":1611,"w":78,"h":96}, + "frame": {"x":514,"y":1941,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -418,7 +418,7 @@ }, "sprites/blueprints/constant_signal.png": { - "frame": {"x":846,"y":804,"w":71,"h":85}, + "frame": {"x":845,"y":804,"w":71,"h":85}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":71,"h":85}, @@ -442,7 +442,7 @@ }, "sprites/blueprints/display.png": { - "frame": {"x":829,"y":1141,"w":86,"h":91}, + "frame": {"x":515,"y":1839,"w":86,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":86,"h":91}, @@ -466,7 +466,7 @@ }, "sprites/blueprints/logic_gate-not.png": { - "frame": {"x":832,"y":1039,"w":83,"h":96}, + "frame": {"x":6,"y":1839,"w":83,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":83,"h":96}, @@ -474,7 +474,7 @@ }, "sprites/blueprints/logic_gate-or.png": { - "frame": {"x":182,"y":1017,"w":96,"h":82}, + "frame": {"x":632,"y":1079,"w":96,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":82}, @@ -498,7 +498,7 @@ }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":179,"y":1304,"w":92,"h":96}, + "frame": {"x":6,"y":1310,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -506,7 +506,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":6,"y":1423,"w":92,"h":96}, + "frame": {"x":317,"y":1271,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -578,7 +578,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":744,"y":804,"w":96,"h":96}, + "frame": {"x":743,"y":804,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -618,7 +618,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":922,"y":925,"w":96,"h":96}, + "frame": {"x":922,"y":823,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -626,7 +626,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":526,"y":1179,"w":93,"h":84}, + "frame": {"x":421,"y":1188,"w":93,"h":84}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":12,"w":93,"h":84}, @@ -634,7 +634,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":422,"y":1182,"w":93,"h":75}, + "frame": {"x":319,"y":1190,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":21,"w":93,"h":75}, @@ -642,7 +642,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":6,"y":1342,"w":94,"h":75}, + "frame": {"x":920,"y":1293,"w":94,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":94,"h":75}, @@ -650,7 +650,7 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":319,"y":1239,"w":93,"h":75}, + "frame": {"x":179,"y":1215,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":93,"h":75}, @@ -658,7 +658,7 @@ }, "sprites/blueprints/virtual_processor-painter.png": { - "frame": {"x":613,"y":1282,"w":87,"h":96}, + "frame": {"x":313,"y":1373,"w":87,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":87,"h":96}, @@ -674,7 +674,7 @@ }, "sprites/blueprints/virtual_processor-stacker.png": { - "frame": {"x":513,"y":1370,"w":87,"h":96}, + "frame": {"x":717,"y":1320,"w":87,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":87,"h":96}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/virtual_processor-unstacker.png": { - "frame": {"x":353,"y":787,"w":96,"h":96}, + "frame": {"x":921,"y":925,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -690,7 +690,7 @@ }, "sprites/blueprints/virtual_processor.png": { - "frame": {"x":182,"y":917,"w":96,"h":94}, + "frame": {"x":326,"y":889,"w":96,"h":94}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":96,"h":94}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/wire_tunnel.png": { - "frame": {"x":730,"y":1107,"w":93,"h":91}, + "frame": {"x":6,"y":1213,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":93,"h":91}, @@ -706,7 +706,7 @@ }, "sprites/buildings/analyzer.png": { - "frame": {"x":455,"y":787,"w":96,"h":96}, + "frame": {"x":353,"y":787,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -714,7 +714,7 @@ }, "sprites/buildings/balancer-merger-inverse.png": { - "frame": {"x":180,"y":1207,"w":94,"h":91}, + "frame": {"x":730,"y":1223,"w":94,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":94,"h":91}, @@ -722,7 +722,7 @@ }, "sprites/buildings/balancer-merger.png": { - "frame": {"x":921,"y":1129,"w":93,"h":91}, + "frame": {"x":421,"y":1091,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, @@ -730,7 +730,7 @@ }, "sprites/buildings/balancer-splitter-inverse.png": { - "frame": {"x":321,"y":1142,"w":95,"h":91}, + "frame": {"x":629,"y":1167,"w":95,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":95,"h":91}, @@ -738,7 +738,7 @@ }, "sprites/buildings/balancer-splitter.png": { - "frame": {"x":921,"y":1226,"w":93,"h":91}, + "frame": {"x":520,"y":1182,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, @@ -754,7 +754,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":799,"y":1318,"w":87,"h":87}, + "frame": {"x":406,"y":1459,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":87,"h":87}, @@ -762,7 +762,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":548,"y":1579,"w":87,"h":87}, + "frame": {"x":791,"y":1526,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":87,"h":87}, @@ -770,7 +770,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":659,"y":883,"w":78,"h":96}, + "frame": {"x":659,"y":781,"w":78,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":78,"h":96}, @@ -786,10 +786,10 @@ }, "sprites/buildings/constant_signal.png": { - "frame": {"x":846,"y":895,"w":70,"h":85}, + "frame": {"x":845,"y":895,"w":70,"h":86}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":13,"y":0,"w":70,"h":85}, + "spriteSourceSize": {"x":13,"y":0,"w":70,"h":86}, "sourceSize": {"w":96,"h":96} }, "sprites/buildings/cutter-quad.png": @@ -810,7 +810,7 @@ }, "sprites/buildings/display.png": { - "frame": {"x":6,"y":1804,"w":84,"h":90}, + "frame": {"x":830,"y":1244,"w":84,"h":90}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":84,"h":90}, @@ -834,7 +834,7 @@ }, "sprites/buildings/lever.png": { - "frame": {"x":107,"y":1295,"w":66,"h":77}, + "frame": {"x":105,"y":1295,"w":66,"h":77}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":15,"y":6,"w":66,"h":77}, @@ -842,7 +842,7 @@ }, "sprites/buildings/logic_gate-not.png": { - "frame": {"x":6,"y":1900,"w":82,"h":96}, + "frame": {"x":6,"y":1941,"w":82,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":82,"h":96}, @@ -850,7 +850,7 @@ }, "sprites/buildings/logic_gate-or.png": { - "frame": {"x":326,"y":990,"w":96,"h":83}, + "frame": {"x":734,"y":1008,"w":96,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":83}, @@ -858,7 +858,7 @@ }, "sprites/buildings/logic_gate-xor.png": { - "frame": {"x":326,"y":889,"w":96,"h":95}, + "frame": {"x":921,"y":1027,"w":96,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":95}, @@ -866,7 +866,7 @@ }, "sprites/buildings/logic_gate.png": { - "frame": {"x":428,"y":989,"w":96,"h":88}, + "frame": {"x":632,"y":985,"w":96,"h":88}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":88}, @@ -874,7 +874,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":516,"y":1269,"w":91,"h":95}, + "frame": {"x":513,"y":1279,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -882,7 +882,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":416,"y":1343,"w":91,"h":95}, + "frame": {"x":415,"y":1358,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -930,7 +930,7 @@ }, "sprites/buildings/reader.png": { - "frame": {"x":923,"y":823,"w":95,"h":96}, + "frame": {"x":920,"y":1191,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -938,7 +938,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":181,"y":1105,"w":95,"h":96}, + "frame": {"x":326,"y":989,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -946,7 +946,7 @@ }, "sprites/buildings/rotater-rotate180.png": { - "frame": {"x":6,"y":1240,"w":95,"h":96}, + "frame": {"x":427,"y":989,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -954,7 +954,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":632,"y":985,"w":95,"h":96}, + "frame": {"x":528,"y":1080,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -978,7 +978,7 @@ }, "sprites/buildings/transistor-mirrored.png": { - "frame": {"x":108,"y":1193,"w":66,"h":96}, + "frame": {"x":107,"y":1193,"w":66,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":30,"y":0,"w":66,"h":96}, @@ -994,7 +994,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":182,"y":815,"w":96,"h":96}, + "frame": {"x":455,"y":787,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1002,7 +1002,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":723,"y":1204,"w":92,"h":83}, + "frame": {"x":6,"y":1412,"w":92,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":13,"w":92,"h":83}, @@ -1010,7 +1010,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":821,"y":1238,"w":92,"h":74}, + "frame": {"x":174,"y":1392,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":22,"w":92,"h":74}, @@ -1018,7 +1018,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":418,"y":1263,"w":92,"h":74}, + "frame": {"x":415,"y":1278,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -1026,7 +1026,7 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":318,"y":1320,"w":92,"h":74}, + "frame": {"x":619,"y":1264,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -1034,7 +1034,7 @@ }, "sprites/buildings/virtual_processor-painter.png": { - "frame": {"x":706,"y":1293,"w":87,"h":96}, + "frame": {"x":610,"y":1344,"w":87,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":87,"h":96}, @@ -1042,15 +1042,15 @@ }, "sprites/buildings/virtual_processor-rotater.png": { - "frame": {"x":659,"y":781,"w":79,"h":96}, + "frame": {"x":182,"y":917,"w":96,"h":94}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":9,"y":0,"w":79,"h":96}, + "spriteSourceSize": {"x":0,"y":2,"w":96,"h":94}, "sourceSize": {"w":96,"h":96} }, "sprites/buildings/virtual_processor-stacker.png": { - "frame": {"x":606,"y":1384,"w":87,"h":96}, + "frame": {"x":512,"y":1380,"w":87,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":87,"h":96}, @@ -1058,7 +1058,7 @@ }, "sprites/buildings/virtual_processor-unstacker.png": { - "frame": {"x":6,"y":822,"w":96,"h":96}, + "frame": {"x":182,"y":815,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1074,7 +1074,7 @@ }, "sprites/buildings/wire_tunnel.png": { - "frame": {"x":625,"y":1186,"w":92,"h":90}, + "frame": {"x":177,"y":1296,"w":92,"h":90}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":92,"h":90}, @@ -1162,7 +1162,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":280,"y":1288,"w":32,"h":32}, + "frame": {"x":278,"y":1288,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, @@ -1186,7 +1186,7 @@ }, "sprites/misc/reader_overlay.png": { - "frame": {"x":845,"y":986,"w":70,"h":47}, + "frame": {"x":845,"y":987,"w":70,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":25,"w":70,"h":47}, @@ -1194,7 +1194,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":978,"y":1431,"w":24,"h":24}, + "frame": {"x":134,"y":1448,"w":24,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":24,"h":24}, @@ -1202,7 +1202,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":985,"y":1399,"w":24,"h":26}, + "frame": {"x":104,"y":1448,"w":24,"h":26}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":24,"h":26}, @@ -1218,7 +1218,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":985,"y":1361,"w":26,"h":32}, + "frame": {"x":272,"y":1438,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -1250,7 +1250,7 @@ }, "sprites/wires/display/cyan.png": { - "frame": {"x":284,"y":1054,"w":33,"h":33}, + "frame": {"x":283,"y":1054,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1258,7 +1258,7 @@ }, "sprites/wires/display/green.png": { - "frame": {"x":284,"y":1093,"w":33,"h":33}, + "frame": {"x":283,"y":1093,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1266,7 +1266,7 @@ }, "sprites/wires/display/purple.png": { - "frame": {"x":282,"y":1132,"w":33,"h":33}, + "frame": {"x":280,"y":1132,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1274,7 +1274,7 @@ }, "sprites/wires/display/red.png": { - "frame": {"x":282,"y":1171,"w":33,"h":33}, + "frame": {"x":280,"y":1171,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1290,7 +1290,7 @@ }, "sprites/wires/display/yellow.png": { - "frame": {"x":280,"y":1249,"w":33,"h":33}, + "frame": {"x":278,"y":1249,"w":33,"h":33}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":33,"h":33}, @@ -1322,7 +1322,7 @@ }, "sprites/wires/network_conflict.png": { - "frame": {"x":277,"y":1364,"w":32,"h":30}, + "frame": {"x":275,"y":1364,"w":32,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":32,"h":30}, @@ -1330,7 +1330,7 @@ }, "sprites/wires/network_empty.png": { - "frame": {"x":985,"y":1323,"w":28,"h":32}, + "frame": {"x":272,"y":1400,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":28,"h":32}, @@ -1338,7 +1338,7 @@ }, "sprites/wires/overlay_tile.png": { - "frame": {"x":106,"y":1378,"w":64,"h":64}, + "frame": {"x":104,"y":1378,"w":64,"h":64}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":64,"h":64}, @@ -1346,7 +1346,7 @@ }, "sprites/wires/sets/conflict_cross.png": { - "frame": {"x":557,"y":883,"w":96,"h":96}, + "frame": {"x":6,"y":822,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1362,7 +1362,7 @@ }, "sprites/wires/sets/conflict_split.png": { - "frame": {"x":6,"y":1114,"w":96,"h":57}, + "frame": {"x":734,"y":1097,"w":96,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":39,"w":96,"h":57}, @@ -1378,7 +1378,7 @@ }, "sprites/wires/sets/first_cross.png": { - "frame": {"x":743,"y":906,"w":96,"h":96}, + "frame": {"x":557,"y":883,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1394,7 +1394,7 @@ }, "sprites/wires/sets/first_split.png": { - "frame": {"x":6,"y":1177,"w":96,"h":57}, + "frame": {"x":920,"y":1128,"w":96,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":39,"w":96,"h":57}, @@ -1410,7 +1410,7 @@ }, "sprites/wires/sets/second_cross.png": { - "frame": {"x":921,"y":1027,"w":96,"h":96}, + "frame": {"x":743,"y":906,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1426,7 +1426,7 @@ }, "sprites/wires/sets/second_split.png": { - "frame": {"x":323,"y":1079,"w":96,"h":57}, + "frame": {"x":734,"y":1160,"w":96,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":39,"w":96,"h":57}, @@ -1442,7 +1442,7 @@ }, "sprites/wires/wires_preview.png": { - "frame": {"x":277,"y":1326,"w":32,"h":32}, + "frame": {"x":275,"y":1326,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, @@ -1455,6 +1455,6 @@ "format": "RGBA8888", "size": {"w":1024,"h":2048}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:c61d9c7c8f387e344954d344de26c19e:20296b3e09d5b363b1e55eee3b673411:908b89f5ca8ff73e331a35a3b14d0604$" + "smartupdate": "$TexturePacker:SmartUpdate:e2ebe660317d3aa17f637059013d3269:c2adc6dc90c9e20713ac1fde2cecfe9f:908b89f5ca8ff73e331a35a3b14d0604$" } } diff --git a/res_built/atlas/atlas0_mq.png b/res_built/atlas/atlas0_mq.png index 45275573..0ed5449d 100644 Binary files a/res_built/atlas/atlas0_mq.png and b/res_built/atlas/atlas0_mq.png differ diff --git a/res_raw/atlas.tps b/res_raw/atlas.tps index 97f309be..3aaaa257 100644 --- a/res_raw/atlas.tps +++ b/res_raw/atlas.tps @@ -118,7 +118,7 @@ textureFormat png borderPadding - 3 + 4 maxTextureSize width diff --git a/res_raw/sprites/buildings/virtual_processor-rotater.png b/res_raw/sprites/buildings/virtual_processor-rotater.png index 8c9dcbdc..327e8e13 100644 Binary files a/res_raw/sprites/buildings/virtual_processor-rotater.png and b/res_raw/sprites/buildings/virtual_processor-rotater.png differ diff --git a/res_raw/sprites/buildings/wire_tunnel.png b/res_raw/sprites/buildings/wire_tunnel.png index 8349e981..a798036e 100644 Binary files a/res_raw/sprites/buildings/wire_tunnel.png and b/res_raw/sprites/buildings/wire_tunnel.png differ diff --git a/src/css/ingame_hud/dialogs.scss b/src/css/ingame_hud/dialogs.scss index 3cfdbde8..e436d366 100644 --- a/src/css/ingame_hud/dialogs.scss +++ b/src/css/ingame_hud/dialogs.scss @@ -220,7 +220,7 @@ content: " "; display: inline-block; background: rgba(#fff, 0.6); - @include InlineAnimation(5s linear) { + @include InlineAnimation(3s linear) { 0% { width: 100%; } diff --git a/src/css/resources.scss b/src/css/resources.scss index af0b712c..f6d576b0 100644 --- a/src/css/resources.scss +++ b/src/css/resources.scss @@ -13,7 +13,7 @@ $buildingsAndVariants: belt, balancer, underground_belt, underground_belt-tier2, cutter, cutter-quad, rotater, rotater-ccw, stacker, mixer, painter-double, painter-quad, trash, storage, reader, rotater-rotate180, display, constant_signal, wire, wire_tunnel, logic_gate-or, logic_gate-not, logic_gate-xor, analyzer, virtual_processor-rotater, virtual_processor-unstacker, - virtual_processor-stacker, virtual_processor-painter, wire-second, painter, painter-mirrored; + virtual_processor-stacker, virtual_processor-painter, wire-second, painter, painter-mirrored, comparator; @each $building in $buildingsAndVariants { [data-icon="building_tutorials/#{$building}.png"] { /* @load-async */ diff --git a/src/js/changelog.js b/src/js/changelog.js index 141a02cf..2907d796 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -1,43 +1,9 @@ export const CHANGELOG = [ { version: "1.2.0", - date: "unreleased", + date: "09.10.2020", entries: [ - "WIRES", - "Reworked menu UI design (by dengr1605)", - "Allow holding ALT in belt planner to reverse direction (by jakobhellermann)", - "Clear cursor when trying to pipette the same building twice (by hexy)", - "Fixed level 18 stacker bug: If you experienced it already, you know it, if not, I don't want to spoiler (by hexy)", - "Added keybinding to close menus (by isaisstillalive / Sandwichs-del)", - "Fix rare crash regarding the buildings toolbar (by isaisstillalive)", - "Fixed some phrases (by EnderDoom77)", - "Zoom towards mouse cursor (by Dimava)", - "Added multiple settings to optimize the performance", - "Updated the soundtrack again, it is now 40 minutes in total!", - "Added a button to the statistics dialog to disable the sorting (by squeek502)", - "Tier 2 tunnels are now 9 tiles wide, so the gap between is 8 tiles (double the tier 1 range)", - "Updated and added new translations (Thanks to all contributors!)", - "Show connected chained miners on hover", - "Added setting to be able to delete buildings while placing (inspired by hexy)", - "You can now adjust the sound and music volumes! (inspired by Yoshie2000)", - "Some hud elements now have reduced opacity when hovering, so you can see through (inspired by mvb005)", - "Mark pinned shapes in statistics dialog and show them first (inspired by davidburhans)", - "Added setting to show chunk borders", - "Quad painters have been reworked! They now are integrated with the wires, and only paint the shape when the value is 1 (inspired by dengr1605)", - "There are now compact 1x1 balancers available to be unlocked!", - "Replaced level completion sound to be less distracting", - "Allow editing waypoints (by isaisstillalive)", - "Show confirmation when cutting area which is too expensive to get pasted again (by isaisstillalive)", - "Show mouse and camera tile on debug overlay (F4) (by dengr)", - "Fix belt planner placing the belt when a dialog opens in the meantime", - "Added confirmation when deleting a savegame", - "Make chained mainer the default and only option after unlocking it", - "Fixed tunnels entrances connecting to exits sometimes when they shouldn't", - "You can now pan the map with your mouse by moving the cursor to the edges of the screen!", - "Added setting to auto select the extractor when pipetting a resource patch (by Exund)", - "You can now change the unit (seconds / minutes / hours) in the statistics dialog", - "The initial belt planner direction is now based on the cursor movement (by MizardX)", - "Fix preferred variant not getting saved when clicking on the hud (by Danacus)", + "⚠️⚠️This update is HUGE, view the full changelog here! ⚠️⚠️", ], }, { diff --git a/src/js/core/modal_dialog_elements.js b/src/js/core/modal_dialog_elements.js index 124f51d4..8143995e 100644 --- a/src/js/core/modal_dialog_elements.js +++ b/src/js/core/modal_dialog_elements.js @@ -164,7 +164,7 @@ export class Dialog { const timeout = setTimeout(() => { button.classList.remove("timedButton"); arrayDeleteValue(this.timeouts, timeout); - }, 5000); + }, 3000); this.timeouts.push(timeout); } if (isEnter || isEscape) { diff --git a/src/js/game/buildings/analyzer.js b/src/js/game/buildings/analyzer.js index a18a3b56..8335f730 100644 --- a/src/js/game/buildings/analyzer.js +++ b/src/js/game/buildings/analyzer.js @@ -5,6 +5,7 @@ import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; import { MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; +import { enumHubGoalRewards } from "../tutorial_goals"; const overlayMatrix = generateMatrixRotations([1, 1, 0, 1, 1, 1, 0, 1, 0]); @@ -21,8 +22,7 @@ export class MetaAnalyzerBuilding extends MetaBuilding { * @param {GameRoot} root */ getIsUnlocked(root) { - // @todo - return true; + return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_virtual_processing); } /** @returns {"wires"} **/ diff --git a/src/js/game/buildings/comparator.js b/src/js/game/buildings/comparator.js index 0a284930..6738d514 100644 --- a/src/js/game/buildings/comparator.js +++ b/src/js/game/buildings/comparator.js @@ -4,6 +4,7 @@ import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; import { MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; +import { enumHubGoalRewards } from "../tutorial_goals"; export class MetaComparatorBuilding extends MetaBuilding { constructor() { @@ -18,8 +19,7 @@ export class MetaComparatorBuilding extends MetaBuilding { * @param {GameRoot} root */ getIsUnlocked(root) { - // @todo - return true; + return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_virtual_processing); } /** @returns {"wires"} **/ diff --git a/src/js/game/buildings/logic_gate.js b/src/js/game/buildings/logic_gate.js index 1511f5ab..b61d4373 100644 --- a/src/js/game/buildings/logic_gate.js +++ b/src/js/game/buildings/logic_gate.js @@ -5,6 +5,7 @@ import { MetaBuilding, defaultBuildingVariant } from "../meta_building"; import { GameRoot } from "../root"; import { enumLogicGateType, LogicGateComponent } from "../components/logic_gate"; import { generateMatrixRotations } from "../../core/utils"; +import { enumHubGoalRewards } from "../tutorial_goals"; /** @enum {string} */ export const enumLogicGateVariants = { @@ -48,8 +49,7 @@ export class MetaLogicGateBuilding extends MetaBuilding { * @param {GameRoot} root */ getIsUnlocked(root) { - // @todo - return true; + return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_logic_gates); } /** @returns {"wires"} **/ diff --git a/src/js/game/buildings/transistor.js b/src/js/game/buildings/transistor.js index 5a4be935..ebcfeac3 100644 --- a/src/js/game/buildings/transistor.js +++ b/src/js/game/buildings/transistor.js @@ -5,6 +5,7 @@ import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; import { Entity } from "../entity"; import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; +import { enumHubGoalRewards } from "../tutorial_goals"; /** @enum {string} */ export const enumTransistorVariants = { @@ -29,8 +30,7 @@ export class MetaTransistorBuilding extends MetaBuilding { * @param {GameRoot} root */ getIsUnlocked(root) { - // @todo - return true; + return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_logic_gates); } /** @returns {"wires"} **/ diff --git a/src/js/game/buildings/virtual_processor.js b/src/js/game/buildings/virtual_processor.js index fb0ef0e3..1d9f1135 100644 --- a/src/js/game/buildings/virtual_processor.js +++ b/src/js/game/buildings/virtual_processor.js @@ -110,7 +110,12 @@ export class MetaVirtualProcessorBuilding extends MetaBuilding { pinComp.setSlots([ { pos: new Vector(0, 0), - direction: enumDirection.top, + direction: enumDirection.left, + type: enumPinSlotType.logicalEjector, + }, + { + pos: new Vector(0, 0), + direction: enumDirection.right, type: enumPinSlotType.logicalEjector, }, { diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 2debeb5d..01b98dba 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -92,6 +92,11 @@ export class HubGoals extends BasicSerializableObject { */ this.upgradeLevels = {}; + // Reset levels + for (const key in UPGRADES) { + this.upgradeLevels[key] = 0; + } + /** * Stores the improvements for all upgrades * @type {Object} diff --git a/src/js/game/hud/parts/wires_toolbar.js b/src/js/game/hud/parts/wires_toolbar.js index 2e43386d..bcda9f3a 100644 --- a/src/js/game/hud/parts/wires_toolbar.js +++ b/src/js/game/hud/parts/wires_toolbar.js @@ -17,11 +17,11 @@ export class HUDWiresToolbar extends HUDBaseToolbar { MetaWireTunnelBuilding, MetaConstantSignalBuilding, MetaLeverBuilding, - MetaTransistorBuilding, MetaLogicGateBuilding, - MetaAnalyzerBuilding, MetaVirtualProcessorBuilding, + MetaAnalyzerBuilding, MetaComparatorBuilding, + MetaTransistorBuilding, ], visibilityCondition: () => !this.root.camera.getIsMapOverlayActive() && this.root.currentLayer === "wires", diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js index 7a519839..dbd0642f 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -70,9 +70,9 @@ export const KEYMAPPINGS = { lever_wires: { keyCode: key("4") }, logic_gate: { keyCode: key("5") }, virtual_processor: { keyCode: key("6") }, - transistor: { keyCode: key("7") }, - analyzer: { keyCode: key("8") }, - comparator: { keyCode: key("9") }, + analyzer: { keyCode: key("7") }, + comparator: { keyCode: key("8") }, + transistor: { keyCode: key("9") }, }, placement: { diff --git a/src/js/game/systems/logic_gate.js b/src/js/game/systems/logic_gate.js index 2de11f59..af0f0a52 100644 --- a/src/js/game/systems/logic_gate.js +++ b/src/js/game/systems/logic_gate.js @@ -4,7 +4,8 @@ import { enumLogicGateType, LogicGateComponent } from "../components/logic_gate" import { enumPinSlotType } from "../components/wired_pins"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { BOOL_FALSE_SINGLETON, BOOL_TRUE_SINGLETON, isTruthyItem } from "../items/boolean_item"; -import { COLOR_ITEM_SINGLETONS } from "../items/color_item"; +import { ColorItem, COLOR_ITEM_SINGLETONS } from "../items/color_item"; +import { ShapeItem } from "../items/shape_item"; import { ShapeDefinition } from "../shape_definition"; export class LogicGateSystem extends GameSystemWithFilter { @@ -153,18 +154,22 @@ export class LogicGateSystem extends GameSystemWithFilter { /** * @param {Array} parameters - * @returns {BaseItem} + * @returns {[BaseItem, BaseItem]} */ compute_ROTATE(parameters) { const item = parameters[0]; if (!item || item.getItemType() !== "shape") { // Not a shape - return null; + return [null, null]; } const definition = /** @type {ShapeItem} */ (item).definition; - const rotatedDefinition = this.root.shapeDefinitionMgr.shapeActionRotateCW(definition); - return this.root.shapeDefinitionMgr.getShapeItemFromDefinition(rotatedDefinition); + const rotatedDefinitionCCW = this.root.shapeDefinitionMgr.shapeActionRotateCCW(definition); + const rotatedDefinitionCW = this.root.shapeDefinitionMgr.shapeActionRotateCW(definition); + return [ + this.root.shapeDefinitionMgr.getShapeItemFromDefinition(rotatedDefinitionCCW), + this.root.shapeDefinitionMgr.getShapeItemFromDefinition(rotatedDefinitionCW), + ]; } /** diff --git a/src/js/game/tutorial_goals.js b/src/js/game/tutorial_goals.js index 3d1a36fd..c859ca26 100644 --- a/src/js/game/tutorial_goals.js +++ b/src/js/game/tutorial_goals.js @@ -43,7 +43,7 @@ export const tutorialGoals = [ // Circle { shape: "CuCuCuCu", // belts t1 - required: 40, + required: 30, reward: enumHubGoalRewards.reward_cutter_and_trash, }, @@ -59,14 +59,14 @@ export const tutorialGoals = [ // Rectangle { shape: "RuRuRuRu", // miners t1 - required: 85, + required: 70, reward: enumHubGoalRewards.reward_balancer, }, // 4 { shape: "RuRu----", // processors t2 - required: 100, + required: 70, reward: enumHubGoalRewards.reward_rotater, }, @@ -74,14 +74,14 @@ export const tutorialGoals = [ // Rotater { shape: "Cu----Cu", // belts t2 - required: 175, + required: 170, reward: enumHubGoalRewards.reward_tunnel, }, // 6 { shape: "Cu------", // miners t2 - required: 250, + required: 270, reward: enumHubGoalRewards.reward_painter, }, @@ -89,14 +89,14 @@ export const tutorialGoals = [ // Painter { shape: "CrCrCrCr", // unused - required: 500, + required: 300, reward: enumHubGoalRewards.reward_rotater_ccw, }, // 8 { shape: "RbRb----", // painter t2 - required: 700, + required: 480, reward: enumHubGoalRewards.reward_mixer, }, @@ -104,7 +104,7 @@ export const tutorialGoals = [ // Mixing (purple) { shape: "CpCpCpCp", // belts t3 - required: 800, + required: 600, reward: enumHubGoalRewards.reward_merger, }, @@ -112,7 +112,7 @@ export const tutorialGoals = [ // STACKER: Star shape + cyan { shape: "ScScScSc", // miners t3 - required: 900, + required: 800, reward: enumHubGoalRewards.reward_stacker, }, @@ -128,7 +128,7 @@ export const tutorialGoals = [ // Blueprints { shape: "CbCbCbRb:CwCwCwCw", - required: 1250, + required: 1000, reward: enumHubGoalRewards.reward_blueprints, }, @@ -136,7 +136,7 @@ export const tutorialGoals = [ // Tunnel Tier 2 { shape: "RpRpRpRp:CwCwCwCw", // painting t3 - required: 5000, + required: 3800, reward: enumHubGoalRewards.reward_underground_belt_tier_2, }, @@ -145,7 +145,7 @@ export const tutorialGoals = [ { // @todo shape: "CuCuCuCu", - required: 7000, + required: 0, reward: enumHubGoalRewards.reward_belt_reader, }, @@ -153,7 +153,7 @@ export const tutorialGoals = [ // Storage { shape: "SrSrSrSr:CyCyCyCy", // unused - required: 7500, + required: 10000, reward: enumHubGoalRewards.reward_storage, }, @@ -161,7 +161,7 @@ export const tutorialGoals = [ // Quad Cutter { shape: "SrSrSrSr:CyCyCyCy:SwSwSwSw", // belts t4 (two variants) - required: 12500, + required: 6000, reward: enumHubGoalRewards.reward_cutter_quad, }, @@ -169,7 +169,7 @@ export const tutorialGoals = [ // Double painter { shape: "CbRbRbCb:CwCwCwCw:WbWbWbWb", // miner t4 (two variants) - required: 15000, + required: 20000, reward: enumHubGoalRewards.reward_painter_double, }, diff --git a/src/js/game/tutorial_goals_mappings.js b/src/js/game/tutorial_goals_mappings.js index 4542acf3..f4c6df01 100644 --- a/src/js/game/tutorial_goals_mappings.js +++ b/src/js/game/tutorial_goals_mappings.js @@ -4,6 +4,7 @@ import { MetaConstantSignalBuilding } from "./buildings/constant_signal"; import { enumCutterVariants, MetaCutterBuilding } from "./buildings/cutter"; import { MetaDisplayBuilding } from "./buildings/display"; import { MetaLeverBuilding } from "./buildings/lever"; +import { MetaLogicGateBuilding } from "./buildings/logic_gate"; import { enumMinerVariants, MetaMinerBuilding } from "./buildings/miner"; import { MetaMixerBuilding } from "./buildings/mixer"; import { enumPainterVariants, MetaPainterBuilding } from "./buildings/painter"; @@ -53,7 +54,7 @@ export const enumHubGoalRewardsToContentUnlocked = { [enumHubGoalRewards.reward_constant_signal]: typed([ [MetaConstantSignalBuilding, defaultBuildingVariant], ]), - [enumHubGoalRewards.reward_logic_gates]: null, // @TODO! + [enumHubGoalRewards.reward_logic_gates]: typed([[MetaLogicGateBuilding, defaultBuildingVariant]]), [enumHubGoalRewards.reward_virtual_processing]: null, // @TODO! [enumHubGoalRewards.reward_wires_filters_and_levers]: typed([ diff --git a/src/js/game/upgrades.js b/src/js/game/upgrades.js index c764ae88..5dfd6025 100644 --- a/src/js/game/upgrades.js +++ b/src/js/game/upgrades.js @@ -23,19 +23,19 @@ const fixedImprovements = [0.5, 0.5, 1, 1, 2, 2]; export const UPGRADES = { belt: [ { - required: [{ shape: "CuCuCuCu", amount: 150 }], + required: [{ shape: "CuCuCuCu", amount: 60 }], }, { - required: [{ shape: "--CuCu--", amount: 1000 }], + required: [{ shape: "--CuCu--", amount: 500 }], }, { - required: [{ shape: "CpCpCpCp", amount: 5000 }], + required: [{ shape: "CpCpCpCp", amount: 1000 }], }, { - required: [{ shape: "SrSrSrSr:CyCyCyCy", amount: 12000 }], + required: [{ shape: "SrSrSrSr:CyCyCyCy", amount: 6000 }], }, { - required: [{ shape: "SrSrSrSr:CyCyCyCy:SwSwSwSw", amount: 20000 }], + required: [{ shape: "SrSrSrSr:CyCyCyCy:SwSwSwSw", amount: 25000 }], }, { required: [{ shape: finalGameShape, amount: 50000 }], @@ -45,73 +45,73 @@ export const UPGRADES = { miner: [ { - required: [{ shape: "RuRuRuRu", amount: 400 }], + required: [{ shape: "RuRuRuRu", amount: 300 }], }, { - required: [{ shape: "Cu------", amount: 3000 }], + required: [{ shape: "Cu------", amount: 800 }], }, { - required: [{ shape: "ScScScSc", amount: 7000 }], + required: [{ shape: "ScScScSc", amount: 3500 }], }, { - required: [{ shape: "CwCwCwCw:WbWbWbWb", amount: 15000 }], + required: [{ shape: "CwCwCwCw:WbWbWbWb", amount: 23000 }], }, { - required: [{ shape: "CbRbRbCb:CwCwCwCw:WbWbWbWb", amount: 30000 }], + required: [{ shape: "CbRbRbCb:CwCwCwCw:WbWbWbWb", amount: 50000 }], }, { - required: [{ shape: finalGameShape, amount: 65000 }], + required: [{ shape: finalGameShape, amount: 50000 }], excludePrevious: true, }, ], processors: [ { - required: [{ shape: "SuSuSuSu", amount: 600 }], + required: [{ shape: "SuSuSuSu", amount: 500 }], }, { - required: [{ shape: "RuRu----", amount: 2000 }], + required: [{ shape: "RuRu----", amount: 600 }], }, { - required: [{ shape: "CgScScCg", amount: 15000 }], + required: [{ shape: "CgScScCg", amount: 3500 }], }, { - required: [{ shape: "CwCrCwCr:SgSgSgSg", amount: 20000 }], + required: [{ shape: "CwCrCwCr:SgSgSgSg", amount: 25000 }], }, { - required: [{ shape: "WrRgWrRg:CwCrCwCr:SgSgSgSg", amount: 30000 }], + required: [{ shape: "WrRgWrRg:CwCrCwCr:SgSgSgSg", amount: 50000 }], }, { - required: [{ shape: finalGameShape, amount: 75000 }], + required: [{ shape: finalGameShape, amount: 50000 }], excludePrevious: true, }, ], painting: [ { - required: [{ shape: "RbRb----", amount: 1000 }], + required: [{ shape: "RbRb----", amount: 600 }], }, { - required: [{ shape: "WrWrWrWr", amount: 3000 }], + required: [{ shape: "WrWrWrWr", amount: 3800 }], }, { - required: [{ shape: "RpRpRpRp:CwCwCwCw", amount: 15000 }], + required: [{ shape: "RpRpRpRp:CwCwCwCw", amount: 6500 }], }, { - required: [{ shape: "WpWpWpWp:CwCwCwCw:WpWpWpWp", amount: 20000 }], + required: [{ shape: "WpWpWpWp:CwCwCwCw:WpWpWpWp", amount: 25000 }], }, { - required: [{ shape: "WpWpWpWp:CwCwCwCw:WpWpWpWp:CwCwCwCw", amount: 30000 }], + required: [{ shape: "WpWpWpWp:CwCwCwCw:WpWpWpWp:CwCwCwCw", amount: 50000 }], }, { - required: [{ shape: finalGameShape, amount: 100000 }], + required: [{ shape: finalGameShape, amount: 50000 }], excludePrevious: true, }, ], }; // Tiers need % of the previous tier as requirement too -const tierGrowth = 1.8; +const tierGrowth = 2.5; // Automatically generate tier levels for (const upgradeId in UPGRADES) { diff --git a/translations/base-en.yaml b/translations/base-en.yaml index a87e85f2..6d02a498 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -573,7 +573,7 @@ buildings: wire_tunnel: default: - name: &wire_tunnel Wire Tunnel + name: &wire_tunnel Wire Crossing description: Allows to cross two wires without connecting them. constant_signal: @@ -589,16 +589,16 @@ buildings: logic_gate: default: name: AND Gate - description: Emits a boolean "1" if both inputs are truthy. + description: Emits a boolean "1" if both inputs are truthy. (Truthy means shape, color or boolean "1") not: name: NOT Gate - description: Emits a boolean "1" if the input is not truthy. + description: Emits a boolean "1" if the input is not truthy. (Truthy means shape, color or boolean "1") xor: name: XOR Gate - description: Emits a boolean "1" if one of the inputs is truthy, but not both. + description: Emits a boolean "1" if one of the inputs is truthy, but not both. (Truthy means shape, color or boolean "1") or: name: OR Gate - description: Emits a boolean "1" if one of the inputs is truthy. + description: Emits a boolean "1" if one of the inputs is truthy. (Truthy means shape, color or boolean "1") transistor: default: @@ -622,7 +622,7 @@ buildings: reader: default: name: &reader Belt Reader - description: Allows to measure belt throughput. Outputs the last read item on the wires layer (once unlocked). + description: Allows to measure the average belt throughput. Outputs the last read item on the wires layer (once unlocked). analyzer: default: @@ -632,20 +632,20 @@ buildings: comparator: default: name: &comparator Compare - description: Returns boolean "1" if both items are exactly equal. Can compare shapes, items and booleans. + description: Returns boolean "1" if both signals are exactly equal. Can compare shapes, items and booleans. virtual_processor: default: name: &virtual_processor Virtual Cutter - description: Computes + description: Virtually cuts the shape into two halves. rotater: name: Virtual Rotater - description: Virtually rotates the shape by 90 degrees clockwise. + description: Virtually rotates the shape, both clockwise and counter-clockwise. unstacker: name: Virtual Unstacker - description: Returns the topmost layer to the right, and the remaining ones on the left. + description: Virtually extracts the topmost layer to the right output and the remaining ones to the left. stacker: name: Virtual Stacker @@ -753,7 +753,7 @@ storyRewards: reward_display: title: Display desc: >- - You have unlocked the Display! Connect a wires signal to it to present a color, shape or boolean! + You have unlocked the Display - Connect a signal on the wires layer to visualize its contents! reward_constant_signal: title: Constant Signal @@ -765,17 +765,19 @@ storyRewards: title: Logic Gates desc: >- You unlocked logic gates! You don't have to be excited about this, but it's actually super cool!

- With those gates you can now perform AND, OR, XOR and NOT boolean operations! + With those gates you can now compute AND, OR, XOR and NOT operations.

+ As a bonus on top I also just gave you a transistor! reward_virtual_processing: title: Virtual Processing desc: >- I just gave a whole bunch of new buildings which allow you to simulate the processing of shapes!

- You can now simulate a cutter, rotater, stacker and more on the wires layer!

+ You can now simulate a cutter, rotater, stacker and more on the wires layer! With this you now have three options to continue the game:

- - Build an automated machine to create any possible shape requested by the hub (This is cool, I swear!).

+ - Build an automated machine to create any possible shape requested by the HUB (I recommend to try it!).

- Build something cool with wires.

- - Continue to play regulary. + - Continue to play regulary.

+ Whatever you choose, remember to have fun! # Special reward, which is shown when there is no reward actually no_reward: @@ -792,7 +794,8 @@ storyRewards: title: Freeplay desc: >- You did it! You unlocked the free-play mode! This means that shapes are now randomly generated!

- Since the hub will only require low quantities, I highly recommend to build a machine which automatically delivers the requested shape! + Since the hub will only require low quantities from now on, I highly recommend to build a machine which automatically delivers the requested shape!

+ The HUB outputs the requested shape on the wires layer, so all you have to do is to analyze it and automatically configure your factory based on that. settings: title: Settings @@ -1128,7 +1131,7 @@ tips: - Organization is important. Try not to cross conveyors too much. - Plan in advance, or it will be a huge chaos! - Don't remove your old factories! You'll need them to unlock upgrades. - - Try beating level 18 on your own before seeking for help! + - Try beating level 20 on your own before seeking for help! - Don't complicate things, try to stay simple and you'll go far. - You may need to re-use factories later in the game. Plan your factories to be re-usable. - Sometimes, you can find a needed shape in the map without creating it with stackers. @@ -1149,3 +1152,5 @@ tips: - This game has a lot of settings, be sure to check them out! - The marker to your hub has a small compass to indicate its direction! - To clear belts, cut the area and then paste it at the same location. + - Press F4 to show your FPS and Tick Rate. + - Press F4 twice to show the tile of your mouse and camera.