diff --git a/res/ui/building_icons/wire_crossings.png b/res/ui/building_icons/wire_crossings.png new file mode 100644 index 00000000..29ea7123 Binary files /dev/null and b/res/ui/building_icons/wire_crossings.png differ diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index 1443d322..40b005ca 100644 --- a/res_built/atlas/atlas0_10.json +++ b/res_built/atlas/atlas0_10.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":325,"y":26,"w":13,"h":13}, + "frame": {"x":294,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":342,"y":26,"w":13,"h":13}, + "frame": {"x":311,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":427,"y":26,"w":13,"h":13}, + "frame": {"x":487,"y":43,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":478,"y":57,"w":13,"h":13}, + "frame": {"x":521,"y":40,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":487,"y":40,"w":13,"h":13}, + "frame": {"x":522,"y":23,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":495,"y":20,"w":13,"h":13}, + "frame": {"x":527,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -50,7 +50,7 @@ }, "sprites/belt/forward_6.png": { - "frame": {"x":497,"y":3,"w":13,"h":13}, + "frame": {"x":504,"y":94,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -58,7 +58,7 @@ }, "sprites/belt/forward_7.png": { - "frame": {"x":471,"y":96,"w":13,"h":13}, + "frame": {"x":516,"y":77,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -66,7 +66,7 @@ }, "sprites/belt/forward_8.png": { - "frame": {"x":484,"y":74,"w":13,"h":13}, + "frame": {"x":504,"y":111,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -74,7 +74,7 @@ }, "sprites/belt/forward_9.png": { - "frame": {"x":495,"y":57,"w":13,"h":13}, + "frame": {"x":523,"y":57,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -82,7 +82,7 @@ }, "sprites/belt/forward_10.png": { - "frame": {"x":359,"y":26,"w":13,"h":13}, + "frame": {"x":328,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -90,7 +90,7 @@ }, "sprites/belt/forward_11.png": { - "frame": {"x":376,"y":26,"w":13,"h":13}, + "frame": {"x":345,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -98,7 +98,7 @@ }, "sprites/belt/forward_12.png": { - "frame": {"x":329,"y":112,"w":13,"h":13}, + "frame": {"x":362,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -106,7 +106,7 @@ }, "sprites/belt/forward_13.png": { - "frame": {"x":346,"y":112,"w":13,"h":13}, + "frame": {"x":379,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -114,7 +114,7 @@ }, "sprites/belt/forward_14.png": { - "frame": {"x":363,"y":112,"w":13,"h":13}, + "frame": {"x":396,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -122,7 +122,7 @@ }, "sprites/belt/forward_15.png": { - "frame": {"x":393,"y":26,"w":13,"h":13}, + "frame": {"x":413,"y":49,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -130,7 +130,7 @@ }, "sprites/belt/forward_16.png": { - "frame": {"x":380,"y":112,"w":13,"h":13}, + "frame": {"x":430,"y":49,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -138,7 +138,7 @@ }, "sprites/belt/forward_17.png": { - "frame": {"x":397,"y":112,"w":13,"h":13}, + "frame": {"x":436,"y":111,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -146,7 +146,7 @@ }, "sprites/belt/forward_18.png": { - "frame": {"x":410,"y":26,"w":13,"h":13}, + "frame": {"x":453,"y":111,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -154,7 +154,7 @@ }, "sprites/belt/forward_19.png": { - "frame": {"x":414,"y":112,"w":13,"h":13}, + "frame": {"x":447,"y":49,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -162,7 +162,7 @@ }, "sprites/belt/forward_20.png": { - "frame": {"x":444,"y":25,"w":13,"h":13}, + "frame": {"x":470,"y":105,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -170,7 +170,7 @@ }, "sprites/belt/forward_21.png": { - "frame": {"x":461,"y":23,"w":13,"h":13}, + "frame": {"x":482,"y":84,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -178,7 +178,7 @@ }, "sprites/belt/forward_22.png": { - "frame": {"x":461,"y":62,"w":13,"h":13}, + "frame": {"x":489,"y":60,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -186,7 +186,7 @@ }, "sprites/belt/forward_23.png": { - "frame": {"x":470,"y":40,"w":13,"h":13}, + "frame": {"x":504,"y":43,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -194,7 +194,7 @@ }, "sprites/belt/forward_24.png": { - "frame": {"x":478,"y":23,"w":13,"h":13}, + "frame": {"x":505,"y":23,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -202,7 +202,7 @@ }, "sprites/belt/forward_25.png": { - "frame": {"x":480,"y":3,"w":13,"h":13}, + "frame": {"x":487,"y":101,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -210,7 +210,7 @@ }, "sprites/belt/forward_26.png": { - "frame": {"x":454,"y":105,"w":13,"h":13}, + "frame": {"x":499,"y":77,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -218,7 +218,7 @@ }, "sprites/belt/forward_27.png": { - "frame": {"x":467,"y":79,"w":13,"h":13}, + "frame": {"x":506,"y":60,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -226,7 +226,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":504,"y":37,"w":13,"h":13}, + "frame": {"x":538,"y":40,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -234,7 +234,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":512,"y":20,"w":13,"h":13}, + "frame": {"x":539,"y":20,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -242,7 +242,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":529,"y":54,"w":13,"h":13}, + "frame": {"x":557,"y":54,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -250,7 +250,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":563,"y":20,"w":13,"h":13}, + "frame": {"x":590,"y":20,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -258,7 +258,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":565,"y":3,"w":13,"h":13}, + "frame": {"x":595,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -266,7 +266,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":535,"y":105,"w":13,"h":13}, + "frame": {"x":555,"y":108,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -274,7 +274,7 @@ }, "sprites/belt/left_6.png": { - "frame": {"x":539,"y":88,"w":13,"h":13}, + "frame": {"x":572,"y":88,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -282,7 +282,7 @@ }, "sprites/belt/left_7.png": { - "frame": {"x":552,"y":71,"w":13,"h":13}, + "frame": {"x":584,"y":71,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -290,7 +290,7 @@ }, "sprites/belt/left_8.png": { - "frame": {"x":563,"y":54,"w":13,"h":13}, + "frame": {"x":591,"y":54,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -298,7 +298,7 @@ }, "sprites/belt/left_9.png": { - "frame": {"x":572,"y":37,"w":13,"h":13}, + "frame": {"x":606,"y":37,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -306,7 +306,7 @@ }, "sprites/belt/left_10.png": { - "frame": {"x":514,"y":3,"w":13,"h":13}, + "frame": {"x":544,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -314,7 +314,7 @@ }, "sprites/belt/left_11.png": { - "frame": {"x":488,"y":91,"w":13,"h":13}, + "frame": {"x":521,"y":94,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -322,7 +322,7 @@ }, "sprites/belt/left_12.png": { - "frame": {"x":501,"y":74,"w":13,"h":13}, + "frame": {"x":521,"y":111,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -330,7 +330,7 @@ }, "sprites/belt/left_13.png": { - "frame": {"x":512,"y":54,"w":13,"h":13}, + "frame": {"x":533,"y":74,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -338,7 +338,7 @@ }, "sprites/belt/left_14.png": { - "frame": {"x":521,"y":37,"w":13,"h":13}, + "frame": {"x":540,"y":57,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -346,7 +346,7 @@ }, "sprites/belt/left_15.png": { - "frame": {"x":529,"y":20,"w":13,"h":13}, + "frame": {"x":555,"y":37,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -354,7 +354,7 @@ }, "sprites/belt/left_16.png": { - "frame": {"x":531,"y":3,"w":13,"h":13}, + "frame": {"x":556,"y":20,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -362,7 +362,7 @@ }, "sprites/belt/left_17.png": { - "frame": {"x":501,"y":108,"w":13,"h":13}, + "frame": {"x":561,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -370,7 +370,7 @@ }, "sprites/belt/left_18.png": { - "frame": {"x":505,"y":91,"w":13,"h":13}, + "frame": {"x":538,"y":91,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -378,7 +378,7 @@ }, "sprites/belt/left_19.png": { - "frame": {"x":518,"y":71,"w":13,"h":13}, + "frame": {"x":550,"y":74,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -386,7 +386,7 @@ }, "sprites/belt/left_20.png": { - "frame": {"x":538,"y":37,"w":13,"h":13}, + "frame": {"x":572,"y":37,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -394,7 +394,7 @@ }, "sprites/belt/left_21.png": { - "frame": {"x":546,"y":20,"w":13,"h":13}, + "frame": {"x":573,"y":20,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -402,7 +402,7 @@ }, "sprites/belt/left_22.png": { - "frame": {"x":548,"y":3,"w":13,"h":13}, + "frame": {"x":578,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -410,7 +410,7 @@ }, "sprites/belt/left_23.png": { - "frame": {"x":518,"y":108,"w":13,"h":13}, + "frame": {"x":538,"y":108,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -418,7 +418,7 @@ }, "sprites/belt/left_24.png": { - "frame": {"x":522,"y":88,"w":13,"h":13}, + "frame": {"x":555,"y":91,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -426,7 +426,7 @@ }, "sprites/belt/left_25.png": { - "frame": {"x":535,"y":71,"w":13,"h":13}, + "frame": {"x":567,"y":71,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -434,7 +434,7 @@ }, "sprites/belt/left_26.png": { - "frame": {"x":546,"y":54,"w":13,"h":13}, + "frame": {"x":574,"y":54,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -442,7 +442,7 @@ }, "sprites/belt/left_27.png": { - "frame": {"x":555,"y":37,"w":13,"h":13}, + "frame": {"x":589,"y":37,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -450,7 +450,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":580,"y":20,"w":13,"h":13}, + "frame": {"x":607,"y":20,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -458,7 +458,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":582,"y":3,"w":13,"h":13}, + "frame": {"x":612,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -466,7 +466,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":597,"y":54,"w":13,"h":13}, + "frame": {"x":625,"y":54,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":631,"y":20,"w":13,"h":13}, + "frame": {"x":623,"y":88,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":633,"y":3,"w":13,"h":13}, + "frame": {"x":635,"y":71,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":603,"y":105,"w":13,"h":13}, + "frame": {"x":642,"y":54,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":607,"y":88,"w":13,"h":13}, + "frame": {"x":623,"y":105,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":620,"y":71,"w":13,"h":13}, + "frame": {"x":659,"y":54,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":631,"y":54,"w":13,"h":13}, + "frame": {"x":652,"y":71,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":640,"y":37,"w":13,"h":13}, + "frame": {"x":669,"y":71,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -530,7 +530,7 @@ }, "sprites/belt/right_10.png": { - "frame": {"x":552,"y":105,"w":13,"h":13}, + "frame": {"x":572,"y":105,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -538,7 +538,7 @@ }, "sprites/belt/right_11.png": { - "frame": {"x":556,"y":88,"w":13,"h":13}, + "frame": {"x":589,"y":88,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -546,7 +546,7 @@ }, "sprites/belt/right_12.png": { - "frame": {"x":569,"y":71,"w":13,"h":13}, + "frame": {"x":601,"y":71,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -554,7 +554,7 @@ }, "sprites/belt/right_13.png": { - "frame": {"x":580,"y":54,"w":13,"h":13}, + "frame": {"x":608,"y":54,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -562,7 +562,7 @@ }, "sprites/belt/right_14.png": { - "frame": {"x":589,"y":37,"w":13,"h":13}, + "frame": {"x":623,"y":37,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -570,7 +570,7 @@ }, "sprites/belt/right_15.png": { - "frame": {"x":597,"y":20,"w":13,"h":13}, + "frame": {"x":624,"y":20,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -578,7 +578,7 @@ }, "sprites/belt/right_16.png": { - "frame": {"x":599,"y":3,"w":13,"h":13}, + "frame": {"x":629,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -586,7 +586,7 @@ }, "sprites/belt/right_17.png": { - "frame": {"x":569,"y":105,"w":13,"h":13}, + "frame": {"x":589,"y":105,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -594,7 +594,7 @@ }, "sprites/belt/right_18.png": { - "frame": {"x":573,"y":88,"w":13,"h":13}, + "frame": {"x":606,"y":88,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -602,7 +602,7 @@ }, "sprites/belt/right_19.png": { - "frame": {"x":586,"y":71,"w":13,"h":13}, + "frame": {"x":618,"y":71,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":606,"y":37,"w":13,"h":13}, + "frame": {"x":640,"y":37,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":614,"y":20,"w":13,"h":13}, + "frame": {"x":641,"y":20,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":616,"y":3,"w":13,"h":13}, + "frame": {"x":646,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":586,"y":105,"w":13,"h":13}, + "frame": {"x":606,"y":105,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":590,"y":88,"w":13,"h":13}, + "frame": {"x":663,"y":3,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":603,"y":71,"w":13,"h":13}, + "frame": {"x":658,"y":20,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":614,"y":54,"w":13,"h":13}, + "frame": {"x":657,"y":37,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":623,"y":37,"w":13,"h":13}, + "frame": {"x":674,"y":37,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -674,7 +674,7 @@ }, "sprites/blueprints/advanced_processor.png": { - "frame": {"x":84,"y":82,"w":38,"h":38}, + "frame": {"x":3,"y":83,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":648,"y":20,"w":13,"h":13}, + "frame": {"x":640,"y":88,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -690,7 +690,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":650,"y":3,"w":13,"h":13}, + "frame": {"x":640,"y":105,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":620,"y":105,"w":13,"h":13}, + "frame": {"x":657,"y":88,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -706,7 +706,7 @@ }, "sprites/blueprints/cutter-quad.png": { - "frame": {"x":82,"y":3,"w":76,"h":19}, + "frame": {"x":165,"y":81,"w":76,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":76,"h":19}, @@ -714,7 +714,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":325,"y":3,"w":36,"h":19}, + "frame": {"x":327,"y":43,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -722,15 +722,15 @@ }, "sprites/blueprints/energy_generator.png": { - "frame": {"x":285,"y":3,"w":36,"h":36}, + "frame": {"x":166,"y":3,"w":37,"h":37}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":1,"y":2,"w":36,"h":36}, + "spriteSourceSize": {"x":1,"y":1,"w":37,"h":37}, "sourceSize": {"w":38,"h":38} }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":332,"y":43,"w":19,"h":19}, + "frame": {"x":328,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -738,7 +738,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":355,"y":43,"w":19,"h":19}, + "frame": {"x":351,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -746,7 +746,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":250,"y":45,"w":37,"h":19}, + "frame": {"x":286,"y":44,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -754,7 +754,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":162,"y":3,"w":38,"h":38}, + "frame": {"x":45,"y":83,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -762,7 +762,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":82,"y":49,"w":38,"h":19}, + "frame": {"x":244,"y":44,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -770,7 +770,7 @@ }, "sprites/blueprints/painter-quad.png": { - "frame": {"x":3,"y":83,"w":77,"h":19}, + "frame": {"x":82,"y":45,"w":77,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":77,"h":19}, @@ -778,7 +778,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":124,"y":49,"w":38,"h":19}, + "frame": {"x":248,"y":3,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -786,7 +786,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":365,"y":3,"w":19,"h":19}, + "frame": {"x":367,"y":43,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -794,7 +794,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":388,"y":3,"w":19,"h":19}, + "frame": {"x":367,"y":89,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -802,7 +802,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":329,"y":89,"w":19,"h":19}, + "frame": {"x":374,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -810,7 +810,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":352,"y":89,"w":19,"h":19}, + "frame": {"x":390,"y":43,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -818,7 +818,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":289,"y":75,"w":36,"h":19}, + "frame": {"x":332,"y":3,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -826,7 +826,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":248,"y":81,"w":37,"h":19}, + "frame": {"x":245,"y":101,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -834,7 +834,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":246,"y":3,"w":35,"h":38}, + "frame": {"x":87,"y":82,"w":35,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":35,"h":38}, @@ -842,7 +842,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":369,"y":66,"w":19,"h":19}, + "frame": {"x":412,"y":3,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -850,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":424,"y":43,"w":19,"h":18}, + "frame": {"x":458,"y":3,"w":19,"h":18}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":19,"h":18}, @@ -858,7 +858,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":457,"y":3,"w":19,"h":16}, + "frame": {"x":443,"y":66,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -866,7 +866,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":421,"y":89,"w":19,"h":16}, + "frame": {"x":459,"y":25,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -874,15 +874,31 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":431,"y":109,"w":19,"h":16}, + "frame": {"x":464,"y":45,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, "sourceSize": {"w":19,"h":19} }, +"sprites/blueprints/wire_crossings-merger.png": +{ + "frame": {"x":459,"y":86,"w":19,"h":15}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":19,"h":15}, + "sourceSize": {"w":19,"h":19} +}, +"sprites/blueprints/wire_crossings.png": +{ + "frame": {"x":248,"y":26,"w":19,"h":14}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":5,"w":19,"h":14}, + "sourceSize": {"w":19,"h":19} +}, "sprites/blueprints/wire_left.png": { - "frame": {"x":216,"y":68,"w":10,"h":9}, + "frame": {"x":154,"y":68,"w":10,"h":9}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":10,"h":9}, @@ -890,7 +906,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":230,"y":68,"w":9,"h":9}, + "frame": {"x":168,"y":68,"w":9,"h":9}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":9,"h":9}, @@ -898,7 +914,7 @@ }, "sprites/blueprints/wire_top.png": { - "frame": {"x":657,"y":37,"w":5,"h":13}, + "frame": {"x":680,"y":3,"w":5,"h":13}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":5,"h":13}, @@ -906,7 +922,7 @@ }, "sprites/buildings/advanced_processor.png": { - "frame": {"x":126,"y":82,"w":38,"h":38}, + "frame": {"x":82,"y":3,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -914,7 +930,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":624,"y":88,"w":13,"h":13}, + "frame": {"x":674,"y":88,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -922,7 +938,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":637,"y":71,"w":13,"h":13}, + "frame": {"x":657,"y":105,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -930,7 +946,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":325,"y":26,"w":13,"h":13}, + "frame": {"x":294,"y":26,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -938,7 +954,7 @@ }, "sprites/buildings/cutter-quad.png": { - "frame": {"x":82,"y":26,"w":76,"h":19}, + "frame": {"x":165,"y":104,"w":76,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":76,"h":19}, @@ -946,7 +962,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":289,"y":98,"w":36,"h":19}, + "frame": {"x":372,"y":3,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -954,7 +970,7 @@ }, "sprites/buildings/energy_generator.png": { - "frame": {"x":168,"y":82,"w":37,"h":37}, + "frame": {"x":207,"y":3,"w":37,"h":37}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":37,"h":37}, @@ -970,7 +986,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":378,"y":43,"w":19,"h":19}, + "frame": {"x":390,"y":89,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -978,7 +994,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":375,"y":89,"w":19,"h":19}, + "frame": {"x":397,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -986,7 +1002,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":291,"y":43,"w":37,"h":19}, + "frame": {"x":286,"y":101,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -994,7 +1010,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":204,"y":3,"w":38,"h":38}, + "frame": {"x":124,"y":3,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -1002,7 +1018,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":166,"y":45,"w":38,"h":19}, + "frame": {"x":290,"y":3,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -1010,7 +1026,7 @@ }, "sprites/buildings/painter-quad.png": { - "frame": {"x":3,"y":106,"w":77,"h":19}, + "frame": {"x":163,"y":45,"w":77,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":77,"h":19}, @@ -1018,7 +1034,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":208,"y":45,"w":38,"h":19}, + "frame": {"x":245,"y":78,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -1026,7 +1042,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":392,"y":66,"w":19,"h":19}, + "frame": {"x":413,"y":89,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1034,7 +1050,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":401,"y":43,"w":19,"h":19}, + "frame": {"x":413,"y":26,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1042,7 +1058,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":411,"y":3,"w":19,"h":19}, + "frame": {"x":435,"y":3,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1050,7 +1066,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":398,"y":89,"w":19,"h":19}, + "frame": {"x":420,"y":66,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1058,7 +1074,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":329,"y":66,"w":36,"h":19}, + "frame": {"x":327,"y":90,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -1066,7 +1082,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":248,"y":104,"w":37,"h":19}, + "frame": {"x":287,"y":67,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -1074,7 +1090,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":209,"y":81,"w":35,"h":38}, + "frame": {"x":126,"y":81,"w":35,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":35,"h":38}, @@ -1082,7 +1098,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":415,"y":66,"w":19,"h":19}, + "frame": {"x":436,"y":26,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1090,7 +1106,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":434,"y":3,"w":19,"h":18}, + "frame": {"x":436,"y":89,"w":19,"h":18}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":19,"h":18}, @@ -1098,7 +1114,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":438,"y":65,"w":19,"h":16}, + "frame": {"x":481,"y":3,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -1106,7 +1122,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":447,"y":42,"w":19,"h":16}, + "frame": {"x":482,"y":23,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -1114,15 +1130,31 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":444,"y":85,"w":19,"h":16}, + "frame": {"x":504,"y":3,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, "sourceSize": {"w":19,"h":19} }, +"sprites/buildings/wire_crossings-merger.png": +{ + "frame": {"x":466,"y":65,"w":19,"h":15}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":19,"h":15}, + "sourceSize": {"w":19,"h":19} +}, +"sprites/buildings/wire_crossings.png": +{ + "frame": {"x":271,"y":26,"w":19,"h":14}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":5,"w":19,"h":14}, + "sourceSize": {"w":19,"h":19} +}, "sprites/buildings/wire_left.png": { - "frame": {"x":243,"y":68,"w":9,"h":9}, + "frame": {"x":181,"y":68,"w":9,"h":9}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":9,"h":9}, @@ -1130,7 +1162,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":256,"y":68,"w":9,"h":9}, + "frame": {"x":194,"y":68,"w":9,"h":9}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":9,"h":9}, @@ -1138,7 +1170,7 @@ }, "sprites/buildings/wire_top.png": { - "frame": {"x":654,"y":85,"w":5,"h":13}, + "frame": {"x":675,"y":20,"w":5,"h":13}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":5,"h":13}, @@ -1146,7 +1178,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":82,"y":72,"w":6,"h":6}, + "frame": {"x":207,"y":68,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1154,7 +1186,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":92,"y":72,"w":6,"h":6}, + "frame": {"x":217,"y":68,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1162,7 +1194,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":278,"y":68,"w":3,"h":3}, + "frame": {"x":306,"y":90,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1170,7 +1202,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":285,"y":68,"w":3,"h":3}, + "frame": {"x":313,"y":90,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1178,7 +1210,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":292,"y":66,"w":3,"h":3}, + "frame": {"x":320,"y":90,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1186,7 +1218,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":650,"y":104,"w":10,"h":10}, + "frame": {"x":82,"y":68,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -1194,7 +1226,7 @@ }, "sprites/misc/energy_generator_overlay.png": { - "frame": {"x":172,"y":68,"w":18,"h":9}, + "frame": {"x":110,"y":68,"w":18,"h":9}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":27,"w":18,"h":9}, @@ -1202,7 +1234,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":299,"y":66,"w":3,"h":3}, + "frame": {"x":327,"y":113,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1210,7 +1242,7 @@ }, "sprites/misc/lock_direction_indicator.png": { - "frame": {"x":269,"y":68,"w":5,"h":5}, + "frame": {"x":297,"y":90,"w":5,"h":5}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":5,"h":5}, @@ -1218,7 +1250,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":650,"y":104,"w":10,"h":10}, + "frame": {"x":82,"y":68,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -1226,7 +1258,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":654,"y":71,"w":10,"h":10}, + "frame": {"x":96,"y":68,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -1234,7 +1266,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":194,"y":68,"w":18,"h":9}, + "frame": {"x":132,"y":68,"w":18,"h":9}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":18,"h":9}, @@ -1242,7 +1274,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":306,"y":66,"w":3,"h":3}, + "frame": {"x":327,"y":120,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1250,7 +1282,7 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":648,"y":54,"w":13,"h":13}, + "frame": {"x":674,"y":105,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -1258,7 +1290,7 @@ }, "sprites/wires/battery_empty.png": { - "frame": {"x":102,"y":72,"w":6,"h":6}, + "frame": {"x":227,"y":68,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1266,7 +1298,7 @@ }, "sprites/wires/battery_full.png": { - "frame": {"x":112,"y":72,"w":6,"h":6}, + "frame": {"x":237,"y":68,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1274,7 +1306,7 @@ }, "sprites/wires/battery_low.png": { - "frame": {"x":122,"y":72,"w":6,"h":6}, + "frame": {"x":247,"y":67,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1282,7 +1314,7 @@ }, "sprites/wires/battery_medium.png": { - "frame": {"x":132,"y":72,"w":6,"h":6}, + "frame": {"x":257,"y":67,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1290,7 +1322,7 @@ }, "sprites/wires/negative_energy.png": { - "frame": {"x":142,"y":72,"w":6,"h":6}, + "frame": {"x":267,"y":67,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1298,7 +1330,7 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":471,"y":113,"w":11,"h":12}, + "frame": {"x":367,"y":112,"w":11,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":11,"h":12}, @@ -1306,7 +1338,7 @@ }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":637,"y":105,"w":9,"h":12}, + "frame": {"x":397,"y":112,"w":9,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":9,"h":12}, @@ -1314,7 +1346,7 @@ }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":641,"y":88,"w":9,"h":12}, + "frame": {"x":410,"y":112,"w":9,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":9,"h":12}, @@ -1322,7 +1354,7 @@ }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":486,"y":113,"w":11,"h":12}, + "frame": {"x":382,"y":112,"w":11,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":11,"h":12}, @@ -1330,7 +1362,7 @@ }, "sprites/wires/positive_energy.png": { - "frame": {"x":152,"y":72,"w":6,"h":6}, + "frame": {"x":277,"y":67,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1338,7 +1370,7 @@ }, "sprites/wires/waste_piled.png": { - "frame": {"x":162,"y":72,"w":6,"h":6}, + "frame": {"x":287,"y":90,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1349,8 +1381,8 @@ "version": "1.0", "image": "atlas0_10.png", "format": "RGBA8888", - "size": {"w":667,"h":128}, + "size": {"w":690,"h":127}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:bab21fa6bf38d0f6aed5c1b1e9696597:5a2dfdcaf74898ae980273a5cb6294ea:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:812e8a2b8b0a4c9bbeb20fc68d835efe:85394009739c7a89da6c54b97c627497:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png index e6233273..abcb4386 100644 Binary files a/res_built/atlas/atlas0_10.png and b/res_built/atlas/atlas0_10.png differ diff --git a/res_built/atlas/atlas0_100.json b/res_built/atlas/atlas0_100.json index 7c10de19..b0eb0940 100644 --- a/res_built/atlas/atlas0_100.json +++ b/res_built/atlas/atlas0_100.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":1779,"y":921,"w":100,"h":126}, + "frame": {"x":1138,"y":2287,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":1883,"y":914,"w":100,"h":126}, + "frame": {"x":1242,"y":2287,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":2395,"y":524,"w":100,"h":126}, + "frame": {"x":1044,"y":2555,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":1936,"y":1538,"w":100,"h":126}, + "frame": {"x":1346,"y":2209,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":1936,"y":1668,"w":100,"h":126}, + "frame": {"x":1450,"y":2209,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":2013,"y":1339,"w":100,"h":126}, + "frame": {"x":1533,"y":2456,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -50,7 +50,7 @@ }, "sprites/belt/forward_6.png": { - "frame": {"x":2040,"y":1469,"w":100,"h":126}, + "frame": {"x":1708,"y":1434,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -58,7 +58,7 @@ }, "sprites/belt/forward_7.png": { - "frame": {"x":2040,"y":1599,"w":100,"h":126}, + "frame": {"x":1604,"y":1435,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -66,7 +66,7 @@ }, "sprites/belt/forward_8.png": { - "frame": {"x":2144,"y":1469,"w":100,"h":126}, + "frame": {"x":1438,"y":1912,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -74,7 +74,7 @@ }, "sprites/belt/forward_9.png": { - "frame": {"x":2144,"y":1599,"w":100,"h":126}, + "frame": {"x":1451,"y":2042,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -82,7 +82,7 @@ }, "sprites/belt/forward_10.png": { - "frame": {"x":2138,"y":988,"w":100,"h":126}, + "frame": {"x":1260,"y":1422,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -90,7 +90,7 @@ }, "sprites/belt/forward_11.png": { - "frame": {"x":1577,"y":1185,"w":100,"h":126}, + "frame": {"x":1500,"y":1314,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -98,7 +98,7 @@ }, "sprites/belt/forward_12.png": { - "frame": {"x":1467,"y":1432,"w":100,"h":126}, + "frame": {"x":1301,"y":1552,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -106,7 +106,7 @@ }, "sprites/belt/forward_13.png": { - "frame": {"x":1588,"y":1315,"w":100,"h":126}, + "frame": {"x":1783,"y":785,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -114,7 +114,7 @@ }, "sprites/belt/forward_14.png": { - "frame": {"x":1624,"y":1562,"w":100,"h":126}, + "frame": {"x":1857,"y":525,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -122,7 +122,7 @@ }, "sprites/belt/forward_15.png": { - "frame": {"x":1624,"y":1692,"w":100,"h":126}, + "frame": {"x":1824,"y":655,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -130,7 +130,7 @@ }, "sprites/belt/forward_16.png": { - "frame": {"x":1728,"y":1562,"w":100,"h":126}, + "frame": {"x":1809,"y":976,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -138,7 +138,7 @@ }, "sprites/belt/forward_17.png": { - "frame": {"x":1728,"y":1692,"w":100,"h":126}, + "frame": {"x":355,"y":2424,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -146,7 +146,7 @@ }, "sprites/belt/forward_18.png": { - "frame": {"x":2395,"y":394,"w":100,"h":126}, + "frame": {"x":355,"y":2554,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -154,7 +154,7 @@ }, "sprites/belt/forward_19.png": { - "frame": {"x":2499,"y":393,"w":100,"h":126}, + "frame": {"x":472,"y":2656,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -162,7 +162,7 @@ }, "sprites/belt/forward_20.png": { - "frame": {"x":2499,"y":523,"w":100,"h":126}, + "frame": {"x":1326,"y":1832,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -170,7 +170,7 @@ }, "sprites/belt/forward_21.png": { - "frame": {"x":1692,"y":1285,"w":100,"h":126}, + "frame": {"x":1334,"y":1962,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -178,7 +178,7 @@ }, "sprites/belt/forward_22.png": { - "frame": {"x":1796,"y":1285,"w":100,"h":126}, + "frame": {"x":1594,"y":1175,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -186,7 +186,7 @@ }, "sprites/belt/forward_23.png": { - "frame": {"x":1900,"y":1278,"w":100,"h":126}, + "frame": {"x":1698,"y":1174,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -194,7 +194,7 @@ }, "sprites/belt/forward_24.png": { - "frame": {"x":1805,"y":1415,"w":100,"h":126}, + "frame": {"x":1604,"y":1305,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -202,7 +202,7 @@ }, "sprites/belt/forward_25.png": { - "frame": {"x":1909,"y":1408,"w":100,"h":126}, + "frame": {"x":1708,"y":1304,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -210,7 +210,7 @@ }, "sprites/belt/forward_26.png": { - "frame": {"x":1832,"y":1545,"w":100,"h":126}, + "frame": {"x":1812,"y":1223,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -218,7 +218,7 @@ }, "sprites/belt/forward_27.png": { - "frame": {"x":1832,"y":1675,"w":100,"h":126}, + "frame": {"x":1350,"y":1682,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -226,7 +226,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":721,"y":1920,"w":113,"h":113}, + "frame": {"x":1233,"y":1715,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -234,7 +234,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":838,"y":1920,"w":113,"h":113}, + "frame": {"x":1266,"y":1305,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -242,7 +242,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":1895,"y":1161,"w":113,"h":113}, + "frame": {"x":576,"y":2686,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -250,7 +250,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":2248,"y":1586,"w":113,"h":113}, + "frame": {"x":1161,"y":2685,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -258,7 +258,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":2274,"y":1703,"w":113,"h":113}, + "frame": {"x":1278,"y":2685,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -266,7 +266,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":2274,"y":1820,"w":113,"h":113}, + "frame": {"x":1812,"y":1353,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -274,7 +274,7 @@ }, "sprites/belt/left_6.png": { - "frame": {"x":2210,"y":563,"w":113,"h":113}, + "frame": {"x":1454,"y":1678,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -282,7 +282,7 @@ }, "sprites/belt/left_7.png": { - "frame": {"x":2216,"y":680,"w":113,"h":113}, + "frame": {"x":1334,"y":2092,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -290,7 +290,7 @@ }, "sprites/belt/left_8.png": { - "frame": {"x":2216,"y":797,"w":113,"h":113}, + "frame": {"x":1346,"y":2339,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -298,7 +298,7 @@ }, "sprites/belt/left_9.png": { - "frame": {"x":2333,"y":667,"w":113,"h":113}, + "frame": {"x":1463,"y":2339,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -306,7 +306,7 @@ }, "sprites/belt/left_10.png": { - "frame": {"x":955,"y":1920,"w":113,"h":113}, + "frame": {"x":1383,"y":1314,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -314,7 +314,7 @@ }, "sprites/belt/left_11.png": { - "frame": {"x":2021,"y":988,"w":113,"h":113}, + "frame": {"x":1364,"y":1431,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -322,7 +322,7 @@ }, "sprites/belt/left_12.png": { - "frame": {"x":1471,"y":1315,"w":113,"h":113}, + "frame": {"x":1481,"y":1444,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -330,7 +330,7 @@ }, "sprites/belt/left_13.png": { - "frame": {"x":1571,"y":1445,"w":113,"h":113}, + "frame": {"x":1809,"y":1106,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -338,7 +338,7 @@ }, "sprites/belt/left_14.png": { - "frame": {"x":1688,"y":1445,"w":113,"h":113}, + "frame": {"x":1472,"y":1561,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -346,7 +346,7 @@ }, "sprites/belt/left_15.png": { - "frame": {"x":1661,"y":1039,"w":113,"h":113}, + "frame": {"x":459,"y":2422,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -354,7 +354,7 @@ }, "sprites/belt/left_16.png": { - "frame": {"x":1778,"y":1051,"w":113,"h":113}, + "frame": {"x":459,"y":2539,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -362,7 +362,7 @@ }, "sprites/belt/left_17.png": { - "frame": {"x":1895,"y":1044,"w":113,"h":113}, + "frame": {"x":576,"y":2452,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -370,7 +370,7 @@ }, "sprites/belt/left_18.png": { - "frame": {"x":2012,"y":1105,"w":113,"h":113}, + "frame": {"x":355,"y":2684,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -378,7 +378,7 @@ }, "sprites/belt/left_19.png": { - "frame": {"x":2129,"y":1118,"w":113,"h":113}, + "frame": {"x":576,"y":2569,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -386,7 +386,7 @@ }, "sprites/belt/left_20.png": { - "frame": {"x":2012,"y":1222,"w":113,"h":113}, + "frame": {"x":760,"y":2466,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -394,7 +394,7 @@ }, "sprites/belt/left_21.png": { - "frame": {"x":2129,"y":1235,"w":113,"h":113}, + "frame": {"x":693,"y":2583,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -402,7 +402,7 @@ }, "sprites/belt/left_22.png": { - "frame": {"x":1758,"y":1168,"w":113,"h":113}, + "frame": {"x":810,"y":2583,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -410,7 +410,7 @@ }, "sprites/belt/left_23.png": { - "frame": {"x":2117,"y":1352,"w":113,"h":113}, + "frame": {"x":927,"y":2555,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -418,7 +418,7 @@ }, "sprites/belt/left_24.png": { - "frame": {"x":2040,"y":1729,"w":113,"h":113}, + "frame": {"x":1148,"y":2568,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -426,7 +426,7 @@ }, "sprites/belt/left_25.png": { - "frame": {"x":2157,"y":1729,"w":113,"h":113}, + "frame": {"x":1265,"y":2568,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -434,7 +434,7 @@ }, "sprites/belt/left_26.png": { - "frame": {"x":2234,"y":1352,"w":113,"h":113}, + "frame": {"x":927,"y":2672,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -442,7 +442,7 @@ }, "sprites/belt/left_27.png": { - "frame": {"x":2248,"y":1469,"w":113,"h":113}, + "frame": {"x":1044,"y":2685,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -450,7 +450,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":2333,"y":784,"w":113,"h":113}, + "frame": {"x":1416,"y":2456,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -458,7 +458,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":2450,"y":654,"w":113,"h":113}, + "frame": {"x":1589,"y":1565,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -466,7 +466,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":2363,"y":1252,"w":113,"h":113}, + "frame": {"x":1580,"y":2267,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":1426,"y":1758,"w":113,"h":113}, + "frame": {"x":1789,"y":2033,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":1426,"y":1875,"w":113,"h":113}, + "frame": {"x":1789,"y":2150,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":1543,"y":1822,"w":113,"h":113}, + "frame": {"x":1814,"y":2267,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":1660,"y":1822,"w":113,"h":113}, + "frame": {"x":1805,"y":1587,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":1777,"y":1822,"w":113,"h":113}, + "frame": {"x":1805,"y":1704,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":1894,"y":1805,"w":113,"h":113}, + "frame": {"x":1395,"y":2573,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":2011,"y":1846,"w":113,"h":113}, + "frame": {"x":1512,"y":2586,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -530,7 +530,7 @@ }, "sprites/belt/right_10.png": { - "frame": {"x":2450,"y":771,"w":113,"h":113}, + "frame": {"x":1571,"y":1682,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -538,7 +538,7 @@ }, "sprites/belt/right_11.png": { - "frame": {"x":2242,"y":914,"w":113,"h":113}, + "frame": {"x":1812,"y":1470,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -546,7 +546,7 @@ }, "sprites/belt/right_12.png": { - "frame": {"x":2359,"y":901,"w":113,"h":113}, + "frame": {"x":1454,"y":1795,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -554,7 +554,7 @@ }, "sprites/belt/right_13.png": { - "frame": {"x":2476,"y":888,"w":113,"h":113}, + "frame": {"x":1571,"y":1799,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -562,7 +562,7 @@ }, "sprites/belt/right_14.png": { - "frame": {"x":2246,"y":1117,"w":113,"h":113}, + "frame": {"x":1542,"y":1916,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -570,7 +570,7 @@ }, "sprites/belt/right_15.png": { - "frame": {"x":2246,"y":1234,"w":113,"h":113}, + "frame": {"x":1555,"y":2033,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -578,7 +578,7 @@ }, "sprites/belt/right_16.png": { - "frame": {"x":2363,"y":1018,"w":113,"h":113}, + "frame": {"x":1659,"y":1916,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -586,7 +586,7 @@ }, "sprites/belt/right_17.png": { - "frame": {"x":2363,"y":1135,"w":113,"h":113}, + "frame": {"x":1672,"y":2033,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -594,7 +594,7 @@ }, "sprites/belt/right_18.png": { - "frame": {"x":2480,"y":1005,"w":113,"h":113}, + "frame": {"x":1555,"y":2150,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -602,7 +602,7 @@ }, "sprites/belt/right_19.png": { - "frame": {"x":2480,"y":1122,"w":113,"h":113}, + "frame": {"x":1672,"y":2150,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":2480,"y":1239,"w":113,"h":113}, + "frame": {"x":1697,"y":2267,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":2365,"y":1451,"w":113,"h":113}, + "frame": {"x":1637,"y":2384,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":2365,"y":1568,"w":113,"h":113}, + "frame": {"x":1637,"y":2501,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":2391,"y":1685,"w":113,"h":113}, + "frame": {"x":1754,"y":2384,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":2391,"y":1802,"w":113,"h":113}, + "frame": {"x":1754,"y":2501,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":2515,"y":1356,"w":113,"h":113}, + "frame": {"x":1688,"y":1682,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":2482,"y":1473,"w":113,"h":113}, + "frame": {"x":1688,"y":1799,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":2391,"y":1919,"w":113,"h":113}, + "frame": {"x":1776,"y":1916,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -674,7 +674,7 @@ }, "sprites/blueprints/advanced_processor.png": { - "frame": {"x":3,"y":1316,"w":381,"h":358}, + "frame": {"x":3,"y":1702,"w":381,"h":358}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":12,"w":381,"h":358}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":1491,"y":1067,"w":114,"h":114}, + "frame": {"x":913,"y":1541,"w":114,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":12,"w":114,"h":114}, @@ -690,7 +690,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":1661,"y":921,"w":114,"h":114}, + "frame": {"x":1115,"y":1715,"w":114,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":12,"w":114,"h":114}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":1471,"y":1185,"w":102,"h":126}, + "frame": {"x":1857,"y":395,"w":102,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":0,"w":102,"h":126}, @@ -706,7 +706,7 @@ }, "sprites/blueprints/cutter-quad.png": { - "frame": {"x":1485,"y":3,"w":730,"h":191}, + "frame": {"x":735,"y":395,"w":730,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":730,"h":191}, @@ -714,7 +714,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":1122,"y":1368,"w":341,"h":191}, + "frame": {"x":388,"y":1707,"w":341,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":341,"h":191}, @@ -722,15 +722,15 @@ }, "sprites/blueprints/energy_generator.png": { - "frame": {"x":3,"y":1678,"w":339,"h":355}, + "frame": {"x":3,"y":2424,"w":348,"h":364}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":25,"y":29,"w":339,"h":355}, + "spriteSourceSize": {"x":20,"y":20,"w":348,"h":364}, "sourceSize": {"w":384,"h":384} }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1458,"y":395,"w":182,"h":190}, + "frame": {"x":580,"y":1902,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -738,7 +738,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1458,"y":589,"w":182,"h":190}, + "frame": {"x":766,"y":1887,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -746,7 +746,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":1123,"y":783,"w":347,"h":191}, + "frame": {"x":1473,"y":590,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -754,7 +754,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":735,"y":395,"w":384,"h":382}, + "frame": {"x":3,"y":931,"w":384,"h":382}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":382}, @@ -762,7 +762,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":2219,"y":3,"w":384,"h":192}, + "frame": {"x":1485,"y":3,"w":384,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":192}, @@ -778,7 +778,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":346,"y":1686,"w":384,"h":192}, + "frame": {"x":1483,"y":199,"w":384,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":192}, @@ -786,7 +786,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":2024,"y":198,"w":189,"h":191}, + "frame": {"x":1067,"y":1368,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -794,7 +794,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":2217,"y":199,"w":189,"h":191}, + "frame": {"x":1616,"y":979,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -802,7 +802,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":1827,"y":393,"w":188,"h":182}, + "frame": {"x":388,"y":1902,"w":188,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":188,"h":182}, @@ -810,7 +810,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1644,"y":584,"w":185,"h":182}, + "frame": {"x":578,"y":2096,"w":185,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":4,"w":185,"h":182}, @@ -818,7 +818,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":1089,"y":1563,"w":340,"h":191}, + "frame": {"x":726,"y":1152,"w":340,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":340,"h":191}, @@ -826,7 +826,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":738,"y":1531,"w":347,"h":191}, + "frame": {"x":726,"y":957,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -834,7 +834,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":1123,"y":395,"w":331,"h":384}, + "frame": {"x":391,"y":931,"w":331,"h":384}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":29,"y":0,"w":331,"h":384}, @@ -842,7 +842,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":1295,"y":978,"w":192,"h":192}, + "frame": {"x":1420,"y":979,"w":192,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":192}, @@ -850,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":2021,"y":577,"w":183,"h":166}, + "frame": {"x":583,"y":2282,"w":183,"h":166}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":26,"w":183,"h":166}, @@ -858,7 +858,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":535,"y":1882,"w":182,"h":148}, + "frame": {"x":1115,"y":1563,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":44,"w":182,"h":148}, @@ -866,7 +866,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":346,"y":1882,"w":185,"h":148}, + "frame": {"x":724,"y":1541,"w":185,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":185,"h":148}, @@ -874,15 +874,31 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":1474,"y":783,"w":182,"h":148}, + "frame": {"x":1140,"y":1833,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":148}, "sourceSize": {"w":192,"h":192} }, +"sprites/blueprints/wire_crossings-merger.png": +{ + "frame": {"x":387,"y":2282,"w":192,"h":136}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":192,"h":136}, + "sourceSize": {"w":192,"h":192} +}, +"sprites/blueprints/wire_crossings.png": +{ + "frame": {"x":952,"y":2027,"w":192,"h":131}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":61,"w":192,"h":131}, + "sourceSize": {"w":192,"h":192} +}, "sprites/blueprints/wire_left.png": { - "frame": {"x":1313,"y":1952,"w":79,"h":79}, + "frame": {"x":779,"y":2700,"w":79,"h":79}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":47,"w":79,"h":79}, @@ -890,7 +906,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":1229,"y":1952,"w":80,"h":80}, + "frame": {"x":1031,"y":1563,"w":80,"h":80}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":46,"y":46,"w":80,"h":80}, @@ -898,7 +914,7 @@ }, "sprites/blueprints/wire_top.png": { - "frame": {"x":1623,"y":935,"w":34,"h":126}, + "frame": {"x":1887,"y":785,"w":34,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":46,"y":0,"w":34,"h":126}, @@ -906,7 +922,7 @@ }, "sprites/buildings/advanced_processor.png": { - "frame": {"x":738,"y":1171,"w":380,"h":356}, + "frame": {"x":3,"y":2064,"w":380,"h":356}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":13,"w":380,"h":356}, @@ -914,7 +930,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":2128,"y":1846,"w":113,"h":113}, + "frame": {"x":1629,"y":2618,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -922,7 +938,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":2508,"y":1654,"w":113,"h":113}, + "frame": {"x":1746,"y":2618,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -930,7 +946,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1779,"y":921,"w":100,"h":126}, + "frame": {"x":1138,"y":2287,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -946,7 +962,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":1083,"y":1758,"w":339,"h":190}, + "frame": {"x":724,"y":1347,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -954,7 +970,7 @@ }, "sprites/buildings/energy_generator.png": { - "frame": {"x":388,"y":1319,"w":346,"h":363}, + "frame": {"x":735,"y":590,"w":346,"h":363}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":21,"y":21,"w":346,"h":363}, @@ -970,7 +986,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1644,"y":392,"w":179,"h":188}, + "frame": {"x":770,"y":2274,"w":179,"h":188}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":1,"w":179,"h":188}, @@ -978,7 +994,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1112,"y":978,"w":179,"h":189}, + "frame": {"x":767,"y":2081,"w":179,"h":189}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":179,"h":189}, @@ -986,7 +1002,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":734,"y":1726,"w":345,"h":190}, + "frame": {"x":1085,"y":785,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -994,7 +1010,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":3,"y":931,"w":384,"h":381}, + "frame": {"x":3,"y":1317,"w":384,"h":381}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":381}, @@ -1002,7 +1018,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":735,"y":781,"w":384,"h":191}, + "frame": {"x":1469,"y":395,"w":384,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":191}, @@ -1018,7 +1034,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":724,"y":976,"w":384,"h":191}, + "frame": {"x":1085,"y":590,"w":384,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":191}, @@ -1026,7 +1042,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":2410,"y":199,"w":187,"h":190}, + "frame": {"x":387,"y":2088,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -1034,7 +1050,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":1433,"y":1563,"w":187,"h":190}, + "frame": {"x":733,"y":1693,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -1042,7 +1058,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":2019,"y":393,"w":187,"h":180}, + "frame": {"x":924,"y":1659,"w":187,"h":180}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":187,"h":180}, @@ -1050,7 +1066,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1833,"y":579,"w":184,"h":180}, + "frame": {"x":952,"y":1843,"w":184,"h":180}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":5,"w":184,"h":180}, @@ -1058,7 +1074,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":1485,"y":198,"w":339,"h":190}, + "frame": {"x":1077,"y":979,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -1066,7 +1082,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":1122,"y":1174,"w":345,"h":190}, + "frame": {"x":1434,"y":785,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -1074,7 +1090,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":391,"y":931,"w":329,"h":384}, + "frame": {"x":391,"y":1319,"w":329,"h":384}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":30,"y":0,"w":329,"h":384}, @@ -1082,7 +1098,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":1828,"y":198,"w":192,"h":191}, + "frame": {"x":1070,"y":1173,"w":192,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":192,"h":191}, @@ -1090,7 +1106,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":2210,"y":394,"w":181,"h":165}, + "frame": {"x":953,"y":2252,"w":181,"h":165}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":27,"w":181,"h":165}, @@ -1098,7 +1114,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1846,"y":763,"w":181,"h":147}, + "frame": {"x":1148,"y":2136,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":45,"w":181,"h":147}, @@ -1106,7 +1122,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1660,"y":770,"w":182,"h":147}, + "frame": {"x":1148,"y":1985,"w":182,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":182,"h":147}, @@ -1114,15 +1130,31 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":2031,"y":747,"w":181,"h":147}, + "frame": {"x":1149,"y":2417,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":181,"h":147}, "sourceSize": {"w":192,"h":192} }, +"sprites/buildings/wire_crossings-merger.png": +{ + "frame": {"x":1398,"y":1175,"w":192,"h":135}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":192,"h":135}, + "sourceSize": {"w":192,"h":192} +}, +"sprites/buildings/wire_crossings.png": +{ + "frame": {"x":953,"y":2421,"w":192,"h":130}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":62,"w":192,"h":130}, + "sourceSize": {"w":192,"h":192} +}, "sprites/buildings/wire_left.png": { - "frame": {"x":2351,"y":1369,"w":78,"h":78}, + "frame": {"x":1334,"y":2456,"w":78,"h":78}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":48,"w":78,"h":78}, @@ -1130,7 +1162,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":2433,"y":1369,"w":78,"h":78}, + "frame": {"x":1871,"y":2384,"w":78,"h":78}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":48,"y":48,"w":78,"h":78}, @@ -1138,7 +1170,7 @@ }, "sprites/buildings/wire_top.png": { - "frame": {"x":1987,"y":914,"w":30,"h":126}, + "frame": {"x":1913,"y":976,"w":30,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":48,"y":0,"w":30,"h":126}, @@ -1146,7 +1178,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":2607,"y":3,"w":50,"h":64}, + "frame": {"x":1871,"y":321,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -1154,7 +1186,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":2607,"y":71,"w":50,"h":64}, + "frame": {"x":877,"y":2466,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -1162,7 +1194,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":2328,"y":1031,"w":24,"h":32}, + "frame": {"x":924,"y":1843,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -1170,7 +1202,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":1089,"y":1531,"w":28,"h":28}, + "frame": {"x":1928,"y":655,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":28,"h":28}, @@ -1178,7 +1210,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":2524,"y":1590,"w":28,"h":28}, + "frame": {"x":1301,"y":1682,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":28,"h":28}, @@ -1186,7 +1218,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":2242,"y":1031,"w":82,"h":82}, + "frame": {"x":693,"y":2700,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -1194,7 +1226,7 @@ }, "sprites/misc/energy_generator_overlay.png": { - "frame": {"x":1072,"y":1952,"w":153,"h":57}, + "frame": {"x":1783,"y":915,"w":153,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":183,"y":290,"w":153,"h":57}, @@ -1202,7 +1234,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":1605,"y":1939,"w":32,"h":32}, + "frame": {"x":1867,"y":1821,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, @@ -1210,7 +1242,7 @@ }, "sprites/misc/lock_direction_indicator.png": { - "frame": {"x":2593,"y":966,"w":48,"h":30}, + "frame": {"x":1451,"y":2172,"w":48,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":48,"h":30}, @@ -1218,7 +1250,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":2242,"y":1031,"w":82,"h":82}, + "frame": {"x":693,"y":2700,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -1226,7 +1258,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":2567,"y":762,"w":80,"h":96}, + "frame": {"x":1871,"y":221,"w":80,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":80,"h":96}, @@ -1234,7 +1266,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":2031,"y":898,"w":176,"h":86}, + "frame": {"x":950,"y":2162,"w":176,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":4,"w":176,"h":86}, @@ -1242,7 +1274,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1396,"y":1952,"w":24,"h":32}, + "frame": {"x":1824,"y":590,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -1250,7 +1282,7 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":1491,"y":935,"w":128,"h":128}, + "frame": {"x":1266,"y":1173,"w":128,"h":128}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, @@ -1258,7 +1290,7 @@ }, "sprites/wires/battery_empty.png": { - "frame": {"x":2482,"y":1590,"w":38,"h":60}, + "frame": {"x":1580,"y":2384,"w":38,"h":60}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":2,"w":38,"h":60}, @@ -1266,7 +1298,7 @@ }, "sprites/wires/battery_full.png": { - "frame": {"x":2599,"y":1532,"w":58,"h":38}, + "frame": {"x":1871,"y":2466,"w":58,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":14,"w":58,"h":38}, @@ -1274,7 +1306,7 @@ }, "sprites/wires/battery_low.png": { - "frame": {"x":2599,"y":1574,"w":58,"h":38}, + "frame": {"x":1805,"y":1821,"w":58,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":14,"w":58,"h":38}, @@ -1282,7 +1314,7 @@ }, "sprites/wires/battery_medium.png": { - "frame": {"x":1543,"y":1939,"w":58,"h":38}, + "frame": {"x":1871,"y":2508,"w":58,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":14,"w":58,"h":38}, @@ -1290,7 +1322,7 @@ }, "sprites/wires/negative_energy.png": { - "frame": {"x":2607,"y":139,"w":42,"h":42}, + "frame": {"x":877,"y":2534,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":11,"w":42,"h":42}, @@ -1298,7 +1330,7 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":1681,"y":1156,"w":73,"h":105}, + "frame": {"x":1873,"y":3,"w":73,"h":105}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":27,"y":0,"w":73,"h":105}, @@ -1306,7 +1338,7 @@ }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":2327,"y":563,"w":63,"h":100}, + "frame": {"x":1405,"y":1548,"w":63,"h":100}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":32,"y":0,"w":63,"h":100}, @@ -1314,7 +1346,7 @@ }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":2593,"y":862,"w":63,"h":100}, + "frame": {"x":693,"y":2452,"w":63,"h":100}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":32,"y":0,"w":63,"h":100}, @@ -1322,7 +1354,7 @@ }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":2567,"y":653,"w":73,"h":105}, + "frame": {"x":1873,"y":112,"w":73,"h":105}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":27,"y":0,"w":73,"h":105}, @@ -1330,7 +1362,7 @@ }, "sprites/wires/positive_energy.png": { - "frame": {"x":2508,"y":1771,"w":42,"h":42}, + "frame": {"x":1805,"y":1863,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":11,"w":42,"h":42}, @@ -1338,7 +1370,7 @@ }, "sprites/wires/waste_piled.png": { - "frame": {"x":2599,"y":1473,"w":58,"h":55}, + "frame": {"x":862,"y":2700,"w":58,"h":55}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":4,"w":58,"h":55}, @@ -1349,8 +1381,8 @@ "version": "1.0", "image": "atlas0_100.png", "format": "RGBA8888", - "size": {"w":2660,"h":2036}, + "size": {"w":1962,"h":2802}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:bab21fa6bf38d0f6aed5c1b1e9696597:5a2dfdcaf74898ae980273a5cb6294ea:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:812e8a2b8b0a4c9bbeb20fc68d835efe:85394009739c7a89da6c54b97c627497:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.png b/res_built/atlas/atlas0_100.png index d0c2e864..e1fa4a43 100644 Binary files a/res_built/atlas/atlas0_100.png and b/res_built/atlas/atlas0_100.png differ diff --git a/res_built/atlas/atlas0_25.json b/res_built/atlas/atlas0_25.json index 96967fe6..0c36d24d 100644 --- a/res_built/atlas/atlas0_25.json +++ b/res_built/atlas/atlas0_25.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":764,"y":3,"w":28,"h":32}, + "frame": {"x":792,"y":175,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":741,"y":159,"w":28,"h":32}, + "frame": {"x":312,"y":407,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":351,"y":301,"w":28,"h":32}, + "frame": {"x":442,"y":344,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":479,"y":309,"w":28,"h":32}, + "frame": {"x":506,"y":342,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":479,"y":345,"w":28,"h":32}, + "frame": {"x":506,"y":378,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":511,"y":305,"w":28,"h":32}, + "frame": {"x":538,"y":246,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -50,7 +50,7 @@ }, "sprites/belt/forward_6.png": { - "frame": {"x":511,"y":341,"w":28,"h":32}, + "frame": {"x":538,"y":282,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -58,7 +58,7 @@ }, "sprites/belt/forward_7.png": { - "frame": {"x":543,"y":305,"w":28,"h":32}, + "frame": {"x":538,"y":318,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -66,7 +66,7 @@ }, "sprites/belt/forward_8.png": { - "frame": {"x":543,"y":341,"w":28,"h":32}, + "frame": {"x":538,"y":354,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -74,7 +74,7 @@ }, "sprites/belt/forward_9.png": { - "frame": {"x":575,"y":305,"w":28,"h":32}, + "frame": {"x":570,"y":245,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -82,7 +82,7 @@ }, "sprites/belt/forward_10.png": { - "frame": {"x":727,"y":201,"w":28,"h":32}, + "frame": {"x":312,"y":443,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -90,7 +90,7 @@ }, "sprites/belt/forward_11.png": { - "frame": {"x":727,"y":237,"w":28,"h":32}, + "frame": {"x":344,"y":405,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -98,7 +98,7 @@ }, "sprites/belt/forward_12.png": { - "frame": {"x":766,"y":39,"w":28,"h":32}, + "frame": {"x":344,"y":441,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -106,7 +106,7 @@ }, "sprites/belt/forward_13.png": { - "frame": {"x":766,"y":75,"w":28,"h":32}, + "frame": {"x":536,"y":210,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -114,7 +114,7 @@ }, "sprites/belt/forward_14.png": { - "frame": {"x":756,"y":111,"w":28,"h":32}, + "frame": {"x":376,"y":405,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -122,7 +122,7 @@ }, "sprites/belt/forward_15.png": { - "frame": {"x":773,"y":147,"w":28,"h":32}, + "frame": {"x":376,"y":441,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -130,7 +130,7 @@ }, "sprites/belt/forward_16.png": { - "frame": {"x":759,"y":217,"w":28,"h":32}, + "frame": {"x":408,"y":404,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -138,7 +138,7 @@ }, "sprites/belt/forward_17.png": { - "frame": {"x":287,"y":302,"w":28,"h":32}, + "frame": {"x":408,"y":440,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -146,7 +146,7 @@ }, "sprites/belt/forward_18.png": { - "frame": {"x":287,"y":338,"w":28,"h":32}, + "frame": {"x":442,"y":272,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -154,7 +154,7 @@ }, "sprites/belt/forward_19.png": { - "frame": {"x":319,"y":301,"w":28,"h":32}, + "frame": {"x":442,"y":308,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -162,7 +162,7 @@ }, "sprites/belt/forward_20.png": { - "frame": {"x":319,"y":337,"w":28,"h":32}, + "frame": {"x":474,"y":270,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -170,7 +170,7 @@ }, "sprites/belt/forward_21.png": { - "frame": {"x":351,"y":337,"w":28,"h":32}, + "frame": {"x":474,"y":306,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -178,7 +178,7 @@ }, "sprites/belt/forward_22.png": { - "frame": {"x":383,"y":310,"w":28,"h":32}, + "frame": {"x":474,"y":342,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -186,7 +186,7 @@ }, "sprites/belt/forward_23.png": { - "frame": {"x":383,"y":346,"w":28,"h":32}, + "frame": {"x":442,"y":380,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -194,7 +194,7 @@ }, "sprites/belt/forward_24.png": { - "frame": {"x":415,"y":310,"w":28,"h":32}, + "frame": {"x":474,"y":378,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -202,7 +202,7 @@ }, "sprites/belt/forward_25.png": { - "frame": {"x":415,"y":346,"w":28,"h":32}, + "frame": {"x":440,"y":416,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -210,7 +210,7 @@ }, "sprites/belt/forward_26.png": { - "frame": {"x":447,"y":309,"w":28,"h":32}, + "frame": {"x":506,"y":270,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -218,7 +218,7 @@ }, "sprites/belt/forward_27.png": { - "frame": {"x":447,"y":345,"w":28,"h":32}, + "frame": {"x":506,"y":306,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -226,7 +226,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":693,"y":201,"w":30,"h":30}, + "frame": {"x":196,"y":406,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -234,7 +234,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":693,"y":235,"w":30,"h":30}, + "frame": {"x":230,"y":406,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -242,7 +242,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":641,"y":329,"w":30,"h":30}, + "frame": {"x":806,"y":215,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -250,7 +250,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":709,"y":409,"w":30,"h":30}, + "frame": {"x":604,"y":281,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -258,7 +258,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":743,"y":321,"w":30,"h":30}, + "frame": {"x":604,"y":315,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -266,7 +266,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":777,"y":321,"w":30,"h":30}, + "frame": {"x":604,"y":349,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -274,7 +274,7 @@ }, "sprites/belt/left_6.png": { - "frame": {"x":743,"y":355,"w":30,"h":30}, + "frame": {"x":638,"y":279,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -282,7 +282,7 @@ }, "sprites/belt/left_7.png": { - "frame": {"x":777,"y":355,"w":30,"h":30}, + "frame": {"x":638,"y":313,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -290,7 +290,7 @@ }, "sprites/belt/left_8.png": { - "frame": {"x":743,"y":389,"w":30,"h":30}, + "frame": {"x":672,"y":279,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -298,7 +298,7 @@ }, "sprites/belt/left_9.png": { - "frame": {"x":777,"y":389,"w":30,"h":30}, + "frame": {"x":638,"y":347,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -306,7 +306,7 @@ }, "sprites/belt/left_10.png": { - "frame": {"x":692,"y":269,"w":30,"h":30}, + "frame": {"x":808,"y":107,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -314,7 +314,7 @@ }, "sprites/belt/left_11.png": { - "frame": {"x":726,"y":273,"w":30,"h":30}, + "frame": {"x":808,"y":141,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -322,7 +322,7 @@ }, "sprites/belt/left_12.png": { - "frame": {"x":641,"y":295,"w":30,"h":30}, + "frame": {"x":436,"y":238,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -330,7 +330,7 @@ }, "sprites/belt/left_13.png": { - "frame": {"x":773,"y":183,"w":30,"h":30}, + "frame": {"x":568,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -338,7 +338,7 @@ }, "sprites/belt/left_14.png": { - "frame": {"x":760,"y":253,"w":30,"h":30}, + "frame": {"x":602,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -346,7 +346,7 @@ }, "sprites/belt/left_15.png": { - "frame": {"x":760,"y":287,"w":30,"h":30}, + "frame": {"x":636,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -354,7 +354,7 @@ }, "sprites/belt/left_16.png": { - "frame": {"x":675,"y":303,"w":30,"h":30}, + "frame": {"x":670,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -362,7 +362,7 @@ }, "sprites/belt/left_17.png": { - "frame": {"x":709,"y":307,"w":30,"h":30}, + "frame": {"x":704,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -370,7 +370,7 @@ }, "sprites/belt/left_18.png": { - "frame": {"x":607,"y":305,"w":30,"h":30}, + "frame": {"x":738,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -378,7 +378,7 @@ }, "sprites/belt/left_19.png": { - "frame": {"x":607,"y":339,"w":30,"h":30}, + "frame": {"x":772,"y":211,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -386,7 +386,7 @@ }, "sprites/belt/left_20.png": { - "frame": {"x":675,"y":337,"w":30,"h":30}, + "frame": {"x":570,"y":281,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -394,7 +394,7 @@ }, "sprites/belt/left_21.png": { - "frame": {"x":709,"y":341,"w":30,"h":30}, + "frame": {"x":634,"y":245,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -402,7 +402,7 @@ }, "sprites/belt/left_22.png": { - "frame": {"x":641,"y":363,"w":30,"h":30}, + "frame": {"x":570,"y":315,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -410,7 +410,7 @@ }, "sprites/belt/left_23.png": { - "frame": {"x":675,"y":371,"w":30,"h":30}, + "frame": {"x":668,"y":245,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -418,7 +418,7 @@ }, "sprites/belt/left_24.png": { - "frame": {"x":709,"y":375,"w":30,"h":30}, + "frame": {"x":570,"y":349,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -426,7 +426,7 @@ }, "sprites/belt/left_25.png": { - "frame": {"x":607,"y":373,"w":30,"h":30}, + "frame": {"x":702,"y":245,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -434,7 +434,7 @@ }, "sprites/belt/left_26.png": { - "frame": {"x":641,"y":397,"w":30,"h":30}, + "frame": {"x":736,"y":245,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -442,7 +442,7 @@ }, "sprites/belt/left_27.png": { - "frame": {"x":675,"y":405,"w":30,"h":30}, + "frame": {"x":770,"y":245,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -450,7 +450,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":743,"y":423,"w":30,"h":30}, + "frame": {"x":672,"y":313,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -458,7 +458,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":777,"y":423,"w":30,"h":30}, + "frame": {"x":706,"y":279,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -466,7 +466,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":533,"y":457,"w":30,"h":30}, + "frame": {"x":808,"y":317,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":335,"y":373,"w":30,"h":30}, + "frame": {"x":742,"y":381,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":323,"y":407,"w":30,"h":30}, + "frame": {"x":800,"y":385,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":357,"y":407,"w":30,"h":30}, + "frame": {"x":572,"y":417,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":394,"y":382,"w":30,"h":30}, + "frame": {"x":606,"y":417,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":391,"y":416,"w":30,"h":30}, + "frame": {"x":640,"y":415,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":428,"y":382,"w":30,"h":30}, + "frame": {"x":674,"y":415,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":425,"y":416,"w":30,"h":30}, + "frame": {"x":708,"y":415,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -530,7 +530,7 @@ }, "sprites/belt/right_10.png": { - "frame": {"x":193,"y":457,"w":30,"h":30}, + "frame": {"x":672,"y":347,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -538,7 +538,7 @@ }, "sprites/belt/right_11.png": { - "frame": {"x":227,"y":457,"w":30,"h":30}, + "frame": {"x":706,"y":313,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -546,7 +546,7 @@ }, "sprites/belt/right_12.png": { - "frame": {"x":261,"y":457,"w":30,"h":30}, + "frame": {"x":740,"y":279,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -554,7 +554,7 @@ }, "sprites/belt/right_13.png": { - "frame": {"x":295,"y":457,"w":30,"h":30}, + "frame": {"x":706,"y":347,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -562,7 +562,7 @@ }, "sprites/belt/right_14.png": { - "frame": {"x":329,"y":457,"w":30,"h":30}, + "frame": {"x":740,"y":313,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -570,7 +570,7 @@ }, "sprites/belt/right_15.png": { - "frame": {"x":363,"y":457,"w":30,"h":30}, + "frame": {"x":740,"y":347,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -578,7 +578,7 @@ }, "sprites/belt/right_16.png": { - "frame": {"x":397,"y":457,"w":30,"h":30}, + "frame": {"x":774,"y":279,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -586,7 +586,7 @@ }, "sprites/belt/right_17.png": { - "frame": {"x":431,"y":457,"w":30,"h":30}, + "frame": {"x":808,"y":249,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -594,7 +594,7 @@ }, "sprites/belt/right_18.png": { - "frame": {"x":465,"y":457,"w":30,"h":30}, + "frame": {"x":808,"y":283,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -602,7 +602,7 @@ }, "sprites/belt/right_19.png": { - "frame": {"x":499,"y":457,"w":30,"h":30}, + "frame": {"x":774,"y":313,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":567,"y":457,"w":30,"h":30}, + "frame": {"x":774,"y":347,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":601,"y":457,"w":30,"h":30}, + "frame": {"x":808,"y":351,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":635,"y":457,"w":30,"h":30}, + "frame": {"x":538,"y":390,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":669,"y":457,"w":30,"h":30}, + "frame": {"x":572,"y":383,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":703,"y":457,"w":30,"h":30}, + "frame": {"x":606,"y":383,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":737,"y":457,"w":30,"h":30}, + "frame": {"x":640,"y":381,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":771,"y":457,"w":30,"h":30}, + "frame": {"x":674,"y":381,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":289,"y":405,"w":30,"h":30}, + "frame": {"x":708,"y":381,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":462,"y":381,"w":30,"h":30}, + "frame": {"x":742,"y":415,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -690,7 +690,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":496,"y":381,"w":30,"h":30}, + "frame": {"x":776,"y":419,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":575,"y":341,"w":28,"h":32}, + "frame": {"x":602,"y":245,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -714,7 +714,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":675,"y":55,"w":87,"h":48}, + "frame": {"x":668,"y":55,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -722,15 +722,15 @@ }, "sprites/blueprints/energy_generator.png": { - "frame": {"x":292,"y":207,"w":87,"h":90}, + "frame": {"x":103,"y":344,"w":89,"h":92}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":5,"y":6,"w":87,"h":90}, + "spriteSourceSize": {"x":4,"y":4,"w":89,"h":92}, "sourceSize": {"w":96,"h":96} }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":539,"y":253,"w":47,"h":48}, + "frame": {"x":588,"y":159,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -738,7 +738,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":591,"y":201,"w":47,"h":48}, + "frame": {"x":639,"y":159,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -746,7 +746,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":671,"y":3,"w":89,"h":48}, + "frame": {"x":483,"y":55,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -762,7 +762,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":383,"y":55,"w":96,"h":48}, + "frame": {"x":571,"y":3,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -778,7 +778,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":571,"y":3,"w":96,"h":48}, + "frame": {"x":383,"y":55,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -786,7 +786,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":383,"y":206,"w":48,"h":48}, + "frame": {"x":771,"y":3,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -794,7 +794,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":435,"y":205,"w":48,"h":48}, + "frame": {"x":759,"y":55,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -802,7 +802,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":383,"y":258,"w":48,"h":48}, + "frame": {"x":756,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -810,7 +810,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":55,"y":440,"w":47,"h":47}, + "frame": {"x":339,"y":303,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -842,7 +842,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":435,"y":257,"w":48,"h":48}, + "frame": {"x":287,"y":303,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -858,7 +858,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":483,"y":159,"w":48,"h":38}, + "frame": {"x":3,"y":440,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -866,7 +866,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":535,"y":159,"w":48,"h":38}, + "frame": {"x":55,"y":440,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -874,15 +874,31 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":587,"y":159,"w":48,"h":38}, + "frame": {"x":107,"y":440,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, "sourceSize": {"w":48,"h":48} }, +"sprites/blueprints/wire_crossings-merger.png": +{ + "frame": {"x":390,"y":288,"w":48,"h":35}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":48,"h":35}, + "sourceSize": {"w":48,"h":48} +}, +"sprites/blueprints/wire_crossings.png": +{ + "frame": {"x":390,"y":366,"w":48,"h":34}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":14,"w":48,"h":34}, + "sourceSize": {"w":48,"h":48} +}, "sprites/blueprints/wire_left.png": { - "frame": {"x":369,"y":382,"w":21,"h":21}, + "frame": {"x":508,"y":414,"w":21,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":11,"w":21,"h":21}, @@ -890,7 +906,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":530,"y":411,"w":21,"h":21}, + "frame": {"x":533,"y":424,"w":21,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":11,"w":21,"h":21}, @@ -898,7 +914,7 @@ }, "sprites/blueprints/wire_top.png": { - "frame": {"x":796,"y":3,"w":10,"h":32}, + "frame": {"x":823,"y":3,"w":10,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":10,"h":32}, @@ -914,7 +930,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":530,"y":377,"w":30,"h":30}, + "frame": {"x":474,"y":414,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -922,7 +938,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":564,"y":377,"w":30,"h":30}, + "frame": {"x":472,"y":448,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -930,7 +946,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":764,"y":3,"w":28,"h":32}, + "frame": {"x":792,"y":175,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -954,7 +970,7 @@ }, "sprites/buildings/energy_generator.png": { - "frame": {"x":103,"y":344,"w":89,"h":92}, + "frame": {"x":292,"y":207,"w":89,"h":92}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":89,"h":92}, @@ -970,7 +986,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":590,"y":253,"w":47,"h":48}, + "frame": {"x":690,"y":159,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -978,7 +994,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":642,"y":201,"w":47,"h":48}, + "frame": {"x":741,"y":159,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -986,7 +1002,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":583,"y":55,"w":88,"h":48}, + "frame": {"x":576,"y":55,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -1018,7 +1034,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":483,"y":55,"w":96,"h":48}, + "frame": {"x":671,"y":3,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -1026,7 +1042,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":487,"y":201,"w":48,"h":48}, + "frame": {"x":287,"y":355,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1034,7 +1050,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":487,"y":253,"w":48,"h":48}, + "frame": {"x":432,"y":159,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1042,7 +1058,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":3,"y":440,"w":48,"h":47}, + "frame": {"x":536,"y":159,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -1050,7 +1066,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":106,"y":440,"w":47,"h":47}, + "frame": {"x":339,"y":354,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -1082,7 +1098,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":539,"y":201,"w":48,"h":48}, + "frame": {"x":484,"y":159,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1090,7 +1106,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":432,"y":159,"w":47,"h":42}, + "frame": {"x":385,"y":242,"w":47,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":47,"h":42}, @@ -1098,7 +1114,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":639,"y":159,"w":47,"h":38}, + "frame": {"x":159,"y":440,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -1106,7 +1122,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":690,"y":159,"w":47,"h":38}, + "frame": {"x":210,"y":440,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -1114,15 +1130,31 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":641,"y":253,"w":47,"h":38}, + "frame": {"x":261,"y":440,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, "sourceSize": {"w":48,"h":48} }, +"sprites/buildings/wire_crossings-merger.png": +{ + "frame": {"x":390,"y":327,"w":48,"h":35}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":48,"h":35}, + "sourceSize": {"w":48,"h":48} +}, +"sprites/buildings/wire_crossings.png": +{ + "frame": {"x":470,"y":211,"w":48,"h":34}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":14,"w":48,"h":34}, + "sourceSize": {"w":48,"h":48} +}, "sprites/buildings/wire_left.png": { - "frame": {"x":555,"y":411,"w":21,"h":21}, + "frame": {"x":508,"y":439,"w":21,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":11,"w":21,"h":21}, @@ -1130,7 +1162,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":580,"y":411,"w":21,"h":21}, + "frame": {"x":533,"y":449,"w":21,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":11,"w":21,"h":21}, @@ -1138,7 +1170,7 @@ }, "sprites/buildings/wire_top.png": { - "frame": {"x":788,"y":111,"w":10,"h":32}, + "frame": {"x":522,"y":211,"w":10,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":10,"h":32}, @@ -1146,7 +1178,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":605,"y":407,"w":14,"h":16}, + "frame": {"x":824,"y":175,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1154,7 +1186,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":623,"y":407,"w":14,"h":16}, + "frame": {"x":824,"y":195,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1162,7 +1194,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":756,"y":147,"w":8,"h":8}, + "frame": {"x":830,"y":445,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1170,7 +1202,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":798,"y":39,"w":8,"h":8}, + "frame": {"x":830,"y":457,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1178,7 +1210,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":157,"y":476,"w":8,"h":8}, + "frame": {"x":558,"y":424,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1186,7 +1218,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":459,"y":431,"w":22,"h":22}, + "frame": {"x":810,"y":419,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -1194,7 +1226,7 @@ }, "sprites/misc/energy_generator_overlay.png": { - "frame": {"x":245,"y":406,"w":40,"h":17}, + "frame": {"x":470,"y":249,"w":40,"h":17}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":45,"y":71,"w":40,"h":17}, @@ -1202,7 +1234,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":794,"y":273,"w":8,"h":8}, + "frame": {"x":558,"y":436,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1210,7 +1242,7 @@ }, "sprites/misc/lock_direction_indicator.png": { - "frame": {"x":743,"y":307,"w":12,"h":10}, + "frame": {"x":590,"y":451,"w":12,"h":10}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":12,"h":10}, @@ -1218,7 +1250,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":459,"y":431,"w":22,"h":22}, + "frame": {"x":810,"y":419,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -1226,7 +1258,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":502,"y":415,"w":22,"h":24}, + "frame": {"x":286,"y":407,"w":22,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":22,"h":24}, @@ -1234,7 +1266,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":196,"y":406,"w":45,"h":23}, + "frame": {"x":421,"y":211,"w":45,"h":23}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":45,"h":23}, @@ -1242,7 +1274,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":305,"y":439,"w":8,"h":8}, + "frame": {"x":558,"y":448,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1250,7 +1282,7 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":157,"y":440,"w":32,"h":32}, + "frame": {"x":385,"y":206,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, @@ -1258,7 +1290,7 @@ }, "sprites/wires/battery_empty.png": { - "frame": {"x":794,"y":253,"w":12,"h":16}, + "frame": {"x":522,"y":247,"w":12,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":12,"h":16}, @@ -1266,7 +1298,7 @@ }, "sprites/wires/battery_full.png": { - "frame": {"x":791,"y":237,"w":16,"h":12}, + "frame": {"x":506,"y":464,"w":16,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":16,"h":12}, @@ -1274,7 +1306,7 @@ }, "sprites/wires/battery_low.png": { - "frame": {"x":462,"y":415,"w":16,"h":12}, + "frame": {"x":810,"y":445,"w":16,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":16,"h":12}, @@ -1282,7 +1314,7 @@ }, "sprites/wires/battery_medium.png": { - "frame": {"x":482,"y":415,"w":16,"h":12}, + "frame": {"x":570,"y":451,"w":16,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":16,"h":12}, @@ -1290,7 +1322,7 @@ }, "sprites/wires/negative_energy.png": { - "frame": {"x":289,"y":439,"w":12,"h":12}, + "frame": {"x":792,"y":159,"w":12,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":12,"h":12}, @@ -1298,7 +1330,7 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":287,"y":374,"w":20,"h":27}, + "frame": {"x":811,"y":55,"w":20,"h":27}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":20,"h":27}, @@ -1306,7 +1338,7 @@ }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":245,"y":427,"w":18,"h":26}, + "frame": {"x":264,"y":406,"w":18,"h":26}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":18,"h":26}, @@ -1314,7 +1346,7 @@ }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":267,"y":427,"w":18,"h":26}, + "frame": {"x":440,"y":452,"w":18,"h":26}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":18,"h":26}, @@ -1322,7 +1354,7 @@ }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":311,"y":374,"w":20,"h":27}, + "frame": {"x":776,"y":381,"w":20,"h":27}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":20,"h":27}, @@ -1330,7 +1362,7 @@ }, "sprites/wires/positive_energy.png": { - "frame": {"x":485,"y":431,"w":12,"h":12}, + "frame": {"x":823,"y":39,"w":12,"h":12}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":12,"h":12}, @@ -1338,7 +1370,7 @@ }, "sprites/wires/waste_piled.png": { - "frame": {"x":791,"y":217,"w":16,"h":16}, + "frame": {"x":811,"y":86,"w":16,"h":16}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, @@ -1349,8 +1381,8 @@ "version": "1.0", "image": "atlas0_25.png", "format": "RGBA8888", - "size": {"w":810,"h":490}, + "size": {"w":841,"h":481}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:bab21fa6bf38d0f6aed5c1b1e9696597:5a2dfdcaf74898ae980273a5cb6294ea:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:812e8a2b8b0a4c9bbeb20fc68d835efe:85394009739c7a89da6c54b97c627497:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png index f9a44b10..1d59d796 100644 Binary files a/res_built/atlas/atlas0_25.png and b/res_built/atlas/atlas0_25.png differ diff --git a/res_built/atlas/atlas0_50.json b/res_built/atlas/atlas0_50.json index af26fc4b..829c5215 100644 --- a/res_built/atlas/atlas0_50.json +++ b/res_built/atlas/atlas0_50.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":1387,"y":203,"w":51,"h":63}, + "frame": {"x":947,"y":70,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":1387,"y":270,"w":51,"h":63}, + "frame": {"x":947,"y":137,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":1007,"y":452,"w":51,"h":63}, + "frame": {"x":468,"y":1213,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":1372,"y":599,"w":51,"h":63}, + "frame": {"x":571,"y":1347,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":1018,"y":653,"w":51,"h":63}, + "frame": {"x":633,"y":1146,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":1073,"y":708,"w":51,"h":63}, + "frame": {"x":633,"y":1213,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -50,7 +50,7 @@ }, "sprites/belt/forward_6.png": { - "frame": {"x":1128,"y":708,"w":51,"h":63}, + "frame": {"x":633,"y":1280,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -58,7 +58,7 @@ }, "sprites/belt/forward_7.png": { - "frame": {"x":1183,"y":708,"w":51,"h":63}, + "frame": {"x":688,"y":1146,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -66,7 +66,7 @@ }, "sprites/belt/forward_8.png": { - "frame": {"x":1238,"y":708,"w":51,"h":63}, + "frame": {"x":688,"y":1213,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -74,7 +74,7 @@ }, "sprites/belt/forward_9.png": { - "frame": {"x":1317,"y":659,"w":51,"h":63}, + "frame": {"x":688,"y":1280,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -82,7 +82,7 @@ }, "sprites/belt/forward_10.png": { - "frame": {"x":1387,"y":337,"w":51,"h":63}, + "frame": {"x":814,"y":525,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -90,7 +90,7 @@ }, "sprites/belt/forward_11.png": { - "frame": {"x":765,"y":846,"w":51,"h":63}, + "frame": {"x":758,"y":587,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -98,7 +98,7 @@ }, "sprites/belt/forward_12.png": { - "frame": {"x":842,"y":473,"w":51,"h":63}, + "frame": {"x":813,"y":592,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -106,7 +106,7 @@ }, "sprites/belt/forward_13.png": { - "frame": {"x":897,"y":473,"w":51,"h":63}, + "frame": {"x":758,"y":654,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -114,7 +114,7 @@ }, "sprites/belt/forward_14.png": { - "frame": {"x":908,"y":540,"w":51,"h":63}, + "frame": {"x":813,"y":659,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -122,7 +122,7 @@ }, "sprites/belt/forward_15.png": { - "frame": {"x":933,"y":386,"w":51,"h":63}, + "frame": {"x":753,"y":721,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -130,7 +130,7 @@ }, "sprites/belt/forward_16.png": { - "frame": {"x":988,"y":385,"w":51,"h":63}, + "frame": {"x":808,"y":726,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -138,7 +138,7 @@ }, "sprites/belt/forward_17.png": { - "frame": {"x":1043,"y":385,"w":51,"h":63}, + "frame": {"x":461,"y":1361,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -146,7 +146,7 @@ }, "sprites/belt/forward_18.png": { - "frame": {"x":1384,"y":404,"w":51,"h":63}, + "frame": {"x":373,"y":961,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -154,7 +154,7 @@ }, "sprites/belt/forward_19.png": { - "frame": {"x":952,"y":453,"w":51,"h":63}, + "frame": {"x":468,"y":1146,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -162,7 +162,7 @@ }, "sprites/belt/forward_20.png": { - "frame": {"x":963,"y":520,"w":51,"h":63}, + "frame": {"x":468,"y":1280,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -170,7 +170,7 @@ }, "sprites/belt/forward_21.png": { - "frame": {"x":1018,"y":519,"w":51,"h":63}, + "frame": {"x":523,"y":1146,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -178,7 +178,7 @@ }, "sprites/belt/forward_22.png": { - "frame": {"x":963,"y":587,"w":51,"h":63}, + "frame": {"x":523,"y":1213,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -186,7 +186,7 @@ }, "sprites/belt/forward_23.png": { - "frame": {"x":1018,"y":586,"w":51,"h":63}, + "frame": {"x":523,"y":1280,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -194,7 +194,7 @@ }, "sprites/belt/forward_24.png": { - "frame": {"x":820,"y":906,"w":51,"h":63}, + "frame": {"x":516,"y":1347,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -202,7 +202,7 @@ }, "sprites/belt/forward_25.png": { - "frame": {"x":1317,"y":525,"w":51,"h":63}, + "frame": {"x":578,"y":1146,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -210,7 +210,7 @@ }, "sprites/belt/forward_26.png": { - "frame": {"x":1317,"y":592,"w":51,"h":63}, + "frame": {"x":578,"y":1213,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -218,7 +218,7 @@ }, "sprites/belt/forward_27.png": { - "frame": {"x":1372,"y":532,"w":51,"h":63}, + "frame": {"x":578,"y":1280,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -226,7 +226,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":847,"y":540,"w":57,"h":57}, + "frame": {"x":945,"y":478,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -234,7 +234,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":836,"y":601,"w":57,"h":57}, + "frame": {"x":869,"y":504,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -242,7 +242,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":1281,"y":403,"w":57,"h":57}, + "frame": {"x":863,"y":809,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -250,7 +250,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":943,"y":851,"w":57,"h":57}, + "frame": {"x":533,"y":1024,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -258,7 +258,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":1004,"y":851,"w":57,"h":57}, + "frame": {"x":445,"y":1085,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -266,7 +266,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":1065,"y":851,"w":57,"h":57}, + "frame": {"x":506,"y":1085,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -274,7 +274,7 @@ }, "sprites/belt/left_6.png": { - "frame": {"x":875,"y":912,"w":57,"h":57}, + "frame": {"x":567,"y":1085,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -282,7 +282,7 @@ }, "sprites/belt/left_7.png": { - "frame": {"x":936,"y":912,"w":57,"h":57}, + "frame": {"x":594,"y":1024,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -290,7 +290,7 @@ }, "sprites/belt/left_8.png": { - "frame": {"x":997,"y":912,"w":57,"h":57}, + "frame": {"x":628,"y":1085,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -298,7 +298,7 @@ }, "sprites/belt/left_9.png": { - "frame": {"x":1058,"y":912,"w":57,"h":57}, + "frame": {"x":626,"y":1347,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -306,7 +306,7 @@ }, "sprites/belt/left_10.png": { - "frame": {"x":830,"y":662,"w":57,"h":57}, + "frame": {"x":869,"y":565,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -314,7 +314,7 @@ }, "sprites/belt/left_11.png": { - "frame": {"x":829,"y":723,"w":57,"h":57}, + "frame": {"x":930,"y":539,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -322,7 +322,7 @@ }, "sprites/belt/left_12.png": { - "frame": {"x":821,"y":784,"w":57,"h":57}, + "frame": {"x":930,"y":600,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -330,7 +330,7 @@ }, "sprites/belt/left_13.png": { - "frame": {"x":897,"y":607,"w":57,"h":57}, + "frame": {"x":868,"y":626,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -338,7 +338,7 @@ }, "sprites/belt/left_14.png": { - "frame": {"x":891,"y":668,"w":57,"h":57}, + "frame": {"x":929,"y":661,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -346,7 +346,7 @@ }, "sprites/belt/left_15.png": { - "frame": {"x":890,"y":729,"w":57,"h":57}, + "frame": {"x":868,"y":687,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -354,7 +354,7 @@ }, "sprites/belt/left_16.png": { - "frame": {"x":882,"y":790,"w":57,"h":57}, + "frame": {"x":863,"y":748,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -362,7 +362,7 @@ }, "sprites/belt/left_17.png": { - "frame": {"x":1098,"y":403,"w":57,"h":57}, + "frame": {"x":929,"y":722,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -370,7 +370,7 @@ }, "sprites/belt/left_18.png": { - "frame": {"x":1159,"y":403,"w":57,"h":57}, + "frame": {"x":924,"y":783,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -378,7 +378,7 @@ }, "sprites/belt/left_19.png": { - "frame": {"x":1220,"y":403,"w":57,"h":57}, + "frame": {"x":802,"y":793,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -386,7 +386,7 @@ }, "sprites/belt/left_20.png": { - "frame": {"x":943,"y":790,"w":57,"h":57}, + "frame": {"x":924,"y":844,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -394,7 +394,7 @@ }, "sprites/belt/left_21.png": { - "frame": {"x":951,"y":729,"w":57,"h":57}, + "frame": {"x":802,"y":854,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -402,7 +402,7 @@ }, "sprites/belt/left_22.png": { - "frame": {"x":952,"y":668,"w":57,"h":57}, + "frame": {"x":863,"y":870,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -410,7 +410,7 @@ }, "sprites/belt/left_23.png": { - "frame": {"x":1004,"y":790,"w":57,"h":57}, + "frame": {"x":924,"y":905,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -418,7 +418,7 @@ }, "sprites/belt/left_24.png": { - "frame": {"x":1012,"y":729,"w":57,"h":57}, + "frame": {"x":473,"y":963,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -426,7 +426,7 @@ }, "sprites/belt/left_25.png": { - "frame": {"x":1065,"y":790,"w":57,"h":57}, + "frame": {"x":534,"y":963,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -434,7 +434,7 @@ }, "sprites/belt/left_26.png": { - "frame": {"x":821,"y":845,"w":57,"h":57}, + "frame": {"x":595,"y":962,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -442,7 +442,7 @@ }, "sprites/belt/left_27.png": { - "frame": {"x":882,"y":851,"w":57,"h":57}, + "frame": {"x":472,"y":1024,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -450,7 +450,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":1119,"y":912,"w":57,"h":57}, + "frame": {"x":687,"y":1347,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -458,7 +458,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":1099,"y":464,"w":57,"h":57}, + "frame": {"x":794,"y":915,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -466,7 +466,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":1256,"y":586,"w":57,"h":57}, + "frame": {"x":743,"y":1220,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":1187,"y":775,"w":57,"h":57}, + "frame": {"x":865,"y":1236,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":1187,"y":836,"w":57,"h":57}, + "frame": {"x":882,"y":1053,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":1180,"y":897,"w":57,"h":57}, + "frame": {"x":870,"y":1297,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":1248,"y":775,"w":57,"h":57}, + "frame": {"x":870,"y":1358,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":1248,"y":836,"w":57,"h":57}, + "frame": {"x":933,"y":1114,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":1241,"y":897,"w":57,"h":57}, + "frame": {"x":926,"y":1175,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":1302,"y":897,"w":57,"h":57}, + "frame": {"x":926,"y":1236,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -530,7 +530,7 @@ }, "sprites/belt/right_10.png": { - "frame": {"x":1160,"y":464,"w":57,"h":57}, + "frame": {"x":855,"y":931,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -538,7 +538,7 @@ }, "sprites/belt/right_11.png": { - "frame": {"x":1221,"y":464,"w":57,"h":57}, + "frame": {"x":766,"y":976,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -546,7 +546,7 @@ }, "sprites/belt/right_12.png": { - "frame": {"x":1282,"y":464,"w":57,"h":57}, + "frame": {"x":916,"y":966,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -554,7 +554,7 @@ }, "sprites/belt/right_13.png": { - "frame": {"x":1073,"y":525,"w":57,"h":57}, + "frame": {"x":827,"y":992,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -562,7 +562,7 @@ }, "sprites/belt/right_14.png": { - "frame": {"x":1134,"y":525,"w":57,"h":57}, + "frame": {"x":655,"y":1023,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -570,7 +570,7 @@ }, "sprites/belt/right_15.png": { - "frame": {"x":1073,"y":586,"w":57,"h":57}, + "frame": {"x":689,"y":1084,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -578,7 +578,7 @@ }, "sprites/belt/right_16.png": { - "frame": {"x":1195,"y":525,"w":57,"h":57}, + "frame": {"x":760,"y":1037,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -586,7 +586,7 @@ }, "sprites/belt/right_17.png": { - "frame": {"x":1134,"y":586,"w":57,"h":57}, + "frame": {"x":821,"y":1053,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -594,7 +594,7 @@ }, "sprites/belt/right_18.png": { - "frame": {"x":1256,"y":525,"w":57,"h":57}, + "frame": {"x":750,"y":1098,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -602,7 +602,7 @@ }, "sprites/belt/right_19.png": { - "frame": {"x":1195,"y":586,"w":57,"h":57}, + "frame": {"x":743,"y":1159,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":1380,"y":471,"w":57,"h":57}, + "frame": {"x":743,"y":1281,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":1073,"y":647,"w":57,"h":57}, + "frame": {"x":748,"y":1342,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":1134,"y":647,"w":57,"h":57}, + "frame": {"x":811,"y":1114,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":1195,"y":647,"w":57,"h":57}, + "frame": {"x":804,"y":1175,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":1256,"y":647,"w":57,"h":57}, + "frame": {"x":804,"y":1236,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":1372,"y":666,"w":57,"h":57}, + "frame": {"x":809,"y":1341,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":1126,"y":775,"w":57,"h":57}, + "frame": {"x":872,"y":1114,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":1126,"y":836,"w":57,"h":57}, + "frame": {"x":865,"y":1175,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":768,"y":655,"w":58,"h":58}, + "frame": {"x":935,"y":204,"w":58,"h":58}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":58,"h":58}, @@ -690,7 +690,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":767,"y":717,"w":58,"h":58}, + "frame": {"x":752,"y":525,"w":58,"h":58}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":58,"h":58}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":764,"y":779,"w":53,"h":63}, + "frame": {"x":947,"y":3,"w":53,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":53,"h":63}, @@ -714,7 +714,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":373,"y":399,"w":172,"h":96}, + "frame": {"x":198,"y":861,"w":172,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":172,"h":96}, @@ -722,15 +722,15 @@ }, "sprites/blueprints/energy_generator.png": { - "frame": {"x":935,"y":203,"w":170,"h":178}, + "frame": {"x":199,"y":474,"w":175,"h":183}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":12,"y":14,"w":170,"h":178}, + "spriteSourceSize": {"x":9,"y":9,"w":175,"h":183}, "sourceSize": {"w":192,"h":192} }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":378,"y":847,"w":92,"h":96}, + "frame": {"x":372,"y":1261,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -738,7 +738,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":475,"y":696,"w":92,"h":96}, + "frame": {"x":349,"y":1061,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -746,7 +746,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":3,"y":854,"w":175,"h":96}, + "frame": {"x":556,"y":603,"w":175,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":175,"h":96}, @@ -754,7 +754,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":373,"y":203,"w":192,"h":192}, + "frame": {"x":751,"y":3,"w":192,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":192}, @@ -762,7 +762,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":751,"y":103,"w":192,"h":96}, + "frame": {"x":373,"y":303,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -778,7 +778,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":1121,"y":3,"w":192,"h":96}, + "frame": {"x":569,"y":303,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -786,7 +786,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":1317,"y":3,"w":96,"h":96}, + "frame": {"x":553,"y":703,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -794,7 +794,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":1322,"y":103,"w":96,"h":96}, + "frame": {"x":653,"y":703,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -802,7 +802,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":475,"y":599,"w":95,"h":93}, + "frame": {"x":374,"y":862,"w":95,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":95,"h":93}, @@ -810,7 +810,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":574,"y":599,"w":93,"h":93}, + "frame": {"x":838,"y":199,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":1,"w":93,"h":93}, @@ -818,7 +818,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":549,"y":399,"w":171,"h":96}, + "frame": {"x":198,"y":961,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -826,7 +826,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":1143,"y":103,"w":175,"h":96}, + "frame": {"x":199,"y":661,"w":175,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":175,"h":96}, @@ -834,7 +834,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":569,"y":203,"w":167,"h":192}, + "frame": {"x":3,"y":1037,"w":167,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":167,"h":192}, @@ -842,7 +842,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":1287,"y":203,"w":96,"h":96}, + "frame": {"x":174,"y":1161,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -850,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":740,"y":386,"w":93,"h":84}, + "frame": {"x":473,"y":875,"w":93,"h":84}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":12,"w":93,"h":84}, @@ -858,7 +858,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":572,"y":894,"w":93,"h":75}, + "frame": {"x":863,"y":391,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":21,"w":93,"h":75}, @@ -866,7 +866,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":474,"y":891,"w":94,"h":75}, + "frame": {"x":666,"y":873,"w":94,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":94,"h":75}, @@ -874,15 +874,31 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":724,"y":474,"w":93,"h":75}, + "frame": {"x":766,"y":398,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":93,"h":75}, "sourceSize": {"w":96,"h":96} }, +"sprites/blueprints/wire_crossings-merger.png": +{ + "frame": {"x":376,"y":789,"w":96,"h":69}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":96,"h":69}, + "sourceSize": {"w":96,"h":96} +}, +"sprites/blueprints/wire_crossings.png": +{ + "frame": {"x":644,"y":803,"w":96,"h":66}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":30,"w":96,"h":66}, + "sourceSize": {"w":96,"h":96} +}, "sprites/blueprints/wire_left.png": { - "frame": {"x":714,"y":928,"w":40,"h":40}, + "frame": {"x":428,"y":1004,"w":40,"h":40}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":23,"w":40,"h":40}, @@ -890,7 +906,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":669,"y":928,"w":41,"h":41}, + "frame": {"x":428,"y":959,"w":41,"h":41}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":22,"y":22,"w":41,"h":41}, @@ -898,7 +914,7 @@ }, "sprites/blueprints/wire_top.png": { - "frame": {"x":1417,"y":3,"w":19,"h":63}, + "frame": {"x":735,"y":603,"w":19,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":22,"y":0,"w":19,"h":63}, @@ -906,7 +922,7 @@ }, "sprites/buildings/advanced_processor.png": { - "frame": {"x":740,"y":203,"w":191,"h":179}, + "frame": {"x":3,"y":854,"w":191,"h":179}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":191,"h":179}, @@ -914,7 +930,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":1309,"y":778,"w":57,"h":57}, + "frame": {"x":931,"y":1297,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -922,7 +938,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1370,"y":771,"w":57,"h":57}, + "frame": {"x":931,"y":1358,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -930,7 +946,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1387,"y":203,"w":51,"h":63}, + "frame": {"x":947,"y":70,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -938,7 +954,7 @@ }, "sprites/buildings/cutter-quad.png": { - "frame": {"x":751,"y":3,"w":366,"h":96}, + "frame": {"x":373,"y":203,"w":366,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":366,"h":96}, @@ -946,7 +962,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":369,"y":499,"w":171,"h":96}, + "frame": {"x":174,"y":1061,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -954,7 +970,7 @@ }, "sprites/buildings/energy_generator.png": { - "frame": {"x":198,"y":670,"w":174,"h":182}, + "frame": {"x":378,"y":403,"w":174,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":10,"y":10,"w":174,"h":182}, @@ -970,7 +986,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":571,"y":696,"w":91,"h":95}, + "frame": {"x":373,"y":1161,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -978,7 +994,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":573,"y":795,"w":91,"h":95}, + "frame": {"x":743,"y":204,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -986,7 +1002,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":1109,"y":203,"w":174,"h":96}, + "frame": {"x":378,"y":589,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -1002,7 +1018,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":947,"y":103,"w":192,"h":96}, + "frame": {"x":556,"y":403,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -1018,7 +1034,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":182,"y":856,"w":192,"h":96}, + "frame": {"x":556,"y":503,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -1026,7 +1042,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":376,"y":647,"w":95,"h":96}, + "frame": {"x":273,"y":1261,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -1034,7 +1050,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":376,"y":747,"w":95,"h":96}, + "frame": {"x":274,"y":1161,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -1042,7 +1058,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":475,"y":796,"w":94,"h":91}, + "frame": {"x":765,"y":303,"w":94,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":94,"h":91}, @@ -1050,7 +1066,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":671,"y":599,"w":93,"h":91}, + "frame": {"x":863,"y":296,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, @@ -1058,7 +1074,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":544,"y":499,"w":171,"h":96}, + "frame": {"x":378,"y":689,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -1066,7 +1082,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":1109,"y":303,"w":174,"h":96}, + "frame": {"x":198,"y":761,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -1074,7 +1090,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":199,"y":474,"w":166,"h":192}, + "frame": {"x":3,"y":1233,"w":166,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":166,"h":192}, @@ -1082,7 +1098,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":1287,"y":303,"w":96,"h":96}, + "frame": {"x":173,"y":1261,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1090,7 +1106,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":837,"y":386,"w":92,"h":83}, + "frame": {"x":570,"y":875,"w":92,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":13,"w":92,"h":83}, @@ -1098,7 +1114,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":671,"y":694,"w":92,"h":74}, + "frame": {"x":173,"y":1361,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":22,"w":92,"h":74}, @@ -1106,7 +1122,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":668,"y":772,"w":92,"h":74}, + "frame": {"x":269,"y":1361,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -1114,15 +1130,31 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":669,"y":850,"w":92,"h":74}, + "frame": {"x":365,"y":1361,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, "sourceSize": {"w":96,"h":96} }, +"sprites/buildings/wire_crossings-merger.png": +{ + "frame": {"x":544,"y":803,"w":96,"h":68}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":96,"h":68}, + "sourceSize": {"w":96,"h":96} +}, +"sprites/buildings/wire_crossings.png": +{ + "frame": {"x":666,"y":952,"w":96,"h":66}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":30,"w":96,"h":66}, + "sourceSize": {"w":96,"h":96} +}, "sprites/buildings/wire_left.png": { - "frame": {"x":1363,"y":727,"w":40,"h":40}, + "frame": {"x":716,"y":1022,"w":40,"h":40}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":23,"w":40,"h":40}, @@ -1130,7 +1162,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":1351,"y":839,"w":40,"h":40}, + "frame": {"x":804,"y":1297,"w":40,"h":40}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":23,"w":40,"h":40}, @@ -1138,7 +1170,7 @@ }, "sprites/buildings/wire_top.png": { - "frame": {"x":821,"y":474,"w":17,"h":63}, + "frame": {"x":744,"y":803,"w":17,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":17,"h":63}, @@ -1146,7 +1178,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1407,"y":727,"w":26,"h":32}, + "frame": {"x":764,"y":898,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -1154,7 +1186,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":1363,"y":883,"w":26,"h":32}, + "frame": {"x":748,"y":1403,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -1162,7 +1194,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":1293,"y":744,"w":14,"h":16}, + "frame": {"x":845,"y":477,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1170,7 +1202,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":3,"y":954,"w":15,"h":15}, + "frame": {"x":987,"y":1175,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":15,"h":15}, @@ -1178,7 +1210,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":933,"y":453,"w":15,"h":15}, + "frame": {"x":987,"y":1194,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":15,"h":15}, @@ -1186,7 +1218,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":719,"y":553,"w":42,"h":42}, + "frame": {"x":960,"y":318,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -1194,7 +1226,7 @@ }, "sprites/misc/energy_generator_overlay.png": { - "frame": {"x":765,"y":553,"w":78,"h":30}, + "frame": {"x":863,"y":470,"w":78,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":91,"y":144,"w":78,"h":30}, @@ -1202,7 +1234,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":1417,"y":70,"w":16,"h":16}, + "frame": {"x":174,"y":1037,"w":16,"h":16}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, @@ -1210,7 +1242,7 @@ }, "sprites/misc/lock_direction_indicator.png": { - "frame": {"x":1393,"y":890,"w":24,"h":16}, + "frame": {"x":888,"y":992,"w":24,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":24,"h":16}, @@ -1218,7 +1250,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":719,"y":553,"w":42,"h":42}, + "frame": {"x":960,"y":318,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -1226,7 +1258,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":1317,"y":726,"w":42,"h":48}, + "frame": {"x":960,"y":266,"w":42,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":42,"h":48}, @@ -1234,7 +1266,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":369,"y":599,"w":89,"h":44}, + "frame": {"x":752,"y":477,"w":89,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":89,"h":44}, @@ -1242,7 +1274,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":765,"y":913,"w":14,"h":16}, + "frame": {"x":845,"y":497,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1250,7 +1282,7 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":768,"y":587,"w":64,"h":64}, + "frame": {"x":476,"y":789,"w":64,"h":64}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":64,"h":64}, @@ -1258,7 +1290,7 @@ }, "sprites/wires/battery_empty.png": { - "frame": {"x":1293,"y":708,"w":20,"h":32}, + "frame": {"x":778,"y":1403,"w":20,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":20,"h":32}, @@ -1266,7 +1298,7 @@ }, "sprites/wires/battery_full.png": { - "frame": {"x":430,"y":947,"w":30,"h":21}, + "frame": {"x":516,"y":1414,"w":30,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":30,"h":21}, @@ -1274,7 +1306,7 @@ }, "sprites/wires/battery_low.png": { - "frame": {"x":1363,"y":919,"w":30,"h":21}, + "frame": {"x":550,"y":1414,"w":30,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":30,"h":21}, @@ -1282,7 +1314,7 @@ }, "sprites/wires/battery_medium.png": { - "frame": {"x":1395,"y":865,"w":30,"h":21}, + "frame": {"x":584,"y":1414,"w":30,"h":21}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":30,"h":21}, @@ -1290,7 +1322,7 @@ }, "sprites/wires/negative_energy.png": { - "frame": {"x":378,"y":947,"w":22,"h":22}, + "frame": {"x":888,"y":1027,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":22,"h":22}, @@ -1298,7 +1330,7 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":1342,"y":403,"w":38,"h":53}, + "frame": {"x":960,"y":364,"w":38,"h":53}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":38,"h":53}, @@ -1306,7 +1338,7 @@ }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":1062,"y":464,"w":33,"h":51}, + "frame": {"x":765,"y":788,"w":33,"h":51}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":15,"y":0,"w":33,"h":51}, @@ -1314,7 +1346,7 @@ }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":1343,"y":460,"w":33,"h":51}, + "frame": {"x":765,"y":843,"w":33,"h":51}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":15,"y":0,"w":33,"h":51}, @@ -1322,7 +1354,7 @@ }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":1309,"y":839,"w":38,"h":53}, + "frame": {"x":960,"y":421,"w":38,"h":53}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":38,"h":53}, @@ -1330,7 +1362,7 @@ }, "sprites/wires/positive_energy.png": { - "frame": {"x":404,"y":947,"w":22,"h":22}, + "frame": {"x":914,"y":1027,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":22,"h":22}, @@ -1338,7 +1370,7 @@ }, "sprites/wires/waste_piled.png": { - "frame": {"x":1395,"y":832,"w":30,"h":29}, + "frame": {"x":373,"y":1028,"w":30,"h":29}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":30,"h":29}, @@ -1349,8 +1381,8 @@ "version": "1.0", "image": "atlas0_50.png", "format": "RGBA8888", - "size": {"w":1441,"h":972}, + "size": {"w":1005,"h":1438}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:bab21fa6bf38d0f6aed5c1b1e9696597:5a2dfdcaf74898ae980273a5cb6294ea:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:812e8a2b8b0a4c9bbeb20fc68d835efe:85394009739c7a89da6c54b97c627497:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png index 8cd20cfc..323fb5fd 100644 Binary files a/res_built/atlas/atlas0_50.png and b/res_built/atlas/atlas0_50.png differ diff --git a/res_built/atlas/atlas0_75.json b/res_built/atlas/atlas0_75.json index 1df32dea..cc16db32 100644 --- a/res_built/atlas/atlas0_75.json +++ b/res_built/atlas/atlas0_75.json @@ -2,7 +2,7 @@ "sprites/belt/forward_0.png": { - "frame": {"x":86,"y":1416,"w":77,"h":95}, + "frame": {"x":889,"y":1329,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -10,7 +10,7 @@ }, "sprites/belt/forward_1.png": { - "frame": {"x":167,"y":1416,"w":77,"h":95}, + "frame": {"x":1194,"y":777,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -18,7 +18,7 @@ }, "sprites/belt/forward_2.png": { - "frame": {"x":1511,"y":644,"w":77,"h":95}, + "frame": {"x":1394,"y":1045,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -26,7 +26,7 @@ }, "sprites/belt/forward_3.png": { - "frame": {"x":1894,"y":1353,"w":77,"h":95}, + "frame": {"x":1218,"y":1474,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -34,7 +34,7 @@ }, "sprites/belt/forward_4.png": { - "frame": {"x":1236,"y":1409,"w":77,"h":95}, + "frame": {"x":1227,"y":1573,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -42,7 +42,7 @@ }, "sprites/belt/forward_5.png": { - "frame": {"x":1248,"y":1300,"w":77,"h":95}, + "frame": {"x":1299,"y":1474,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -50,7 +50,7 @@ }, "sprites/belt/forward_6.png": { - "frame": {"x":1329,"y":1300,"w":77,"h":95}, + "frame": {"x":1308,"y":1573,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -58,7 +58,7 @@ }, "sprites/belt/forward_7.png": { - "frame": {"x":1317,"y":1399,"w":77,"h":95}, + "frame": {"x":1380,"y":1423,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -66,7 +66,7 @@ }, "sprites/belt/forward_8.png": { - "frame": {"x":1398,"y":1399,"w":77,"h":95}, + "frame": {"x":1479,"y":1564,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -74,7 +74,7 @@ }, "sprites/belt/forward_9.png": { - "frame": {"x":1479,"y":1391,"w":77,"h":95}, + "frame": {"x":1560,"y":1564,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -82,7 +82,7 @@ }, "sprites/belt/forward_10.png": { - "frame": {"x":248,"y":1416,"w":77,"h":95}, + "frame": {"x":1275,"y":749,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -90,7 +90,7 @@ }, "sprites/belt/forward_11.png": { - "frame": {"x":329,"y":1416,"w":77,"h":95}, + "frame": {"x":1223,"y":876,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -98,7 +98,7 @@ }, "sprites/belt/forward_12.png": { - "frame": {"x":410,"y":1416,"w":77,"h":95}, + "frame": {"x":1356,"y":748,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -106,7 +106,7 @@ }, "sprites/belt/forward_13.png": { - "frame": {"x":491,"y":1416,"w":77,"h":95}, + "frame": {"x":1441,"y":655,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -114,7 +114,7 @@ }, "sprites/belt/forward_14.png": { - "frame": {"x":572,"y":1416,"w":77,"h":95}, + "frame": {"x":1522,"y":655,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -122,7 +122,7 @@ }, "sprites/belt/forward_15.png": { - "frame": {"x":1963,"y":3,"w":77,"h":95}, + "frame": {"x":1304,"y":848,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -130,7 +130,7 @@ }, "sprites/belt/forward_16.png": { - "frame": {"x":1494,"y":446,"w":77,"h":95}, + "frame": {"x":1385,"y":847,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -138,7 +138,7 @@ }, "sprites/belt/forward_17.png": { - "frame": {"x":1963,"y":102,"w":77,"h":95}, + "frame": {"x":1313,"y":947,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -146,7 +146,7 @@ }, "sprites/belt/forward_18.png": { - "frame": {"x":1949,"y":381,"w":77,"h":95}, + "frame": {"x":1394,"y":946,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -154,7 +154,7 @@ }, "sprites/belt/forward_19.png": { - "frame": {"x":1511,"y":545,"w":77,"h":95}, + "frame": {"x":1761,"y":504,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -162,7 +162,7 @@ }, "sprites/belt/forward_20.png": { - "frame": {"x":1506,"y":743,"w":77,"h":95}, + "frame": {"x":1313,"y":1046,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -170,7 +170,7 @@ }, "sprites/belt/forward_21.png": { - "frame": {"x":1592,"y":618,"w":77,"h":95}, + "frame": {"x":1394,"y":1144,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -178,7 +178,7 @@ }, "sprites/belt/forward_22.png": { - "frame": {"x":1536,"y":842,"w":77,"h":95}, + "frame": {"x":1079,"y":1034,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -186,7 +186,7 @@ }, "sprites/belt/forward_23.png": { - "frame": {"x":1587,"y":743,"w":77,"h":95}, + "frame": {"x":1114,"y":1133,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -194,7 +194,7 @@ }, "sprites/belt/forward_24.png": { - "frame": {"x":1617,"y":842,"w":77,"h":95}, + "frame": {"x":1114,"y":1232,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -202,7 +202,7 @@ }, "sprites/belt/forward_25.png": { - "frame": {"x":1102,"y":1033,"w":77,"h":95}, + "frame": {"x":1131,"y":1397,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -210,7 +210,7 @@ }, "sprites/belt/forward_26.png": { - "frame": {"x":1183,"y":1031,"w":77,"h":95}, + "frame": {"x":1137,"y":1496,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -218,7 +218,7 @@ }, "sprites/belt/forward_27.png": { - "frame": {"x":1183,"y":1130,"w":77,"h":95}, + "frame": {"x":1285,"y":1155,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -226,7 +226,7 @@ }, "sprites/belt/left_0.png": { - "frame": {"x":1056,"y":1411,"w":86,"h":86}, + "frame": {"x":1351,"y":658,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -234,7 +234,7 @@ }, "sprites/belt/left_1.png": { - "frame": {"x":1575,"y":445,"w":86,"h":86}, + "frame": {"x":1223,"y":975,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -242,7 +242,7 @@ }, "sprites/belt/left_2.png": { - "frame": {"x":1668,"y":723,"w":86,"h":86}, + "frame": {"x":1603,"y":606,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -250,7 +250,7 @@ }, "sprites/belt/left_3.png": { - "frame": {"x":1716,"y":993,"w":86,"h":86}, + "frame": {"x":1736,"y":786,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -258,7 +258,7 @@ }, "sprites/belt/left_4.png": { - "frame": {"x":1806,"y":993,"w":86,"h":86}, + "frame": {"x":1655,"y":876,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -266,7 +266,7 @@ }, "sprites/belt/left_5.png": { - "frame": {"x":1896,"y":993,"w":86,"h":86}, + "frame": {"x":1745,"y":876,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -274,7 +274,7 @@ }, "sprites/belt/left_6.png": { - "frame": {"x":1938,"y":723,"w":86,"h":86}, + "frame": {"x":1655,"y":966,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -282,7 +282,7 @@ }, "sprites/belt/left_7.png": { - "frame": {"x":1943,"y":570,"w":86,"h":86}, + "frame": {"x":1745,"y":966,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -290,7 +290,7 @@ }, "sprites/belt/left_8.png": { - "frame": {"x":1264,"y":1030,"w":86,"h":86}, + "frame": {"x":1475,"y":1024,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -298,7 +298,7 @@ }, "sprites/belt/left_9.png": { - "frame": {"x":1354,"y":1030,"w":86,"h":86}, + "frame": {"x":1565,"y":1024,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -306,7 +306,7 @@ }, "sprites/belt/left_10.png": { - "frame": {"x":1936,"y":201,"w":86,"h":86}, + "frame": {"x":1436,"y":475,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -314,7 +314,7 @@ }, "sprites/belt/left_11.png": { - "frame": {"x":1936,"y":291,"w":86,"h":86}, + "frame": {"x":1401,"y":565,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -322,7 +322,7 @@ }, "sprites/belt/left_12.png": { - "frame": {"x":1949,"y":480,"w":86,"h":86}, + "frame": {"x":1437,"y":754,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -330,7 +330,7 @@ }, "sprites/belt/left_13.png": { - "frame": {"x":1718,"y":543,"w":86,"h":86}, + "frame": {"x":1491,"y":565,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -338,7 +338,7 @@ }, "sprites/belt/left_14.png": { - "frame": {"x":1808,"y":543,"w":86,"h":86}, + "frame": {"x":1527,"y":754,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -346,7 +346,7 @@ }, "sprites/belt/left_15.png": { - "frame": {"x":1673,"y":633,"w":86,"h":86}, + "frame": {"x":1526,"y":426,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -354,7 +354,7 @@ }, "sprites/belt/left_16.png": { - "frame": {"x":1763,"y":633,"w":86,"h":86}, + "frame": {"x":1616,"y":426,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -362,7 +362,7 @@ }, "sprites/belt/left_17.png": { - "frame": {"x":1853,"y":633,"w":86,"h":86}, + "frame": {"x":1706,"y":414,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -370,7 +370,7 @@ }, "sprites/belt/left_18.png": { - "frame": {"x":1536,"y":941,"w":86,"h":86}, + "frame": {"x":1581,"y":516,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -378,7 +378,7 @@ }, "sprites/belt/left_19.png": { - "frame": {"x":1626,"y":941,"w":86,"h":86}, + "frame": {"x":1671,"y":516,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -386,7 +386,7 @@ }, "sprites/belt/left_20.png": { - "frame": {"x":1758,"y":723,"w":86,"h":86}, + "frame": {"x":1693,"y":606,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -394,7 +394,7 @@ }, "sprites/belt/left_21.png": { - "frame": {"x":1848,"y":723,"w":86,"h":86}, + "frame": {"x":1466,"y":844,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -402,7 +402,7 @@ }, "sprites/belt/left_22.png": { - "frame": {"x":1698,"y":813,"w":86,"h":86}, + "frame": {"x":1556,"y":844,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -410,7 +410,7 @@ }, "sprites/belt/left_23.png": { - "frame": {"x":1788,"y":813,"w":86,"h":86}, + "frame": {"x":1475,"y":934,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -418,7 +418,7 @@ }, "sprites/belt/left_24.png": { - "frame": {"x":1878,"y":813,"w":86,"h":86}, + "frame": {"x":1565,"y":934,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -426,7 +426,7 @@ }, "sprites/belt/left_25.png": { - "frame": {"x":1716,"y":903,"w":86,"h":86}, + "frame": {"x":1617,"y":696,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -434,7 +434,7 @@ }, "sprites/belt/left_26.png": { - "frame": {"x":1806,"y":903,"w":86,"h":86}, + "frame": {"x":1707,"y":696,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -442,7 +442,7 @@ }, "sprites/belt/left_27.png": { - "frame": {"x":1896,"y":903,"w":86,"h":86}, + "frame": {"x":1646,"y":786,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -450,7 +450,7 @@ }, "sprites/belt/right_0.png": { - "frame": {"x":1444,"y":1019,"w":86,"h":86}, + "frame": {"x":1655,"y":1056,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -458,7 +458,7 @@ }, "sprites/belt/right_1.png": { - "frame": {"x":1534,"y":1031,"w":86,"h":86}, + "frame": {"x":1745,"y":1056,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -466,7 +466,7 @@ }, "sprites/belt/right_2.png": { - "frame": {"x":1146,"y":1411,"w":86,"h":86}, + "frame": {"x":1195,"y":1245,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -474,7 +474,7 @@ }, "sprites/belt/right_3.png": { - "frame": {"x":1804,"y":1263,"w":86,"h":86}, + "frame": {"x":1465,"y":1384,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -482,7 +482,7 @@ }, "sprites/belt/right_4.png": { - "frame": {"x":1894,"y":1263,"w":86,"h":86}, + "frame": {"x":1555,"y":1384,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -490,7 +490,7 @@ }, "sprites/belt/right_5.png": { - "frame": {"x":1264,"y":1210,"w":86,"h":86}, + "frame": {"x":1645,"y":1416,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -498,7 +498,7 @@ }, "sprites/belt/right_6.png": { - "frame": {"x":1354,"y":1210,"w":86,"h":86}, + "frame": {"x":1735,"y":1416,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -506,7 +506,7 @@ }, "sprites/belt/right_7.png": { - "frame": {"x":1444,"y":1289,"w":86,"h":86}, + "frame": {"x":1461,"y":1474,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -514,7 +514,7 @@ }, "sprites/belt/right_8.png": { - "frame": {"x":1534,"y":1301,"w":86,"h":86}, + "frame": {"x":1551,"y":1474,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -522,7 +522,7 @@ }, "sprites/belt/right_9.png": { - "frame": {"x":1624,"y":1301,"w":86,"h":86}, + "frame": {"x":1641,"y":1506,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -530,7 +530,7 @@ }, "sprites/belt/right_10.png": { - "frame": {"x":1624,"y":1031,"w":86,"h":86}, + "frame": {"x":1475,"y":1114,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -538,7 +538,7 @@ }, "sprites/belt/right_11.png": { - "frame": {"x":1714,"y":1083,"w":86,"h":86}, + "frame": {"x":1565,"y":1114,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -546,7 +546,7 @@ }, "sprites/belt/right_12.png": { - "frame": {"x":1804,"y":1083,"w":86,"h":86}, + "frame": {"x":1655,"y":1146,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -554,7 +554,7 @@ }, "sprites/belt/right_13.png": { - "frame": {"x":1894,"y":1083,"w":86,"h":86}, + "frame": {"x":1745,"y":1146,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -562,7 +562,7 @@ }, "sprites/belt/right_14.png": { - "frame": {"x":1444,"y":1109,"w":86,"h":86}, + "frame": {"x":1475,"y":1204,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -570,7 +570,7 @@ }, "sprites/belt/right_15.png": { - "frame": {"x":1534,"y":1121,"w":86,"h":86}, + "frame": {"x":1565,"y":1204,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -578,7 +578,7 @@ }, "sprites/belt/right_16.png": { - "frame": {"x":1624,"y":1121,"w":86,"h":86}, + "frame": {"x":1655,"y":1236,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -586,7 +586,7 @@ }, "sprites/belt/right_17.png": { - "frame": {"x":1714,"y":1173,"w":86,"h":86}, + "frame": {"x":1745,"y":1236,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -594,7 +594,7 @@ }, "sprites/belt/right_18.png": { - "frame": {"x":1804,"y":1173,"w":86,"h":86}, + "frame": {"x":1213,"y":1065,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -602,7 +602,7 @@ }, "sprites/belt/right_19.png": { - "frame": {"x":1894,"y":1173,"w":86,"h":86}, + "frame": {"x":1195,"y":1155,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -610,7 +610,7 @@ }, "sprites/belt/right_20.png": { - "frame": {"x":1264,"y":1120,"w":86,"h":86}, + "frame": {"x":1137,"y":1595,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -618,7 +618,7 @@ }, "sprites/belt/right_21.png": { - "frame": {"x":1354,"y":1120,"w":86,"h":86}, + "frame": {"x":1285,"y":1254,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -626,7 +626,7 @@ }, "sprites/belt/right_22.png": { - "frame": {"x":1158,"y":1229,"w":86,"h":86}, + "frame": {"x":1375,"y":1243,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -634,7 +634,7 @@ }, "sprites/belt/right_23.png": { - "frame": {"x":1157,"y":1319,"w":86,"h":86}, + "frame": {"x":1465,"y":1294,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -642,7 +642,7 @@ }, "sprites/belt/right_24.png": { - "frame": {"x":1444,"y":1199,"w":86,"h":86}, + "frame": {"x":1555,"y":1294,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -650,7 +650,7 @@ }, "sprites/belt/right_25.png": { - "frame": {"x":1534,"y":1211,"w":86,"h":86}, + "frame": {"x":1375,"y":1333,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -658,7 +658,7 @@ }, "sprites/belt/right_26.png": { - "frame": {"x":1624,"y":1211,"w":86,"h":86}, + "frame": {"x":1645,"y":1326,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -666,7 +666,7 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":1714,"y":1263,"w":86,"h":86}, + "frame": {"x":1735,"y":1326,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -682,7 +682,7 @@ }, "sprites/blueprints/belt_left.png": { - "frame": {"x":874,"y":1424,"w":87,"h":87}, + "frame": {"x":1103,"y":777,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":8,"w":87,"h":87}, @@ -690,7 +690,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":965,"y":1424,"w":87,"h":87}, + "frame": {"x":1260,"y":658,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":87,"h":87}, @@ -698,7 +698,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":3,"y":1416,"w":79,"h":95}, + "frame": {"x":806,"y":1329,"w":79,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":79,"h":95}, @@ -714,7 +714,7 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":1411,"y":150,"w":256,"h":144}, + "frame": {"x":559,"y":1033,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -722,15 +722,15 @@ }, "sprites/blueprints/energy_generator.png": { - "frame": {"x":583,"y":886,"w":255,"h":267}, + "frame": {"x":293,"y":996,"w":262,"h":274}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":18,"y":21,"w":255,"h":267}, + "spriteSourceSize": {"x":14,"y":14,"w":262,"h":274}, "sourceSize": {"w":288,"h":288} }, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1527,"y":298,"w":136,"h":143}, + "frame": {"x":851,"y":1428,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -738,7 +738,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1253,"y":883,"w":136,"h":143}, + "frame": {"x":991,"y":1399,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -746,7 +746,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":555,"y":590,"w":261,"h":144}, + "frame": {"x":3,"y":1540,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -778,7 +778,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":3,"y":1268,"w":288,"h":144}, + "frame": {"x":1411,"y":150,"w":288,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, @@ -786,7 +786,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":1084,"y":593,"w":143,"h":144}, + "frame": {"x":1703,"y":150,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -794,7 +794,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":1106,"y":883,"w":143,"h":144}, + "frame": {"x":967,"y":1181,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -802,7 +802,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":1072,"y":741,"w":142,"h":138}, + "frame": {"x":991,"y":1546,"w":142,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":142,"h":138}, @@ -810,7 +810,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1218,"y":741,"w":139,"h":138}, + "frame": {"x":1241,"y":298,"w":139,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, @@ -818,7 +818,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":812,"y":738,"w":256,"h":144}, + "frame": {"x":823,"y":886,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -826,7 +826,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":547,"y":738,"w":261,"h":144}, + "frame": {"x":847,"y":591,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -842,7 +842,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":1379,"y":298,"w":144,"h":144}, + "frame": {"x":558,"y":1328,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -850,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":732,"y":1205,"w":138,"h":125}, + "frame": {"x":1384,"y":298,"w":138,"h":125}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":19,"w":138,"h":125}, @@ -858,7 +858,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":732,"y":1334,"w":138,"h":112}, + "frame": {"x":849,"y":1575,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -866,7 +866,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":1015,"y":1180,"w":139,"h":112}, + "frame": {"x":706,"y":1575,"w":139,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":139,"h":112}, @@ -874,15 +874,31 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":874,"y":1308,"w":138,"h":112}, + "frame": {"x":1667,"y":298,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":138,"h":112}, "sourceSize": {"w":144,"h":144} }, +"sprites/blueprints/wire_crossings-merger.png": +{ + "frame": {"x":558,"y":1476,"w":144,"h":103}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":144,"h":103}, + "sourceSize": {"w":144,"h":144} +}, +"sprites/blueprints/wire_crossings.png": +{ + "frame": {"x":1253,"y":555,"w":144,"h":99}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":45,"w":144,"h":99}, + "sourceSize": {"w":144,"h":144} +}, "sprites/blueprints/wire_left.png": { - "frame": {"x":718,"y":1450,"w":60,"h":60}, + "frame": {"x":1706,"y":1596,"w":60,"h":60}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":35,"w":60,"h":60}, @@ -890,7 +906,7 @@ }, "sprites/blueprints/wire_right.png": { - "frame": {"x":653,"y":1450,"w":61,"h":61}, + "frame": {"x":1641,"y":1596,"w":61,"h":61}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":34,"y":34,"w":61,"h":61}, @@ -898,7 +914,7 @@ }, "sprites/blueprints/wire_top.png": { - "frame": {"x":547,"y":886,"w":27,"h":95}, + "frame": {"x":1809,"y":298,"w":27,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":34,"y":0,"w":27,"h":95}, @@ -906,7 +922,7 @@ }, "sprites/buildings/advanced_processor.png": { - "frame": {"x":293,"y":996,"w":286,"h":268}, + "frame": {"x":3,"y":1268,"w":286,"h":268}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":9,"w":286,"h":268}, @@ -914,7 +930,7 @@ }, "sprites/buildings/belt_left.png": { - "frame": {"x":1714,"y":1353,"w":86,"h":86}, + "frame": {"x":1731,"y":1506,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -922,7 +938,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1804,"y":1353,"w":86,"h":86}, + "frame": {"x":1389,"y":1564,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -930,7 +946,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":86,"y":1416,"w":77,"h":95}, + "frame": {"x":889,"y":1329,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -946,7 +962,7 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":842,"y":1033,"w":256,"h":143}, + "frame": {"x":819,"y":1034,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -954,7 +970,7 @@ }, "sprites/buildings/energy_generator.png": { - "frame": {"x":1671,"y":151,"w":261,"h":273}, + "frame": {"x":293,"y":1274,"w":261,"h":273}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":15,"y":15,"w":261,"h":273}, @@ -970,7 +986,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1231,"y":593,"w":136,"h":142}, + "frame": {"x":1083,"y":886,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -978,7 +994,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1371,"y":593,"w":136,"h":142}, + "frame": {"x":1101,"y":299,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -986,7 +1002,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":820,"y":591,"w":260,"h":143}, + "frame": {"x":839,"y":739,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -1002,7 +1018,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":1671,"y":3,"w":288,"h":144}, + "frame": {"x":555,"y":590,"w":288,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, @@ -1018,7 +1034,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":295,"y":1268,"w":288,"h":144}, + "frame": {"x":547,"y":738,"w":288,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, @@ -1026,7 +1042,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":587,"y":1227,"w":141,"h":143}, + "frame": {"x":1671,"y":3,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -1034,7 +1050,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":1349,"y":446,"w":141,"h":143}, + "frame": {"x":706,"y":1428,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -1042,7 +1058,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":1361,"y":739,"w":141,"h":136}, + "frame": {"x":268,"y":1551,"w":141,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":141,"h":136}, @@ -1050,7 +1066,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1393,"y":879,"w":139,"h":136}, + "frame": {"x":413,"y":1551,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -1058,7 +1074,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":1119,"y":298,"w":256,"h":143}, + "frame": {"x":559,"y":1181,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -1066,7 +1082,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":842,"y":886,"w":260,"h":143}, + "frame": {"x":559,"y":886,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -1082,7 +1098,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":1101,"y":445,"w":144,"h":144}, + "frame": {"x":819,"y":1181,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -1090,7 +1106,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":874,"y":1180,"w":137,"h":124}, + "frame": {"x":1526,"y":298,"w":137,"h":124}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":20,"w":137,"h":124}, @@ -1098,7 +1114,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1016,"y":1296,"w":137,"h":111}, + "frame": {"x":1101,"y":445,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -1106,7 +1122,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1667,"y":428,"w":137,"h":111}, + "frame": {"x":1242,"y":440,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -1114,15 +1130,31 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1808,"y":428,"w":137,"h":111}, + "frame": {"x":1112,"y":560,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, "sourceSize": {"w":144,"h":144} }, +"sprites/buildings/wire_crossings-merger.png": +{ + "frame": {"x":556,"y":1583,"w":144,"h":102}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":0,"w":144,"h":102}, + "sourceSize": {"w":144,"h":144} +}, +"sprites/buildings/wire_crossings.png": +{ + "frame": {"x":1112,"y":675,"w":144,"h":98}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":0,"y":46,"w":144,"h":98}, + "sourceSize": {"w":144,"h":144} +}, "sprites/buildings/wire_left.png": { - "frame": {"x":782,"y":1450,"w":60,"h":60}, + "frame": {"x":1770,"y":1596,"w":60,"h":60}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":35,"w":60,"h":60}, @@ -1130,7 +1162,7 @@ }, "sprites/buildings/wire_right.png": { - "frame": {"x":1560,"y":1391,"w":60,"h":60}, + "frame": {"x":1215,"y":1335,"w":60,"h":60}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":35,"y":35,"w":60,"h":60}, @@ -1138,7 +1170,7 @@ }, "sprites/buildings/wire_top.png": { - "frame": {"x":1986,"y":896,"w":25,"h":95}, + "frame": {"x":1816,"y":50,"w":25,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":35,"y":0,"w":25,"h":95}, @@ -1146,7 +1178,7 @@ }, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1898,"y":543,"w":38,"h":48}, + "frame": {"x":1173,"y":1335,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -1154,7 +1186,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":1943,"y":660,"w":38,"h":48}, + "frame": {"x":1212,"y":1399,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -1162,7 +1194,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":1936,"y":151,"w":20,"h":24}, + "frame": {"x":1840,"y":298,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -1170,7 +1202,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":1592,"y":717,"w":22,"h":22}, + "frame": {"x":1617,"y":786,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":22,"h":22}, @@ -1178,7 +1210,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":1618,"y":717,"w":22,"h":22}, + "frame": {"x":1079,"y":1133,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":22,"h":22}, @@ -1186,7 +1218,7 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":1652,"y":543,"w":62,"h":62}, + "frame": {"x":1107,"y":1331,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -1194,7 +1226,7 @@ }, "sprites/misc/energy_generator_overlay.png": { - "frame": {"x":720,"y":1157,"w":116,"h":44}, + "frame": {"x":1384,"y":427,"w":116,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":137,"y":217,"w":116,"h":44}, @@ -1202,7 +1234,7 @@ }, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":846,"y":1450,"w":24,"h":24}, + "frame": {"x":1275,"y":848,"w":24,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":24,"h":24}, @@ -1210,7 +1242,7 @@ }, "sprites/misc/lock_direction_indicator.png": { - "frame": {"x":1560,"y":1455,"w":36,"h":24}, + "frame": {"x":1389,"y":1654,"w":36,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":36,"h":24}, @@ -1218,7 +1250,7 @@ }, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":1652,"y":543,"w":62,"h":62}, + "frame": {"x":1107,"y":1331,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -1226,7 +1258,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":653,"y":1374,"w":62,"h":72}, + "frame": {"x":1796,"y":414,"w":62,"h":72}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":62,"h":72}, @@ -1234,7 +1266,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":583,"y":1157,"w":133,"h":66}, + "frame": {"x":970,"y":1329,"w":133,"h":66}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":133,"h":66}, @@ -1242,7 +1274,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1506,"y":842,"w":20,"h":24}, + "frame": {"x":1840,"y":326,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -1250,7 +1282,7 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":1249,"y":445,"w":96,"h":96}, + "frame": {"x":706,"y":1328,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1258,7 +1290,7 @@ }, "sprites/wires/battery_empty.png": { - "frame": {"x":1985,"y":660,"w":29,"h":46}, + "frame": {"x":1279,"y":1344,"w":29,"h":46}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":1,"w":29,"h":46}, @@ -1266,7 +1298,7 @@ }, "sprites/wires/battery_full.png": { - "frame": {"x":587,"y":1374,"w":44,"h":30}, + "frame": {"x":1526,"y":516,"w":44,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":10,"w":44,"h":30}, @@ -1274,7 +1306,7 @@ }, "sprites/wires/battery_low.png": { - "frame": {"x":1102,"y":1132,"w":44,"h":30}, + "frame": {"x":1380,"y":1522,"w":44,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":10,"w":44,"h":30}, @@ -1282,7 +1314,7 @@ }, "sprites/wires/battery_medium.png": { - "frame": {"x":1297,"y":545,"w":44,"h":30}, + "frame": {"x":1312,"y":1344,"w":44,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":10,"w":44,"h":30}, @@ -1290,7 +1322,7 @@ }, "sprites/wires/negative_energy.png": { - "frame": {"x":1898,"y":595,"w":32,"h":32}, + "frame": {"x":1254,"y":1399,"w":32,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":32,"h":32}, @@ -1298,7 +1330,7 @@ }, "sprites/wires/pin_negative_accept.png": { - "frame": {"x":1592,"y":535,"w":56,"h":79}, + "frame": {"x":1783,"y":603,"w":56,"h":79}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":56,"h":79}, @@ -1306,7 +1338,7 @@ }, "sprites/wires/pin_negative_eject.png": { - "frame": {"x":1986,"y":995,"w":49,"h":76}, + "frame": {"x":1383,"y":475,"w":49,"h":76}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":49,"h":76}, @@ -1314,7 +1346,7 @@ }, "sprites/wires/pin_positive_accept.png": { - "frame": {"x":1975,"y":1353,"w":49,"h":76}, + "frame": {"x":1160,"y":1032,"w":49,"h":76}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":49,"h":76}, @@ -1322,7 +1354,7 @@ }, "sprites/wires/pin_positive_eject.png": { - "frame": {"x":1968,"y":813,"w":56,"h":79}, + "frame": {"x":1797,"y":686,"w":56,"h":79}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":20,"y":0,"w":56,"h":79}, @@ -1330,7 +1362,7 @@ }, "sprites/wires/positive_energy.png": { - "frame": {"x":1624,"y":1391,"w":32,"h":32}, + "frame": {"x":1429,"y":1654,"w":32,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":32,"h":32}, @@ -1338,7 +1370,7 @@ }, "sprites/wires/waste_piled.png": { - "frame": {"x":1249,"y":545,"w":44,"h":43}, + "frame": {"x":1816,"y":3,"w":44,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":44,"h":43}, @@ -1349,8 +1381,8 @@ "version": "1.0", "image": "atlas0_75.png", "format": "RGBA8888", - "size": {"w":2043,"h":1514}, + "size": {"w":1863,"h":1690}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:bab21fa6bf38d0f6aed5c1b1e9696597:5a2dfdcaf74898ae980273a5cb6294ea:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:812e8a2b8b0a4c9bbeb20fc68d835efe:85394009739c7a89da6c54b97c627497:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png index c8dee7bc..2541d587 100644 Binary files a/res_built/atlas/atlas0_75.png and b/res_built/atlas/atlas0_75.png differ diff --git a/res_raw/sprites/blueprints/energy_generator.png b/res_raw/sprites/blueprints/energy_generator.png index dfab1b31..42258c63 100644 Binary files a/res_raw/sprites/blueprints/energy_generator.png and b/res_raw/sprites/blueprints/energy_generator.png differ diff --git a/res_raw/sprites/blueprints/wire_crossings-merger.png b/res_raw/sprites/blueprints/wire_crossings-merger.png new file mode 100644 index 00000000..888a7889 Binary files /dev/null and b/res_raw/sprites/blueprints/wire_crossings-merger.png differ diff --git a/res_raw/sprites/blueprints/wire_crossings.png b/res_raw/sprites/blueprints/wire_crossings.png new file mode 100644 index 00000000..6b1ddfc9 Binary files /dev/null and b/res_raw/sprites/blueprints/wire_crossings.png differ diff --git a/res_raw/sprites/blueprints/wire_left.png b/res_raw/sprites/blueprints/wire_left.png index f35b06bf..74c89859 100644 Binary files a/res_raw/sprites/blueprints/wire_left.png and b/res_raw/sprites/blueprints/wire_left.png differ diff --git a/res_raw/sprites/blueprints/wire_right.png b/res_raw/sprites/blueprints/wire_right.png index 0c43dc49..581e207d 100644 Binary files a/res_raw/sprites/blueprints/wire_right.png and b/res_raw/sprites/blueprints/wire_right.png differ diff --git a/res_raw/sprites/blueprints/wire_top.png b/res_raw/sprites/blueprints/wire_top.png index bd08cc1c..5b7724b6 100644 Binary files a/res_raw/sprites/blueprints/wire_top.png and b/res_raw/sprites/blueprints/wire_top.png differ diff --git a/res_raw/sprites/buildings/wire_crossings-merger.png b/res_raw/sprites/buildings/wire_crossings-merger.png new file mode 100644 index 00000000..42cef3f8 Binary files /dev/null and b/res_raw/sprites/buildings/wire_crossings-merger.png differ diff --git a/res_raw/sprites/buildings/wire_crossings.png b/res_raw/sprites/buildings/wire_crossings.png new file mode 100644 index 00000000..ca324196 Binary files /dev/null and b/res_raw/sprites/buildings/wire_crossings.png differ diff --git a/res_raw/sprites/buildings/wire_left.png b/res_raw/sprites/buildings/wire_left.png index c205e307..151c6562 100644 Binary files a/res_raw/sprites/buildings/wire_left.png and b/res_raw/sprites/buildings/wire_left.png differ diff --git a/res_raw/sprites/buildings/wire_right.png b/res_raw/sprites/buildings/wire_right.png index d1fa852b..1e9521b2 100644 Binary files a/res_raw/sprites/buildings/wire_right.png and b/res_raw/sprites/buildings/wire_right.png differ diff --git a/res_raw/sprites/buildings/wire_top.png b/res_raw/sprites/buildings/wire_top.png index abffeae8..ab592791 100644 Binary files a/res_raw/sprites/buildings/wire_top.png and b/res_raw/sprites/buildings/wire_top.png differ diff --git a/res_raw/sprites/wires/negative_energy.png b/res_raw/sprites/wires/negative_energy.png index 73933791..cc372330 100644 Binary files a/res_raw/sprites/wires/negative_energy.png and b/res_raw/sprites/wires/negative_energy.png differ diff --git a/res_raw/sprites/wires/pin_negative_accept.png b/res_raw/sprites/wires/pin_negative_accept.png index da607977..82581abb 100644 Binary files a/res_raw/sprites/wires/pin_negative_accept.png and b/res_raw/sprites/wires/pin_negative_accept.png differ diff --git a/res_raw/sprites/wires/pin_negative_eject.png b/res_raw/sprites/wires/pin_negative_eject.png index 60f1c11a..e816bd83 100644 Binary files a/res_raw/sprites/wires/pin_negative_eject.png and b/res_raw/sprites/wires/pin_negative_eject.png differ diff --git a/res_raw/sprites/wires/pin_positive_accept.png b/res_raw/sprites/wires/pin_positive_accept.png index bc4bc0b4..57044532 100644 Binary files a/res_raw/sprites/wires/pin_positive_accept.png and b/res_raw/sprites/wires/pin_positive_accept.png differ diff --git a/res_raw/sprites/wires/pin_positive_eject.png b/res_raw/sprites/wires/pin_positive_eject.png index 47034f2f..a7da6bc0 100644 Binary files a/res_raw/sprites/wires/pin_positive_eject.png and b/res_raw/sprites/wires/pin_positive_eject.png differ diff --git a/res_raw/sprites/wires/positive_energy.png b/res_raw/sprites/wires/positive_energy.png index 7428500e..c95c80c9 100644 Binary files a/res_raw/sprites/wires/positive_energy.png and b/res_raw/sprites/wires/positive_energy.png differ diff --git a/src/css/icons.scss b/src/css/icons.scss index caeecf88..a0967656 100644 --- a/src/css/icons.scss +++ b/src/css/icons.scss @@ -1,5 +1,5 @@ $buildings: belt, cutter, miner, mixer, painter, rotater, splitter, stacker, trash, underground_belt, - energy_generator, wire, advanced_processor; + energy_generator, wire, advanced_processor, wire_crossings; @each $building in $buildings { [data-icon="building_icons/#{$building}.png"] { diff --git a/src/js/core/config.js b/src/js/core/config.js index 6a9fb32d..e7f4afe0 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -45,7 +45,7 @@ export const globalConfig = { // Map mapChunkSize: 16, - mapChunkPrerenderMinZoom: 0.7, + mapChunkPrerenderMinZoom: -1, mapChunkOverviewMinZoom: 0.7, // Belt speeds @@ -55,7 +55,7 @@ export const globalConfig = { beltItemSpacingByLayer: { regular: 0.63, - wires: 0.33, + wires: 0.4, }, wiresSpeedItemsPerSecond: 6, diff --git a/src/js/game/base_item.js b/src/js/game/base_item.js index 6aae067e..d0da5fa1 100644 --- a/src/js/game/base_item.js +++ b/src/js/game/base_item.js @@ -8,6 +8,9 @@ export const enumItemType = { color: "color", positiveEnergy: "positiveEnergy", negativeEnergy: "negativeEnergy", + + // Can be used for filters + genericEnergy: "genericEnergy", }; /** @enum {enumLayer} */ @@ -16,6 +19,7 @@ export const enumItemTypeToLayer = { [enumItemType.color]: enumLayer.regular, [enumItemType.positiveEnergy]: enumLayer.wires, [enumItemType.negativeEnergy]: enumLayer.wires, + [enumItemType.genericEnergy]: enumLayer.wires, }; /** diff --git a/src/js/game/buildings/splitter.js b/src/js/game/buildings/splitter.js index 9b4b3be5..12f0e6e7 100644 --- a/src/js/game/buildings/splitter.js +++ b/src/js/game/buildings/splitter.js @@ -72,16 +72,7 @@ export class MetaSplitterBuilding extends MetaBuilding { setupEntityComponents(entity) { entity.addComponent( new ItemAcceptorComponent({ - slots: [ - { - pos: new Vector(0, 0), - directions: [enumDirection.bottom], - }, - { - pos: new Vector(1, 0), - directions: [enumDirection.bottom], - }, - ], + slots: [], // set later }) ); @@ -94,10 +85,7 @@ export class MetaSplitterBuilding extends MetaBuilding { entity.addComponent( new ItemEjectorComponent({ - slots: [ - { pos: new Vector(0, 0), direction: enumDirection.top }, - { pos: new Vector(1, 0), direction: enumDirection.top }, - ], + slots: [], // set later }) ); } diff --git a/src/js/game/buildings/wire_crossings.js b/src/js/game/buildings/wire_crossings.js new file mode 100644 index 00000000..c7e4a989 --- /dev/null +++ b/src/js/game/buildings/wire_crossings.js @@ -0,0 +1,119 @@ +import { enumDirection, Vector } from "../../core/vector"; +import { enumItemType } from "../base_item"; +import { ItemAcceptorComponent } from "../components/item_acceptor"; +import { ItemEjectorComponent } from "../components/item_ejector"; +import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; +import { Entity } from "../entity"; +import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; +import { enumLayer, GameRoot } from "../root"; + +/** @enum {string} */ +export const enumWireCrossingVariants = { + // Default = splitter + merger: "merger", +}; + +export class MetaWireCrossingsBuilding extends MetaBuilding { + constructor() { + super("wire_crossings"); + } + + getDimensions(variant) { + return new Vector(1, 1); + } + + getSilhouetteColor() { + return "#c425d7"; + } + + getLayer() { + return enumLayer.wires; + } + + /** + * @param {GameRoot} root + */ + getAvailableVariants(root) { + return [defaultBuildingVariant, enumWireCrossingVariants.merger]; + } + + /** + * @param {GameRoot} root + */ + getIsUnlocked(root) { + return true; + } + + /** + * Creates the entity at the given location + * @param {Entity} entity + */ + setupEntityComponents(entity) { + entity.addComponent( + new ItemAcceptorComponent({ + slots: [], // set later + }) + ); + + entity.addComponent( + new ItemProcessorComponent({ + inputsPerCharge: 1, + processorType: enumItemProcessorTypes.splitterWires, + }) + ); + + entity.addComponent( + new ItemEjectorComponent({ + slots: [], // set later + }) + ); + } + + /** + * + * @param {Entity} entity + * @param {number} rotationVariant + * @param {string} variant + */ + updateVariants(entity, rotationVariant, variant) { + switch (variant) { + case defaultBuildingVariant: { + entity.components.ItemAcceptor.setSlots([ + { + pos: new Vector(0, 0), + directions: [enumDirection.bottom], + layer: enumLayer.wires, + }, + ]); + + entity.components.ItemEjector.setSlots([ + { pos: new Vector(0, 0), direction: enumDirection.left, layer: enumLayer.wires }, + { pos: new Vector(0, 0), direction: enumDirection.right, layer: enumLayer.wires }, + ]); + + break; + } + case enumWireCrossingVariants.merger: { + entity.components.ItemAcceptor.setSlots([ + { + pos: new Vector(0, 0), + directions: [enumDirection.left], + layer: enumLayer.wires, + }, + { + pos: new Vector(0, 0), + directions: [enumDirection.right], + layer: enumLayer.wires, + }, + ]); + + entity.components.ItemEjector.setSlots([ + { pos: new Vector(0, 0), direction: enumDirection.top, layer: enumLayer.wires }, + ]); + break; + } + default: + assertAlways(false, "Unknown painter variant: " + variant); + } + } +} diff --git a/src/js/game/colors.js b/src/js/game/colors.js index ad631d10..62339db2 100644 --- a/src/js/game/colors.js +++ b/src/js/game/colors.js @@ -54,7 +54,7 @@ export const enumColorsToHexCode = { // blue + green + red [enumColors.white]: "#ffffff", - [enumColors.black]: "#212428", + [enumColors.black]: "#31383a", [enumColors.uncolored]: "#aaaaaa", }; diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index 0b7f6a1b..a5676119 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -136,7 +136,25 @@ export class ItemAcceptorComponent extends Component { */ canAcceptItem(slotIndex, item) { const slot = this.slots[slotIndex]; - return !slot.filter || slot.filter === item.getItemType(); + return this.filterMatches(slot.filter, item); + } + + /** + * Returns if the given filter matches + * @param {enumItemType|null} filter + * @param {BaseItem} item + */ + filterMatches(filter, item) { + if (!filter) { + return true; + } + + const itemType = item.getItemType(); + if (filter === enumItemType.genericEnergy) { + return itemType === enumItemType.positiveEnergy || itemType === enumItemType.negativeEnergy; + } + + return itemType === filter; } /** diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 478450a7..72422faf 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -6,6 +6,7 @@ import { Component } from "../component"; /** @enum {string} */ export const enumItemProcessorTypes = { splitter: "splitter", + splitterWires: "splitterWires", cutter: "cutter", cutterQuad: "cutterQuad", rotater: "rotater", diff --git a/src/js/game/core.js b/src/js/game/core.js index b3f09c59..960a83e3 100644 --- a/src/js/game/core.js +++ b/src/js/game/core.js @@ -393,39 +393,54 @@ export class GameCore { // Main rendering order // ----- + // BG / Map Resources / Belt Backgrounds root.map.drawBackground(params); if (!this.root.camera.getIsMapOverlayActive()) { + // Underlays for splitters / balancers systems.itemAcceptor.drawUnderlays(params, enumLayer.regular); - systems.belt.drawLayer(params, enumLayer.regular); + + // Belt items + systems.belt.drawLayerBeltItems(params, enumLayer.regular); + + // Items being ejected / accepted currently (animations) systems.itemEjector.drawLayer(params, enumLayer.regular); systems.itemAcceptor.drawLayer(params, enumLayer.regular); } + // Miner & Static map entities root.map.drawForeground(params); if (!this.root.camera.getIsMapOverlayActive()) { + // HUB Overlay systems.hub.draw(params); + + // Energy generator overlay systems.energyGenerator.draw(params); + + // Storage items systems.storage.draw(params); + + // Energy consumer (Battery icons) systems.energyConsumer.draw(params); } + // Green wires overlay (not within the if because it can fade) root.hud.parts.wiresOverlay.draw(params); - if (this.root.currentLayer === enumLayer.wires) { - if (!this.root.camera.getIsMapOverlayActive()) { - systems.itemAcceptor.drawUnderlays(params, enumLayer.wires); - } - + if (this.root.currentLayer === enumLayer.wires && !this.root.camera.getIsMapOverlayActive()) { + // Belt sprites & Static map entities root.map.drawWiresLayer(params); - if (!this.root.camera.getIsMapOverlayActive()) { - systems.itemEjector.drawLayer(params, enumLayer.wires); - systems.itemAcceptor.drawLayer(params, enumLayer.wires); - systems.belt.drawLayer(params, enumLayer.wires); - systems.wiredPins.draw(params); - } + // Belt items as well as accepted / ejected items + systems.belt.drawLayerBeltItems(params, enumLayer.wires); + systems.itemEjector.drawLayer(params, enumLayer.wires); + systems.itemAcceptor.drawLayer(params, enumLayer.wires); + + root.map.drawWiresForegroundLayer(params); + + // pins + systems.wiredPins.draw(params); } if (G_IS_DEV) { diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 59479765..612bc124 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -403,6 +403,9 @@ export class HubGoals extends BasicSerializableObject { */ getProcessorBaseSpeed(processorType) { switch (processorType) { + case enumItemProcessorTypes.splitterWires: + return globalConfig.wiresSpeedItemsPerSecond * 2; + case enumItemProcessorTypes.trash: case enumItemProcessorTypes.hub: return 1e30; diff --git a/src/js/game/hud/parts/building_placer.js b/src/js/game/hud/parts/building_placer.js index 9dae6ba0..4fa80d70 100644 --- a/src/js/game/hud/parts/building_placer.js +++ b/src/js/game/hud/parts/building_placer.js @@ -328,8 +328,8 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { const mouseWorld = this.root.camera.screenToWorld(mousePosition); const mouseTile = mouseWorld.toTileSpace(); - parameters.context.fillStyle = THEME.map.directionLock; - parameters.context.strokeStyle = THEME.map.directionLockTrack; + parameters.context.fillStyle = THEME.map.directionLock[this.root.currentLayer].color; + parameters.context.strokeStyle = THEME.map.directionLock[this.root.currentLayer].background; parameters.context.lineWidth = 10; parameters.context.beginCircle(mouseWorld.x, mouseWorld.y, 4); diff --git a/src/js/game/hud/parts/wires_toolbar.js b/src/js/game/hud/parts/wires_toolbar.js index f8344755..6ebc0a98 100644 --- a/src/js/game/hud/parts/wires_toolbar.js +++ b/src/js/game/hud/parts/wires_toolbar.js @@ -1,8 +1,9 @@ import { MetaWireBaseBuilding } from "../../buildings/wire_base"; import { enumLayer } from "../../root"; import { HUDBaseToolbar } from "./base_toolbar"; +import { MetaWireCrossingsBuilding } from "../../buildings/wire_crossings"; -const supportedBuildings = [MetaWireBaseBuilding]; +const supportedBuildings = [MetaWireBaseBuilding, MetaWireCrossingsBuilding]; export class HUDWiresToolbar extends HUDBaseToolbar { constructor(root) { diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js index fe065144..3fd2a462 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -56,6 +56,7 @@ export const KEYMAPPINGS = { trash: { keyCode: key("0") }, energy_generator: { keyCode: key("O") }, advanced_processor: { keyCode: key("P") }, + wire_crossings: { keyCode: key("H") }, // Wires layer wire: { keyCode: key("1") }, diff --git a/src/js/game/map.js b/src/js/game/map.js index bf3dd009..3f8a16f8 100644 --- a/src/js/game/map.js +++ b/src/js/game/map.js @@ -139,7 +139,10 @@ export class BaseMap extends BasicSerializableObject { */ getLayersContentsMultipleXY(x, y) { const chunk = this.getChunkAtTileOrNull(x, y); - return chunk && chunk.getLayersContentsMultipleFromWorldCoords(x, y); + if (!chunk) { + return []; + } + return chunk.getLayersContentsMultipleFromWorldCoords(x, y); } /** diff --git a/src/js/game/map_chunk_view.js b/src/js/game/map_chunk_view.js index 1cf1dcde..c3f09b39 100644 --- a/src/js/game/map_chunk_view.js +++ b/src/js/game/map_chunk_view.js @@ -21,10 +21,6 @@ export class MapChunkView extends MapChunk { constructor(root, x, y) { super(root, x, y); - this.boundInternalDrawBackgroundToContext = this.internalDrawBackgroundToContext.bind(this); - this.boundInternalDrawForegroundToContext = this.internalDrawForegroundToContext.bind(this); - this.boundInternalDrawWiresToContext = this.internalDrawWiresToContext.bind(this); - /** * Whenever something changes, we increase this number - so we know we need to redraw */ @@ -46,29 +42,9 @@ export class MapChunkView extends MapChunk { * @param {DrawParameters} parameters */ drawBackgroundLayer(parameters) { - if (parameters.zoomLevel > globalConfig.mapChunkPrerenderMinZoom) { - this.internalDrawBackgroundSystems(parameters); - return; - } - - const dpi = smoothenDpi(parameters.zoomLevel); - const buffer = this.root.buffers.getForKey( - "" + dpi, - this.renderKey + "@bg", - chunkSizePixels, - chunkSizePixels, - dpi, - this.boundInternalDrawBackgroundToContext, - { zoomLevel: parameters.zoomLevel } - ); - - parameters.context.drawImage( - buffer, - this.tileX * globalConfig.tileSize, - this.tileY * globalConfig.tileSize, - chunkSizePixels, - chunkSizePixels - ); + const systems = this.root.systemMgr.systems; + systems.mapResources.drawChunk(parameters, this); + systems.belt.drawChunk(parameters, this); } /** @@ -76,28 +52,9 @@ export class MapChunkView extends MapChunk { * @param {DrawParameters} parameters */ drawForegroundLayer(parameters) { - if (parameters.zoomLevel > globalConfig.mapChunkPrerenderMinZoom) { - this.internalDrawForegroundSystems(parameters); - return; - } - - const dpi = smoothenDpi(parameters.zoomLevel); - const buffer = this.root.buffers.getForKey( - "" + dpi, - this.renderKey + "@fg", - chunkSizePixels, - chunkSizePixels, - dpi, - this.boundInternalDrawForegroundToContext, - { zoomLevel: parameters.zoomLevel } - ); - parameters.context.drawImage( - buffer, - this.tileX * globalConfig.tileSize, - this.tileY * globalConfig.tileSize, - chunkSizePixels, - chunkSizePixels - ); + const systems = this.root.systemMgr.systems; + systems.miner.drawChunk(parameters, this); + systems.staticMapEntities.drawChunk(parameters, this); } /** @@ -105,166 +62,16 @@ export class MapChunkView extends MapChunk { * @param {DrawParameters} parameters */ drawWiresLayer(parameters) { - if (parameters.zoomLevel > globalConfig.mapChunkPrerenderMinZoom) { - this.internalDrawWireSystems(parameters); - return; - } - - const dpi = smoothenDpi(parameters.zoomLevel); - const buffer = this.root.buffers.getForKey( - "" + dpi, - this.renderKey + "@wire", - chunkSizePixels, - chunkSizePixels, - dpi, - this.boundInternalDrawWiresToContext, - { zoomLevel: parameters.zoomLevel } - ); - parameters.context.drawImage( - buffer, - this.tileX * globalConfig.tileSize, - this.tileY * globalConfig.tileSize, - chunkSizePixels, - chunkSizePixels - ); - } - - /** - * - * @param {HTMLCanvasElement} canvas - * @param {CanvasRenderingContext2D} context - * @param {number} w - * @param {number} h - * @param {number} dpi - */ - internalDrawBackgroundToContext(canvas, context, w, h, dpi, { zoomLevel }) { - const pattern = context.createPattern(this.root.map.cachedBackgroundCanvas, "repeat"); - context.scale(dpi, dpi); - - if (zoomLevel >= globalConfig.mapChunkOverviewMinZoom) { - const bgDpi = this.root.map.backgroundCacheDPI; - context.scale(1 / bgDpi, 1 / bgDpi); - context.fillStyle = pattern; - context.fillRect(0, 0, chunkSizePixels * bgDpi, chunkSizePixels * bgDpi); - context.scale(bgDpi, bgDpi); - } else { - if (this.containedEntities.length > 0) { - context.fillStyle = THEME.map.chunkOverview.filled; - } else { - context.fillStyle = THEME.map.chunkOverview.empty; - } - context.fillRect(0, 0, 10000, 10000); - } - - if (G_IS_DEV && globalConfig.debug.showChunkBorders) { - context.fillStyle = "rgba(0, 0, 255, 0.1)"; - context.fillRect(0, 0, 10000, 10000); - } - - const parameters = new DrawParameters({ - context, - visibleRect: new Rectangle( - this.tileX * globalConfig.tileSize, - this.tileY * globalConfig.tileSize, - chunkSizePixels, - chunkSizePixels - ), - desiredAtlasScale: "1", - zoomLevel, - root: this.root, - }); - - parameters.context.translate( - -this.tileX * globalConfig.tileSize, - -this.tileY * globalConfig.tileSize - ); - this.internalDrawBackgroundSystems(parameters); - } - - /** - * - * @param {HTMLCanvasElement} canvas - * @param {CanvasRenderingContext2D} context - * @param {number} w - * @param {number} h - * @param {number} dpi - */ - internalDrawForegroundToContext(canvas, context, w, h, dpi, { zoomLevel }) { - context.scale(dpi, dpi); - - const parameters = new DrawParameters({ - context, - visibleRect: new Rectangle( - this.tileX * globalConfig.tileSize, - this.tileY * globalConfig.tileSize, - chunkSizePixels, - chunkSizePixels - ), - desiredAtlasScale: "1", - zoomLevel, - root: this.root, - }); - parameters.context.translate( - -this.tileX * globalConfig.tileSize, - -this.tileY * globalConfig.tileSize - ); - this.internalDrawForegroundSystems(parameters); - } - - /** - * - * @param {HTMLCanvasElement} canvas - * @param {CanvasRenderingContext2D} context - * @param {number} w - * @param {number} h - * @param {number} dpi - */ - internalDrawWiresToContext(canvas, context, w, h, dpi, { zoomLevel }) { - context.scale(dpi, dpi); - const parameters = new DrawParameters({ - context, - visibleRect: new Rectangle( - this.tileX * globalConfig.tileSize, - this.tileY * globalConfig.tileSize, - chunkSizePixels, - chunkSizePixels - ), - desiredAtlasScale: "1", - zoomLevel, - root: this.root, - }); - parameters.context.translate( - -this.tileX * globalConfig.tileSize, - -this.tileY * globalConfig.tileSize - ); - this.internalDrawWireSystems(parameters); - } - - /** - * @param {DrawParameters} parameters - */ - internalDrawBackgroundSystems(parameters) { const systems = this.root.systemMgr.systems; - systems.mapResources.drawChunk(parameters, this); - systems.belt.drawChunk(parameters, this); - } - - /** - * @param {DrawParameters} parameters - */ - internalDrawWireSystems(parameters) { - const systems = this.root.systemMgr.systems; - systems.belt.drawWiresChunk(parameters, this); - systems.staticMapEntities.drawWiresChunk(parameters, this); } /** + * Draws the wires layer * @param {DrawParameters} parameters */ - internalDrawForegroundSystems(parameters) { + drawWiresForegroundLayer(parameters) { const systems = this.root.systemMgr.systems; - systems.miner.drawChunk(parameters, this); - systems.staticMapEntities.drawChunk(parameters, this); + systems.staticMapEntities.drawWiresChunk(parameters, this); } } diff --git a/src/js/game/map_view.js b/src/js/game/map_view.js index ed6c236c..bd10755c 100644 --- a/src/js/game/map_view.js +++ b/src/js/game/map_view.js @@ -4,6 +4,7 @@ import { BaseMap } from "./map"; import { freeCanvas, makeOffscreenBuffer } from "../core/buffer_utils"; import { Entity } from "./entity"; import { THEME } from "./theme"; +import { MapChunkView } from "./map_chunk_view"; /** * This is the view of the map, it extends the map which is the raw model and allows @@ -130,6 +131,15 @@ export class MapView extends BaseMap { * @param {DrawParameters} parameters */ drawForeground(parameters) { + this.drawVisibleChunks(parameters, MapChunkView.prototype.drawForegroundLayer); + } + + /** + * Calls a given method on all given chunks + * @param {DrawParameters} parameters + * @param {function} method + */ + drawVisibleChunks(parameters, method) { const cullRange = parameters.visibleRect.toTileCullRectangle(); const top = cullRange.top(); const right = cullRange.right(); @@ -152,41 +162,25 @@ export class MapView extends BaseMap { for (let chunkX = chunkStartX; chunkX <= chunkEndX; ++chunkX) { for (let chunkY = chunkStartY; chunkY <= chunkEndY; ++chunkY) { const chunk = this.root.map.getChunk(chunkX, chunkY, true); - chunk.drawForegroundLayer(parameters); + method.call(chunk, parameters); } } } /** - * Draws the maps foreground + * Draws the wires background * @param {DrawParameters} parameters */ drawWiresLayer(parameters) { - const cullRange = parameters.visibleRect.toTileCullRectangle(); - const top = cullRange.top(); - const right = cullRange.right(); - const bottom = cullRange.bottom(); - const left = cullRange.left(); - - const border = 1; - const minY = top - border; - const maxY = bottom + border; - const minX = left - border; - const maxX = right + border - 1; - - const chunkStartX = Math.floor(minX / globalConfig.mapChunkSize); - const chunkStartY = Math.floor(minY / globalConfig.mapChunkSize); - - const chunkEndX = Math.ceil(maxX / globalConfig.mapChunkSize); - const chunkEndY = Math.ceil(maxY / globalConfig.mapChunkSize); + this.drawVisibleChunks(parameters, MapChunkView.prototype.drawWiresLayer); + } - // Render y from top down for proper blending - for (let chunkX = chunkStartX; chunkX <= chunkEndX; ++chunkX) { - for (let chunkY = chunkStartY; chunkY <= chunkEndY; ++chunkY) { - const chunk = this.root.map.getChunk(chunkX, chunkY, true); - chunk.drawWiresLayer(parameters); - } - } + /** + * Draws the wires foreground + * @param {DrawParameters} parameters + */ + drawWiresForegroundLayer(parameters) { + this.drawVisibleChunks(parameters, MapChunkView.prototype.drawWiresForegroundLayer); } /** @@ -216,31 +210,7 @@ export class MapView extends BaseMap { parameters.context.scale(dpi, dpi); } - const cullRange = parameters.visibleRect.toTileCullRectangle(); - const top = cullRange.top(); - const right = cullRange.right(); - const bottom = cullRange.bottom(); - const left = cullRange.left(); - - const border = 1; - const minY = top - border; - const maxY = bottom + border; - const minX = left - border; - const maxX = right + border - 1; - - const chunkStartX = Math.floor(minX / globalConfig.mapChunkSize); - const chunkStartY = Math.floor(minY / globalConfig.mapChunkSize); - - const chunkEndX = Math.ceil(maxX / globalConfig.mapChunkSize); - const chunkEndY = Math.ceil(maxY / globalConfig.mapChunkSize); - - // Render y from top down for proper blending - for (let chunkX = chunkStartX; chunkX <= chunkEndX; ++chunkX) { - for (let chunkY = chunkStartY; chunkY <= chunkEndY; ++chunkY) { - const chunk = this.root.map.getChunk(chunkX, chunkY, true); - chunk.drawBackgroundLayer(parameters); - } - } + this.drawVisibleChunks(parameters, MapChunkView.prototype.drawBackgroundLayer); if (G_IS_DEV && globalConfig.debug.showChunkBorders) { const cullRange = parameters.visibleRect.toTileCullRectangle(); diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js index 2e99ce43..4e1fdd81 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -14,6 +14,7 @@ import { MetaEnergyGenerator } from "./buildings/energy_generator"; import { MetaWireBaseBuilding } from "./buildings/wire_base"; import { MetaAdvancedProcessorBuilding } from "./buildings/advanced_processor"; import { MetaBeltBuilding } from "./buildings/belt"; +import { MetaWireCrossingsBuilding } from "./buildings/wire_crossings"; export function initMetaBuildingRegistry() { gMetaBuildingRegistry.register(MetaSplitterBuilding); @@ -30,4 +31,5 @@ export function initMetaBuildingRegistry() { gMetaBuildingRegistry.register(MetaEnergyGenerator); gMetaBuildingRegistry.register(MetaWireBaseBuilding); gMetaBuildingRegistry.register(MetaAdvancedProcessorBuilding); + gMetaBuildingRegistry.register(MetaWireCrossingsBuilding); } diff --git a/src/js/game/systems/belt.js b/src/js/game/systems/belt.js index 19693c8b..db538a56 100644 --- a/src/js/game/systems/belt.js +++ b/src/js/game/systems/belt.js @@ -312,7 +312,7 @@ export class BeltSystem extends GameSystemWithFilter { * @param {DrawParameters} parameters * @param {enumLayer} layer */ - drawLayer(parameters, layer) { + drawLayerBeltItems(parameters, layer) { for (let i = 0; i < this.beltPaths.length; ++i) { const path = this.beltPaths[i]; if (path.layer === layer) { diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 5acce597..aa84b6af 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -50,14 +50,11 @@ export class ItemProcessorSystem extends GameSystemWithFilter { if (ejectorComp.canEjectOnSlot(preferredSlot)) { slot = preferredSlot; } else { - /* FIXME: WIRES */ - slot = ejectorComp.getFirstFreeSlot(enumLayer.regular); + slot = ejectorComp.getFirstFreeSlot(entity.layer); } } else { - /* FIXME: WIRES */ - // We can eject on any slot - slot = ejectorComp.getFirstFreeSlot(enumLayer.regular); + slot = ejectorComp.getFirstFreeSlot(entity.layer); } if (slot !== null) { @@ -120,6 +117,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter { switch (processorComp.type) { // SPLITTER + case enumItemProcessorTypes.splitterWires: case enumItemProcessorTypes.splitter: { trackProduction = false; const availableSlots = entity.components.ItemEjector.slots.length; diff --git a/src/js/game/themes/dark.json b/src/js/game/themes/dark.json index ac981f4c..65417985 100644 --- a/src/js/game/themes/dark.json +++ b/src/js/game/themes/dark.json @@ -9,8 +9,16 @@ "selectionOutline": "rgba(74, 163, 223, 0.5)", "selectionBackground": "rgba(74, 163, 223, 0.2)", - "directionLock": "rgb(74, 237, 134)", - "directionLockTrack": "rgba(74, 237, 134, 0.2)", + "directionLock": { + "regular": { + "color": "rgb(74, 237, 134)", + "background": "rgba(74, 237, 134, 0.2)" + }, + "wires": { + "color": "rgb(144, 24, 255)", + "background": "rgba(144, 24, 255, 0.2)" + } + }, "colorBlindPickerTile": "rgba(255, 255, 255, 0.5)", diff --git a/src/js/game/themes/light.json b/src/js/game/themes/light.json index a245b3d8..b91b53c2 100644 --- a/src/js/game/themes/light.json +++ b/src/js/game/themes/light.json @@ -9,8 +9,16 @@ "selectionOutline": "rgba(74, 163, 223, 0.5)", "selectionBackground": "rgba(74, 163, 223, 0.2)", - "directionLock": "rgb(74, 237, 134)", - "directionLockTrack": "rgba(74, 237, 134, 0.2)", + "directionLock": { + "regular": { + "color": "rgb(74, 237, 134)", + "background": "rgba(74, 237, 134, 0.2)" + }, + "wires": { + "color": "rgb(144, 24, 255)", + "background": "rgba(144, 24, 255, 0.2)" + } + }, "colorBlindPickerTile": "rgba(50, 50, 50, 0.4)", diff --git a/translations/base-en.yaml b/translations/base-en.yaml index fd03ebff..c126f7b9 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -567,6 +567,15 @@ buildings: name: &energy_generator Energy Generator description: Generates energy by consuming shapes. Each energy generator requires a different shape. + wire_crossings: + default: + name: &wire_crossings Wire Splitter + description: Splits a wire into two + + merger: + name: Wire Merger + description: Merges two wires into one + storyRewards: # Those are the rewards gained from completing the store reward_cutter_and_trash: