diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index 044fb143..58079d8b 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":85,"y":167,"w":13,"h":13}, + "frame": {"x":44,"y":376,"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":91,"y":258,"w":13,"h":13}, + "frame": {"x":44,"y":393,"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":107,"y":332,"w":13,"h":13}, + "frame": {"x":78,"y":404,"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":42,"y":434,"w":13,"h":13}, + "frame": {"x":88,"y":238,"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":45,"y":467,"w":13,"h":13}, + "frame": {"x":88,"y":255,"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":45,"y":484,"w":13,"h":13}, + "frame": {"x":88,"y":272,"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":45,"y":501,"w":13,"h":13}, + "frame": {"x":91,"y":289,"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":45,"y":518,"w":13,"h":13}, + "frame": {"x":91,"y":306,"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":59,"y":399,"w":13,"h":13}, + "frame": {"x":91,"y":323,"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":59,"y":416,"w":13,"h":13}, + "frame": {"x":91,"y":340,"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":91,"y":275,"w":13,"h":13}, + "frame": {"x":44,"y":410,"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":91,"y":292,"w":13,"h":13}, + "frame": {"x":44,"y":427,"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":108,"y":264,"w":13,"h":13}, + "frame": {"x":44,"y":444,"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":108,"y":281,"w":13,"h":13}, + "frame": {"x":61,"y":376,"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":108,"y":298,"w":13,"h":13}, + "frame": {"x":61,"y":393,"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":91,"y":309,"w":13,"h":13}, + "frame": {"x":61,"y":410,"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":90,"y":326,"w":13,"h":13}, + "frame": {"x":61,"y":427,"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":90,"y":343,"w":13,"h":13}, + "frame": {"x":61,"y":444,"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":90,"y":360,"w":13,"h":13}, + "frame": {"x":78,"y":370,"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":108,"y":315,"w":13,"h":13}, + "frame": {"x":78,"y":387,"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":107,"y":349,"w":13,"h":13}, + "frame": {"x":78,"y":421,"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":107,"y":366,"w":13,"h":13}, + "frame": {"x":78,"y":438,"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":90,"y":377,"w":13,"h":13}, + "frame": {"x":78,"y":455,"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":107,"y":383,"w":13,"h":13}, + "frame": {"x":107,"y":68,"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":52,"y":382,"w":13,"h":13}, + "frame": {"x":107,"y":85,"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":69,"y":380,"w":13,"h":13}, + "frame": {"x":107,"y":102,"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":42,"y":400,"w":13,"h":13}, + "frame": {"x":107,"y":119,"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":42,"y":417,"w":13,"h":13}, + "frame": {"x":88,"y":221,"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":59,"y":433,"w":13,"h":13}, + "frame": {"x":95,"y":367,"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":76,"y":397,"w":13,"h":13}, + "frame": {"x":95,"y":384,"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":59,"y":450,"w":13,"h":13}, + "frame": {"x":112,"y":238,"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":79,"y":512,"w":13,"h":13}, + "frame": {"x":112,"y":391,"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":96,"y":493,"w":13,"h":13}, + "frame": {"x":112,"y":408,"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":96,"y":510,"w":13,"h":13}, + "frame": {"x":112,"y":425,"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":79,"y":529,"w":13,"h":13}, + "frame": {"x":112,"y":442,"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":96,"y":527,"w":13,"h":13}, + "frame": {"x":112,"y":459,"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":96,"y":544,"w":13,"h":13}, + "frame": {"x":95,"y":469,"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":43,"y":628,"w":13,"h":13}, + "frame": {"x":112,"y":476,"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":76,"y":414,"w":13,"h":13}, + "frame": {"x":95,"y":401,"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":76,"y":431,"w":13,"h":13}, + "frame": {"x":95,"y":418,"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":93,"y":408,"w":13,"h":13}, + "frame": {"x":95,"y":435,"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":110,"y":400,"w":13,"h":13}, + "frame": {"x":95,"y":452,"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":110,"y":417,"w":13,"h":13}, + "frame": {"x":112,"y":136,"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":93,"y":425,"w":13,"h":13}, + "frame": {"x":112,"y":153,"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":110,"y":434,"w":13,"h":13}, + "frame": {"x":112,"y":170,"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":93,"y":442,"w":13,"h":13}, + "frame": {"x":112,"y":187,"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":110,"y":451,"w":13,"h":13}, + "frame": {"x":112,"y":204,"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":76,"y":448,"w":13,"h":13}, + "frame": {"x":112,"y":221,"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":93,"y":459,"w":13,"h":13}, + "frame": {"x":112,"y":255,"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":110,"y":468,"w":13,"h":13}, + "frame": {"x":112,"y":272,"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":62,"y":467,"w":13,"h":13}, + "frame": {"x":112,"y":289,"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":62,"y":484,"w":13,"h":13}, + "frame": {"x":112,"y":306,"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":62,"y":501,"w":13,"h":13}, + "frame": {"x":112,"y":323,"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":62,"y":518,"w":13,"h":13}, + "frame": {"x":112,"y":340,"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":79,"y":478,"w":13,"h":13}, + "frame": {"x":112,"y":357,"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":79,"y":495,"w":13,"h":13}, + "frame": {"x":112,"y":374,"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":43,"y":645,"w":13,"h":13}, + "frame": {"x":84,"y":127,"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":43,"y":662,"w":13,"h":13}, + "frame": {"x":83,"y":144,"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":61,"y":603,"w":13,"h":13}, + "frame": {"x":60,"y":512,"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":95,"y":612,"w":13,"h":13}, + "frame": {"x":111,"y":493,"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":61,"y":620,"w":13,"h":13}, + "frame": {"x":111,"y":510,"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":60,"y":637,"w":13,"h":13}, + "frame": {"x":111,"y":527,"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":60,"y":654,"w":13,"h":13}, + "frame": {"x":94,"y":537,"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":60,"y":671,"w":13,"h":13}, + "frame": {"x":77,"y":540,"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":78,"y":631,"w":13,"h":13}, + "frame": {"x":60,"y":546,"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":95,"y":629,"w":13,"h":13}, + "frame": {"x":111,"y":544,"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":43,"y":679,"w":13,"h":13}, + "frame": {"x":91,"y":175,"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":44,"y":536,"w":13,"h":13}, + "frame": {"x":91,"y":192,"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":44,"y":553,"w":13,"h":13}, + "frame": {"x":43,"y":462,"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":44,"y":570,"w":13,"h":13}, + "frame": {"x":43,"y":479,"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":44,"y":587,"w":13,"h":13}, + "frame": {"x":43,"y":496,"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":44,"y":604,"w":13,"h":13}, + "frame": {"x":43,"y":513,"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":61,"y":535,"w":13,"h":13}, + "frame": {"x":43,"y":530,"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":61,"y":552,"w":13,"h":13}, + "frame": {"x":60,"y":461,"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":61,"y":569,"w":13,"h":13}, + "frame": {"x":60,"y":478,"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":61,"y":586,"w":13,"h":13}, + "frame": {"x":60,"y":495,"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":78,"y":546,"w":13,"h":13}, + "frame": {"x":60,"y":529,"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":78,"y":563,"w":13,"h":13}, + "frame": {"x":77,"y":472,"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":78,"y":580,"w":13,"h":13}, + "frame": {"x":77,"y":489,"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":78,"y":597,"w":13,"h":13}, + "frame": {"x":77,"y":506,"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":95,"y":561,"w":13,"h":13}, + "frame": {"x":77,"y":523,"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":95,"y":578,"w":13,"h":13}, + "frame": {"x":94,"y":486,"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":95,"y":595,"w":13,"h":13}, + "frame": {"x":94,"y":503,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -666,23 +666,15 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":78,"y":614,"w":13,"h":13}, + "frame": {"x":94,"y":520,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, "sourceSize": {"w":13,"h":13} }, -"sprites/blueprints/advanced_processor.png": -{ - "frame": {"x":82,"y":3,"w":38,"h":38}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, - "sourceSize": {"w":38,"h":38} -}, "sprites/blueprints/belt_left.png": { - "frame": {"x":77,"y":648,"w":13,"h":13}, + "frame": {"x":94,"y":554,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -690,7 +682,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":77,"y":665,"w":13,"h":13}, + "frame": {"x":77,"y":557,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -698,7 +690,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":77,"y":682,"w":13,"h":13}, + "frame": {"x":111,"y":561,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -714,23 +706,15 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":3,"y":628,"w":36,"h":19}, + "frame": {"x":3,"y":462,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, "sourceSize": {"w":38,"h":19} }, -"sprites/blueprints/energy_generator.png": -{ - "frame": {"x":3,"y":301,"w":37,"h":37}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":1,"w":37,"h":37}, - "sourceSize": {"w":38,"h":38} -}, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":45,"y":198,"w":19,"h":19}, + "frame": {"x":45,"y":175,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -738,7 +722,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":45,"y":221,"w":19,"h":19}, + "frame": {"x":3,"y":554,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -746,7 +730,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":3,"y":536,"w":37,"h":19}, + "frame": {"x":3,"y":370,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -754,7 +738,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":3,"y":175,"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}, @@ -778,7 +762,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":3,"y":467,"w":38,"h":19}, + "frame": {"x":3,"y":301,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -786,7 +770,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":45,"y":244,"w":19,"h":19}, + "frame": {"x":45,"y":198,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -794,7 +778,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":45,"y":267,"w":19,"h":19}, + "frame": {"x":42,"y":221,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -802,7 +786,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":68,"y":198,"w":19,"h":19}, + "frame": {"x":42,"y":244,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -810,7 +794,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":68,"y":221,"w":19,"h":19}, + "frame": {"x":42,"y":267,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -818,7 +802,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":68,"y":244,"w":19,"h":19}, + "frame": {"x":26,"y":554,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -826,7 +810,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":3,"y":651,"w":36,"h":19}, + "frame": {"x":3,"y":485,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -834,7 +818,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":3,"y":559,"w":37,"h":19}, + "frame": {"x":3,"y":393,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -842,7 +826,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":3,"y":383,"w":35,"h":38}, + "frame": {"x":3,"y":217,"w":35,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":35,"h":38}, @@ -850,7 +834,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":68,"y":267,"w":19,"h":19}, + "frame": {"x":68,"y":175,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -858,7 +842,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":67,"y":336,"w":19,"h":18}, + "frame": {"x":3,"y":577,"w":19,"h":18}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":19,"h":18}, @@ -866,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":84,"y":127,"w":19,"h":16}, + "frame": {"x":45,"y":336,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -874,7 +858,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":83,"y":147,"w":19,"h":16}, + "frame": {"x":68,"y":290,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -882,63 +866,15 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":102,"y":173,"w":19,"h":16}, + "frame": {"x":68,"y":310,"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":84,"y":81,"w":14,"h":19}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":5,"y":0,"w":14,"h":19}, - "sourceSize": {"w":19,"h":19} -}, -"sprites/blueprints/wire_crossings.png": -{ - "frame": {"x":107,"y":104,"w":14,"h":19}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":5,"y":0,"w":14,"h":19}, - "sourceSize": {"w":19,"h":19} -}, -"sprites/blueprints/wire_left.png": -{ - "frame": {"x":79,"y":465,"w":10,"h":9}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":4,"w":10,"h":9}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/blueprints/wire_right.png": -{ - "frame": {"x":114,"y":225,"w":9,"h":9}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":4,"y":4,"w":9,"h":9}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/blueprints/wire_top.png": -{ - "frame": {"x":42,"y":383,"w":6,"h":13}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":4,"y":0,"w":6,"h":13}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/buildings/advanced_processor.png": -{ - "frame": {"x":3,"y":217,"w":38,"h":38}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, - "sourceSize": {"w":38,"h":38} -}, "sprites/buildings/belt_left.png": { - "frame": {"x":95,"y":646,"w":13,"h":13}, + "frame": {"x":94,"y":571,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -946,7 +882,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":94,"y":663,"w":13,"h":13}, + "frame": {"x":111,"y":578,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -954,7 +890,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":85,"y":167,"w":13,"h":13}, + "frame": {"x":44,"y":376,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, @@ -970,20 +906,12 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":3,"y":674,"w":36,"h":19}, + "frame": {"x":3,"y":508,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, "sourceSize": {"w":38,"h":19} }, -"sprites/buildings/energy_generator.png": -{ - "frame": {"x":3,"y":342,"w":37,"h":37}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":1,"w":37,"h":37}, - "sourceSize": {"w":38,"h":38} -}, "sprites/buildings/hub.png": { "frame": {"x":3,"y":3,"w":75,"h":76}, @@ -994,7 +922,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":104,"y":68,"w":19,"h":19}, + "frame": {"x":68,"y":198,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1002,7 +930,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":84,"y":104,"w":19,"h":19}, + "frame": {"x":65,"y":221,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1010,7 +938,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":3,"y":582,"w":37,"h":19}, + "frame": {"x":3,"y":416,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -1018,7 +946,7 @@ }, "sprites/buildings/painter-double.png": { - "frame": {"x":3,"y":259,"w":38,"h":38}, + "frame": {"x":3,"y":175,"w":38,"h":38}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":38}, @@ -1026,7 +954,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":3,"y":490,"w":38,"h":19}, + "frame": {"x":3,"y":324,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -1042,7 +970,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":3,"y":513,"w":38,"h":19}, + "frame": {"x":3,"y":347,"w":38,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":38,"h":19}, @@ -1050,7 +978,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":45,"y":290,"w":19,"h":19}, + "frame": {"x":65,"y":244,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1058,7 +986,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":68,"y":290,"w":19,"h":19}, + "frame": {"x":65,"y":267,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1066,7 +994,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":44,"y":313,"w":19,"h":19}, + "frame": {"x":84,"y":81,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1074,7 +1002,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":44,"y":336,"w":19,"h":19}, + "frame": {"x":84,"y":104,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1082,7 +1010,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":67,"y":313,"w":19,"h":19}, + "frame": {"x":45,"y":290,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1090,7 +1018,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":45,"y":175,"w":36,"h":19}, + "frame": {"x":3,"y":531,"w":36,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":36,"h":19}, @@ -1098,7 +1026,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":3,"y":605,"w":37,"h":19}, + "frame": {"x":3,"y":439,"w":37,"h":19}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":37,"h":19}, @@ -1106,7 +1034,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":3,"y":425,"w":35,"h":38}, + "frame": {"x":3,"y":259,"w":35,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":35,"h":38}, @@ -1114,7 +1042,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":44,"y":359,"w":19,"h":19}, + "frame": {"x":45,"y":313,"w":19,"h":19}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":19}, @@ -1122,7 +1050,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":67,"y":358,"w":19,"h":18}, + "frame": {"x":26,"y":577,"w":19,"h":18}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":19,"h":18}, @@ -1130,7 +1058,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":91,"y":198,"w":19,"h":16}, + "frame": {"x":68,"y":330,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":19,"h":16}, @@ -1138,7 +1066,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":91,"y":218,"w":19,"h":16}, + "frame": {"x":45,"y":356,"w":19,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":19,"h":16}, @@ -1146,55 +1074,15 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":91,"y":238,"w":19,"h":16}, + "frame": {"x":68,"y":350,"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":107,"y":127,"w":14,"h":19}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":5,"y":0,"w":14,"h":19}, - "sourceSize": {"w":19,"h":19} -}, -"sprites/buildings/wire_crossings.png": -{ - "frame": {"x":106,"y":150,"w":14,"h":19}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":5,"y":0,"w":14,"h":19}, - "sourceSize": {"w":19,"h":19} -}, -"sprites/buildings/wire_left.png": -{ - "frame": {"x":114,"y":238,"w":9,"h":9}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":4,"w":9,"h":9}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/buildings/wire_right.png": -{ - "frame": {"x":114,"y":251,"w":9,"h":9}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":4,"y":4,"w":9,"h":9}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/buildings/wire_top.png": -{ - "frame": {"x":96,"y":476,"w":5,"h":13}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":4,"y":0,"w":5,"h":13}, - "sourceSize": {"w":13,"h":13} -}, "sprites/debug/acceptor_slot.png": { - "frame": {"x":112,"y":577,"w":6,"h":6}, + "frame": {"x":91,"y":357,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1202,7 +1090,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":112,"y":587,"w":6,"h":6}, + "frame": {"x":101,"y":357,"w":6,"h":6}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, @@ -1210,7 +1098,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":44,"y":621,"w":3,"h":3}, + "frame": {"x":43,"y":547,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1218,7 +1106,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":51,"y":621,"w":3,"h":3}, + "frame": {"x":91,"y":209,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1226,7 +1114,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":70,"y":688,"w":3,"h":3}, + "frame": {"x":66,"y":563,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1234,39 +1122,23 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":85,"y":184,"w":10,"h":10}, + "frame": {"x":83,"y":161,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, "sourceSize": {"w":10,"h":10} }, -"sprites/misc/energy_generator_overlay.png": -{ - "frame": {"x":82,"y":68,"w":18,"h":9}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":17,"y":27,"w":18,"h":9}, - "sourceSize": {"w":38,"h":38} -}, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":111,"y":666,"w":3,"h":3}, + "frame": {"x":49,"y":580,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, "sourceSize": {"w":3,"h":3} }, -"sprites/misc/lock_direction_indicator.png": -{ - "frame": {"x":112,"y":657,"w":5,"h":5}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":5,"h":5}, - "sourceSize": {"w":5,"h":5} -}, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":85,"y":184,"w":10,"h":10}, + "frame": {"x":83,"y":161,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -1274,7 +1146,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":93,"y":394,"w":10,"h":10}, + "frame": {"x":97,"y":161,"w":10,"h":10}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":10,"h":10}, @@ -1282,7 +1154,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":102,"y":91,"w":18,"h":9}, + "frame": {"x":82,"y":68,"w":18,"h":9}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":18,"h":9}, @@ -1290,7 +1162,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":111,"y":673,"w":3,"h":3}, + "frame": {"x":50,"y":547,"w":3,"h":3}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":3,"h":3}, @@ -1298,107 +1170,19 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":94,"y":680,"w":13,"h":13}, + "frame": {"x":49,"y":563,"w":13,"h":13}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":13,"h":13}, "sourceSize": {"w":13,"h":13} -}, -"sprites/wires/battery_empty.png": -{ - "frame": {"x":112,"y":597,"w":6,"h":6}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, - "sourceSize": {"w":6,"h":6} -}, -"sprites/wires/battery_full.png": -{ - "frame": {"x":112,"y":607,"w":6,"h":6}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, - "sourceSize": {"w":6,"h":6} -}, -"sprites/wires/battery_low.png": -{ - "frame": {"x":112,"y":617,"w":6,"h":6}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, - "sourceSize": {"w":6,"h":6} -}, -"sprites/wires/battery_medium.png": -{ - "frame": {"x":112,"y":627,"w":6,"h":6}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, - "sourceSize": {"w":6,"h":6} -}, -"sprites/wires/negative_energy.png": -{ - "frame": {"x":112,"y":637,"w":6,"h":6}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, - "sourceSize": {"w":6,"h":6} -}, -"sprites/wires/pin_negative_accept.png": -{ - "frame": {"x":42,"y":451,"w":11,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":0,"w":11,"h":12}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/wires/pin_negative_eject.png": -{ - "frame": {"x":114,"y":193,"w":9,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":0,"w":9,"h":12}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/wires/pin_positive_accept.png": -{ - "frame": {"x":114,"y":209,"w":9,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":0,"w":9,"h":12}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/wires/pin_positive_eject.png": -{ - "frame": {"x":112,"y":561,"w":11,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":0,"w":11,"h":12}, - "sourceSize": {"w":13,"h":13} -}, -"sprites/wires/positive_energy.png": -{ - "frame": {"x":112,"y":647,"w":6,"h":6}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, - "sourceSize": {"w":6,"h":6} -}, -"sprites/wires/waste_piled.png": -{ - "frame": {"x":60,"y":688,"w":6,"h":6}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":6,"h":6}, - "sourceSize": {"w":6,"h":6} }}, "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "1.0", "image": "atlas0_10.png", "format": "RGBA8888", - "size": {"w":126,"h":698}, + "size": {"w":128,"h":598}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:dfc84e4381978113df4ad0cd8a5aace9:4e9bd6f6c82aaaa8a4a583cab68dc719:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:a7ec474d30eba3dcfb9e1ce36dc9a3df:a66fdbb2f105a54e9a5193362b6c2d4d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png index 2fdd0720..7921ae6f 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 b5980771..4020c412 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":1515,"y":1539,"w":100,"h":126}, + "frame": {"x":858,"y":1175,"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":1436,"y":1712,"w":100,"h":126}, + "frame": {"x":1037,"y":1325,"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":1671,"y":969,"w":100,"h":126}, + "frame": {"x":906,"y":1703,"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":1644,"y":1627,"w":100,"h":126}, + "frame": {"x":1778,"y":1303,"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":1644,"y":1757,"w":100,"h":126}, + "frame": {"x":1781,"y":1433,"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":1748,"y":1619,"w":100,"h":126}, + "frame": {"x":1127,"y":1715,"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":1748,"y":1749,"w":100,"h":126}, + "frame": {"x":1231,"y":1707,"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":1775,"y":1205,"w":100,"h":126}, + "frame": {"x":1137,"y":2079,"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":1879,"y":1205,"w":100,"h":126}, + "frame": {"x":1137,"y":2209,"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":1827,"y":1335,"w":100,"h":126}, + "frame": {"x":1256,"y":1954,"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":1194,"y":1863,"w":100,"h":126}, + "frame": {"x":1258,"y":1343,"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":1540,"y":1669,"w":100,"h":126}, + "frame": {"x":1362,"y":1325,"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":1332,"y":1842,"w":100,"h":126}, + "frame": {"x":1466,"y":1325,"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":1436,"y":1842,"w":100,"h":126}, + "frame": {"x":1570,"y":1325,"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":1540,"y":1799,"w":100,"h":126}, + "frame": {"x":1821,"y":1173,"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":2532,"y":589,"w":100,"h":126}, + "frame": {"x":923,"y":1443,"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":2533,"y":719,"w":100,"h":126}, + "frame": {"x":923,"y":1573,"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":2533,"y":849,"w":100,"h":126}, + "frame": {"x":1027,"y":1455,"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":1463,"y":978,"w":100,"h":126}, + "frame": {"x":1027,"y":1585,"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":1567,"y":977,"w":100,"h":126}, + "frame": {"x":1131,"y":1577,"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":1567,"y":1107,"w":100,"h":126}, + "frame": {"x":1365,"y":1455,"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":1671,"y":1099,"w":100,"h":126}, + "frame": {"x":1469,"y":1455,"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":1567,"y":1237,"w":100,"h":126}, + "frame": {"x":1573,"y":1455,"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":1671,"y":1229,"w":100,"h":126}, + "frame": {"x":384,"y":2276,"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":1619,"y":1367,"w":100,"h":126}, + "frame": {"x":488,"y":2248,"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":1619,"y":1497,"w":100,"h":126}, + "frame": {"x":1023,"y":1832,"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":1723,"y":1359,"w":100,"h":126}, + "frame": {"x":1674,"y":1325,"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":1723,"y":1489,"w":100,"h":126}, + "frame": {"x":1677,"y":1455,"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":1077,"y":1920,"w":113,"h":113}, + "frame": {"x":1857,"y":395,"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":1842,"y":971,"w":113,"h":113}, + "frame": {"x":1857,"y":512,"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":1959,"y":971,"w":113,"h":113}, + "frame": {"x":1020,"y":2079,"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":2310,"y":976,"w":113,"h":113}, + "frame": {"x":1241,"y":2201,"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":2334,"y":1210,"w":113,"h":113}, + "frame": {"x":1136,"y":2339,"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":2393,"y":1093,"w":113,"h":113}, + "frame": {"x":1253,"y":2318,"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":2451,"y":1210,"w":113,"h":113}, + "frame": {"x":1335,"y":1707,"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":2048,"y":1327,"w":113,"h":113}, + "frame": {"x":1352,"y":1590,"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":2165,"y":1327,"w":113,"h":113}, + "frame": {"x":1469,"y":1585,"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":2282,"y":1327,"w":113,"h":113}, + "frame": {"x":1586,"y":1585,"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":1842,"y":1088,"w":113,"h":113}, + "frame": {"x":1141,"y":1343,"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":1827,"y":1465,"w":113,"h":113}, + "frame": {"x":1131,"y":1460,"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":1852,"y":1582,"w":113,"h":113}, + "frame": {"x":1010,"y":1715,"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":1852,"y":1699,"w":113,"h":113}, + "frame": {"x":1248,"y":1473,"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":1852,"y":1816,"w":113,"h":113}, + "frame": {"x":1235,"y":1590,"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":1931,"y":1335,"w":113,"h":113}, + "frame": {"x":592,"y":2248,"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":1944,"y":1452,"w":113,"h":113}, + "frame": {"x":906,"y":1833,"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":1969,"y":1569,"w":113,"h":113}, + "frame": {"x":905,"y":1950,"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":1969,"y":1686,"w":113,"h":113}, + "frame": {"x":903,"y":2067,"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":1969,"y":1803,"w":113,"h":113}, + "frame": {"x":1022,"y":1962,"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":1959,"y":1088,"w":113,"h":113}, + "frame": {"x":903,"y":2184,"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":1983,"y":1205,"w":113,"h":113}, + "frame": {"x":1020,"y":2196,"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":2076,"y":976,"w":113,"h":113}, + "frame": {"x":902,"y":2301,"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":2193,"y":976,"w":113,"h":113}, + "frame": {"x":1019,"y":2313,"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":2159,"y":1093,"w":113,"h":113}, + "frame": {"x":1127,"y":1845,"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":2100,"y":1210,"w":113,"h":113}, + "frame": {"x":1139,"y":1962,"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":2217,"y":1210,"w":113,"h":113}, + "frame": {"x":1244,"y":1837,"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":2276,"y":1093,"w":113,"h":113}, + "frame": {"x":1241,"y":2084,"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":2399,"y":1327,"w":113,"h":113}, + "frame": {"x":1361,"y":1824,"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":2061,"y":1444,"w":113,"h":113}, + "frame": {"x":1703,"y":1585,"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":2320,"y":1678,"w":113,"h":113}, + "frame": {"x":1478,"y":1941,"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":2554,"y":1795,"w":113,"h":113}, + "frame": {"x":1487,"y":2292,"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":2510,"y":979,"w":113,"h":113}, + "frame": {"x":1592,"y":2175,"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":1644,"y":1887,"w":113,"h":113}, + "frame": {"x":1594,"y":2058,"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":1969,"y":1920,"w":113,"h":113}, + "frame": {"x":1711,"y":2053,"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":2086,"y":1912,"w":113,"h":113}, + "frame": {"x":1828,"y":2053,"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":2203,"y":1912,"w":113,"h":113}, + "frame": {"x":1604,"y":2292,"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":2320,"y":1912,"w":113,"h":113}, + "frame": {"x":1709,"y":2175,"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":2178,"y":1444,"w":113,"h":113}, + "frame": {"x":1452,"y":1707,"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":2295,"y":1444,"w":113,"h":113}, + "frame": {"x":1569,"y":1702,"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":2086,"y":1561,"w":113,"h":113}, + "frame": {"x":1686,"y":1702,"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":2086,"y":1678,"w":113,"h":113}, + "frame": {"x":1478,"y":1824,"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":2203,"y":1561,"w":113,"h":113}, + "frame": {"x":1595,"y":1819,"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":2086,"y":1795,"w":113,"h":113}, + "frame": {"x":1712,"y":1819,"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":2203,"y":1678,"w":113,"h":113}, + "frame": {"x":1820,"y":1563,"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":2203,"y":1795,"w":113,"h":113}, + "frame": {"x":1803,"y":1702,"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":2412,"y":1444,"w":113,"h":113}, + "frame": {"x":1829,"y":1819,"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":2320,"y":1561,"w":113,"h":113}, + "frame": {"x":1361,"y":1941,"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":2320,"y":1795,"w":113,"h":113}, + "frame": {"x":1595,"y":1936,"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":2437,"y":1561,"w":113,"h":113}, + "frame": {"x":1712,"y":1936,"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":2437,"y":1678,"w":113,"h":113}, + "frame": {"x":1829,"y":1936,"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":2437,"y":1795,"w":113,"h":113}, + "frame": {"x":1360,"y":2058,"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":2516,"y":1327,"w":113,"h":113}, + "frame": {"x":1477,"y":2058,"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":2529,"y":1444,"w":113,"h":113}, + "frame": {"x":1358,"y":2175,"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":2554,"y":1561,"w":113,"h":113}, + "frame": {"x":1475,"y":2175,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -666,23 +666,15 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":2554,"y":1678,"w":113,"h":113}, + "frame": {"x":1370,"y":2292,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, "sourceSize": {"w":126,"h":126} }, -"sprites/blueprints/advanced_processor.png": -{ - "frame": {"x":3,"y":1316,"w":374,"h":358}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":10,"y":12,"w":374,"h":358}, - "sourceSize": {"w":384,"h":384} -}, "sprites/blueprints/belt_left.png": { - "frame": {"x":2607,"y":3,"w":114,"h":114}, + "frame": {"x":1703,"y":1173,"w":114,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":12,"w":114,"h":114}, @@ -690,7 +682,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":959,"y":1920,"w":114,"h":114}, + "frame": {"x":919,"y":1325,"w":114,"h":114}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":12,"w":114,"h":114}, @@ -698,7 +690,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":1330,"y":1712,"w":102,"h":126}, + "frame": {"x":1825,"y":629,"w":102,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":12,"y":0,"w":102,"h":126}, @@ -706,7 +698,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,23 +706,15 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":1485,"y":198,"w":341,"h":191}, + "frame": {"x":391,"y":1319,"w":341,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":341,"h":191}, "sourceSize": {"w":384,"h":192} }, -"sprites/blueprints/energy_generator.png": -{ - "frame": {"x":381,"y":1319,"w":348,"h":364}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":20,"y":20,"w":348,"h":364}, - "sourceSize": {"w":384,"h":384} -}, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":2163,"y":588,"w":182,"h":190}, + "frame": {"x":1697,"y":979,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -738,7 +722,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":2128,"y":782,"w":182,"h":190}, + "frame": {"x":1770,"y":785,"w":182,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":182,"h":190}, @@ -746,7 +730,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":1123,"y":783,"w":347,"h":191}, + "frame": {"x":1123,"y":590,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -754,7 +738,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 +746,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 +762,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":380,"y":1687,"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 +770,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":2218,"y":393,"w":189,"h":191}, + "frame": {"x":1118,"y":979,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -794,7 +778,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":1458,"y":587,"w":189,"h":191}, + "frame": {"x":1311,"y":979,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":189,"h":191}, @@ -802,7 +786,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":1474,"y":782,"w":189,"h":191}, + "frame": {"x":1504,"y":979,"w":189,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":189,"h":191}, @@ -810,7 +794,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":1783,"y":589,"w":188,"h":182}, + "frame": {"x":3,"y":2285,"w":188,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":188,"h":182}, @@ -818,7 +802,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":2547,"y":393,"w":185,"h":182}, + "frame": {"x":195,"y":2285,"w":185,"h":182}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":4,"w":185,"h":182}, @@ -826,7 +810,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":1830,"y":198,"w":340,"h":191}, + "frame": {"x":3,"y":2090,"w":340,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":23,"y":0,"w":340,"h":191}, @@ -834,7 +818,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":1112,"y":978,"w":347,"h":191}, + "frame": {"x":1474,"y":590,"w":347,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":18,"y":0,"w":347,"h":191}, @@ -842,7 +826,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}, @@ -850,7 +834,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":1826,"y":393,"w":192,"h":192}, + "frame": {"x":726,"y":979,"w":192,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":192}, @@ -858,7 +842,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":1432,"y":1369,"w":183,"h":166}, + "frame": {"x":718,"y":1892,"w":183,"h":166}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":26,"w":183,"h":166}, @@ -866,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":569,"y":1883,"w":182,"h":148}, + "frame": {"x":717,"y":2062,"w":182,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":44,"w":182,"h":148}, @@ -874,7 +858,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":380,"y":1883,"w":185,"h":148}, + "frame": {"x":527,"y":2096,"w":185,"h":148}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":185,"h":148}, @@ -882,63 +866,15 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":959,"y":1768,"w":182,"h":148}, + "frame": {"x":716,"y":2214,"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":2411,"y":393,"w":132,"h":192}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":60,"y":0,"w":132,"h":192}, - "sourceSize": {"w":192,"h":192} -}, -"sprites/blueprints/wire_crossings.png": -{ - "frame": {"x":1857,"y":775,"w":132,"h":192}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":60,"y":0,"w":132,"h":192}, - "sourceSize": {"w":192,"h":192} -}, -"sprites/blueprints/wire_left.png": -{ - "frame": {"x":2427,"y":974,"w":79,"h":79}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":47,"w":79,"h":79}, - "sourceSize": {"w":126,"h":126} -}, -"sprites/blueprints/wire_right.png": -{ - "frame": {"x":2076,"y":1093,"w":79,"h":80}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":47,"y":46,"w":79,"h":80}, - "sourceSize": {"w":126,"h":126} -}, -"sprites/blueprints/wire_top.png": -{ - "frame": {"x":2497,"y":782,"w":32,"h":126}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":47,"y":0,"w":32,"h":126}, - "sourceSize": {"w":126,"h":126} -}, -"sprites/buildings/advanced_processor.png": -{ - "frame": {"x":3,"y":1678,"w":373,"h":356}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":11,"y":13,"w":373,"h":356}, - "sourceSize": {"w":384,"h":384} -}, "sprites/buildings/belt_left.png": { - "frame": {"x":2437,"y":1912,"w":113,"h":113}, + "frame": {"x":1826,"y":2170,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":13,"w":113,"h":113}, @@ -946,7 +882,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":2554,"y":1912,"w":113,"h":113}, + "frame": {"x":1721,"y":2292,"w":113,"h":113}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":13,"w":113,"h":113}, @@ -954,7 +890,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1515,"y":1539,"w":100,"h":126}, + "frame": {"x":858,"y":1175,"w":100,"h":126}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":100,"h":126}, @@ -970,20 +906,12 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":2174,"y":199,"w":339,"h":190}, + "frame": {"x":1084,"y":785,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, "sourceSize": {"w":384,"h":192} }, -"sprites/buildings/energy_generator.png": -{ - "frame": {"x":733,"y":1171,"w":346,"h":363}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":21,"y":21,"w":346,"h":363}, - "sourceSize": {"w":384,"h":384} -}, "sprites/buildings/hub.png": { "frame": {"x":3,"y":3,"w":728,"h":730}, @@ -994,7 +922,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":2314,"y":782,"w":179,"h":188}, + "frame": {"x":740,"y":1500,"w":179,"h":188}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":1,"w":179,"h":188}, @@ -1002,7 +930,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":2349,"y":589,"w":179,"h":189}, + "frame": {"x":736,"y":1307,"w":179,"h":189}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":179,"h":189}, @@ -1010,7 +938,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":1083,"y":1173,"w":345,"h":190}, + "frame": {"x":391,"y":1514,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -1018,7 +946,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}, @@ -1026,7 +954,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":735,"y":781,"w":384,"h":191}, + "frame": {"x":735,"y":590,"w":384,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":384,"h":191}, @@ -1042,7 +970,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":724,"y":976,"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}, @@ -1050,7 +978,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":2517,"y":199,"w":187,"h":190}, + "frame": {"x":336,"y":1708,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -1058,7 +986,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":1667,"y":775,"w":186,"h":190}, + "frame": {"x":527,"y":1902,"w":186,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":186,"h":190}, @@ -1066,7 +994,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":768,"y":1628,"w":187,"h":190}, + "frame": {"x":527,"y":1708,"w":187,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":187,"h":190}, @@ -1074,7 +1002,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":768,"y":1822,"w":187,"h":180}, + "frame": {"x":336,"y":1902,"w":187,"h":180}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":187,"h":180}, @@ -1082,7 +1010,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1975,"y":589,"w":184,"h":180}, + "frame": {"x":718,"y":1708,"w":184,"h":180}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":5,"w":184,"h":180}, @@ -1090,7 +1018,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":1483,"y":393,"w":339,"h":190}, + "frame": {"x":1427,"y":785,"w":339,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":24,"y":0,"w":339,"h":190}, @@ -1098,7 +1026,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":1083,"y":1367,"w":345,"h":190}, + "frame": {"x":735,"y":785,"w":345,"h":190}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":19,"y":0,"w":345,"h":190}, @@ -1106,7 +1034,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":391,"y":931,"w":329,"h":384}, + "frame": {"x":3,"y":1702,"w":329,"h":384}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":30,"y":0,"w":329,"h":384}, @@ -1114,7 +1042,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":2022,"y":393,"w":192,"h":191}, + "frame": {"x":922,"y":979,"w":192,"h":191}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":192,"h":191}, @@ -1122,7 +1050,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":959,"y":1599,"w":181,"h":165}, + "frame": {"x":1148,"y":1174,"w":181,"h":165}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":27,"w":181,"h":165}, @@ -1130,7 +1058,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1145,"y":1712,"w":181,"h":147}, + "frame": {"x":1333,"y":1174,"w":181,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":45,"w":181,"h":147}, @@ -1138,7 +1066,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1144,"y":1561,"w":182,"h":147}, + "frame": {"x":962,"y":1174,"w":182,"h":147}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":182,"h":147}, @@ -1146,55 +1074,15 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1330,"y":1561,"w":181,"h":147}, + "frame": {"x":1518,"y":1174,"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":1993,"y":773,"w":131,"h":192}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":61,"y":0,"w":131,"h":192}, - "sourceSize": {"w":192,"h":192} -}, -"sprites/buildings/wire_crossings.png": -{ - "frame": {"x":1432,"y":1173,"w":131,"h":192}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":61,"y":0,"w":131,"h":192}, - "sourceSize": {"w":192,"h":192} -}, -"sprites/buildings/wire_left.png": -{ - "frame": {"x":2510,"y":1096,"w":78,"h":78}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":48,"w":78,"h":78}, - "sourceSize": {"w":126,"h":126} -}, -"sprites/buildings/wire_right.png": -{ - "frame": {"x":2627,"y":983,"w":78,"h":78}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":48,"y":48,"w":78,"h":78}, - "sourceSize": {"w":126,"h":126} -}, -"sprites/buildings/wire_top.png": -{ - "frame": {"x":1298,"y":1863,"w":30,"h":126}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":48,"y":0,"w":30,"h":126}, - "sourceSize": {"w":126,"h":126} -}, "sprites/debug/acceptor_slot.png": { - "frame": {"x":2607,"y":121,"w":50,"h":64}, + "frame": {"x":1920,"y":1680,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -1202,7 +1090,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":2661,"y":121,"w":50,"h":64}, + "frame": {"x":1920,"y":1748,"w":50,"h":64}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":0,"w":50,"h":64}, @@ -1210,7 +1098,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":2427,"y":1057,"w":24,"h":32}, + "frame": {"x":1946,"y":1816,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -1218,7 +1106,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":2510,"y":1178,"w":28,"h":28}, + "frame": {"x":1825,"y":590,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":4,"w":28,"h":28}, @@ -1226,7 +1114,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":2542,"y":1178,"w":28,"h":28}, + "frame": {"x":1883,"y":979,"w":28,"h":28}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":4,"w":28,"h":28}, @@ -1234,39 +1122,23 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":2637,"y":897,"w":82,"h":82}, + "frame": {"x":1873,"y":3,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, "sourceSize": {"w":96,"h":96} }, -"sprites/misc/energy_generator_overlay.png": -{ - "frame": {"x":913,"y":1538,"w":153,"h":57}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":183,"y":290,"w":153,"h":57}, - "sourceSize": {"w":384,"h":384} -}, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":2497,"y":912,"w":32,"h":32}, + "frame": {"x":1931,"y":629,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, "sourceSize": {"w":32,"h":32} }, -"sprites/misc/lock_direction_indicator.png": -{ - "frame": {"x":1256,"y":1993,"w":48,"h":30}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":9,"w":48,"h":30}, - "sourceSize": {"w":48,"h":48} -}, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":2637,"y":897,"w":82,"h":82}, + "frame": {"x":1873,"y":3,"w":82,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":7,"y":7,"w":82,"h":82}, @@ -1274,7 +1146,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":2637,"y":797,"w":80,"h":96}, + "frame": {"x":347,"y":2176,"w":80,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":80,"h":96}, @@ -1282,7 +1154,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":733,"y":1538,"w":176,"h":86}, + "frame": {"x":347,"y":2086,"w":176,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":4,"w":176,"h":86}, @@ -1290,7 +1162,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":2455,"y":1057,"w":24,"h":32}, + "frame": {"x":1946,"y":1852,"w":24,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":24,"h":32}, @@ -1298,107 +1170,19 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":1651,"y":587,"w":128,"h":128}, + "frame": {"x":726,"y":1175,"w":128,"h":128}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":128,"h":128}, "sourceSize": {"w":128,"h":128} -}, -"sprites/wires/battery_empty.png": -{ - "frame": {"x":1525,"y":1108,"w":38,"h":60}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":13,"y":2,"w":38,"h":60}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/battery_full.png": -{ - "frame": {"x":1651,"y":719,"w":58,"h":38}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":3,"y":14,"w":58,"h":38}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/battery_low.png": -{ - "frame": {"x":1194,"y":1993,"w":58,"h":38}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":3,"y":14,"w":58,"h":38}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/battery_medium.png": -{ - "frame": {"x":1540,"y":1929,"w":58,"h":38}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":3,"y":14,"w":58,"h":38}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/negative_energy.png": -{ - "frame": {"x":1145,"y":1863,"w":42,"h":42}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":11,"y":11,"w":42,"h":42}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/pin_negative_accept.png": -{ - "frame": {"x":2636,"y":579,"w":73,"h":105}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":27,"y":0,"w":73,"h":105}, - "sourceSize": {"w":128,"h":128} -}, -"sprites/wires/pin_negative_eject.png": -{ - "frame": {"x":1775,"y":969,"w":63,"h":100}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":32,"y":0,"w":63,"h":100}, - "sourceSize": {"w":128,"h":128} -}, -"sprites/wires/pin_positive_accept.png": -{ - "frame": {"x":1775,"y":1073,"w":63,"h":100}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":32,"y":0,"w":63,"h":100}, - "sourceSize": {"w":128,"h":128} -}, -"sprites/wires/pin_positive_eject.png": -{ - "frame": {"x":2637,"y":688,"w":73,"h":105}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":27,"y":0,"w":73,"h":105}, - "sourceSize": {"w":128,"h":128} -}, -"sprites/wires/positive_energy.png": -{ - "frame": {"x":1713,"y":719,"w":42,"h":42}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":11,"y":11,"w":42,"h":42}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/waste_piled.png": -{ - "frame": {"x":1463,"y":1108,"w":58,"h":55}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":3,"y":4,"w":58,"h":55}, - "sourceSize": {"w":64,"h":64} }}, "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "1.0", "image": "atlas0_100.png", "format": "RGBA8888", - "size": {"w":2735,"h":2037}, + "size": {"w":1973,"h":2470}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:dfc84e4381978113df4ad0cd8a5aace9:4e9bd6f6c82aaaa8a4a583cab68dc719:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:a7ec474d30eba3dcfb9e1ce36dc9a3df:a66fdbb2f105a54e9a5193362b6c2d4d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.png b/res_built/atlas/atlas0_100.png index a072216d..70e746aa 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 dee62306..c314a229 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":452,"y":459,"w":28,"h":32}, + "frame": {"x":141,"y":452,"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":452,"y":495,"w":28,"h":32}, + "frame": {"x":402,"y":245,"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":246,"y":697,"w":28,"h":32}, + "frame": {"x":298,"y":337,"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":382,"y":624,"w":28,"h":32}, + "frame": {"x":394,"y":315,"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":350,"y":628,"w":28,"h":32}, + "frame": {"x":394,"y":351,"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":318,"y":640,"w":28,"h":32}, + "frame": {"x":426,"y":315,"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":382,"y":660,"w":28,"h":32}, + "frame": {"x":394,"y":387,"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":350,"y":664,"w":28,"h":32}, + "frame": {"x":426,"y":351,"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":346,"y":802,"w":28,"h":32}, + "frame": {"x":458,"y":315,"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":378,"y":802,"w":28,"h":32}, + "frame": {"x":426,"y":387,"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":148,"y":723,"w":28,"h":32}, + "frame": {"x":434,"y":245,"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":148,"y":759,"w":28,"h":32}, + "frame": {"x":466,"y":245,"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":148,"y":795,"w":28,"h":32}, + "frame": {"x":498,"y":245,"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":218,"y":536,"w":28,"h":32}, + "frame": {"x":530,"y":245,"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":180,"y":712,"w":28,"h":32}, + "frame": {"x":562,"y":245,"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":180,"y":748,"w":28,"h":32}, + "frame": {"x":594,"y":245,"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":180,"y":784,"w":28,"h":32}, + "frame": {"x":626,"y":245,"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":218,"y":572,"w":28,"h":32}, + "frame": {"x":658,"y":245,"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":246,"y":625,"w":28,"h":32}, + "frame": {"x":690,"y":245,"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":246,"y":661,"w":28,"h":32}, + "frame": {"x":298,"y":301,"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":246,"y":733,"w":28,"h":32}, + "frame": {"x":298,"y":373,"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":246,"y":769,"w":28,"h":32}, + "frame": {"x":298,"y":409,"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":318,"y":568,"w":28,"h":32}, + "frame": {"x":330,"y":329,"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":350,"y":556,"w":28,"h":32}, + "frame": {"x":330,"y":365,"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":382,"y":552,"w":28,"h":32}, + "frame": {"x":330,"y":401,"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":318,"y":604,"w":28,"h":32}, + "frame": {"x":362,"y":329,"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":350,"y":592,"w":28,"h":32}, + "frame": {"x":362,"y":365,"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":382,"y":588,"w":28,"h":32}, + "frame": {"x":362,"y":401,"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":452,"y":531,"w":30,"h":30}, + "frame": {"x":247,"y":456,"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":343,"y":522,"w":30,"h":30}, + "frame": {"x":281,"y":456,"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":178,"y":610,"w":30,"h":30}, + "frame": {"x":436,"y":281,"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":212,"y":744,"w":30,"h":30}, + "frame": {"x":490,"y":315,"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":212,"y":778,"w":30,"h":30}, + "frame": {"x":524,"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":284,"y":543,"w":30,"h":30}, + "frame": {"x":558,"y":315,"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":250,"y":591,"w":30,"h":30}, + "frame": {"x":592,"y":315,"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":284,"y":577,"w":30,"h":30}, + "frame": {"x":490,"y":349,"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":414,"y":545,"w":30,"h":30}, + "frame": {"x":626,"y":315,"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":284,"y":611,"w":30,"h":30}, + "frame": {"x":524,"y":349,"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":150,"y":485,"w":30,"h":30}, + "frame": {"x":402,"y":211,"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":150,"y":519,"w":30,"h":30}, + "frame": {"x":436,"y":211,"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":144,"y":553,"w":30,"h":30}, + "frame": {"x":470,"y":211,"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":144,"y":587,"w":30,"h":30}, + "frame": {"x":504,"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":144,"y":621,"w":30,"h":30}, + "frame": {"x":538,"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":144,"y":655,"w":30,"h":30}, + "frame": {"x":572,"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":144,"y":689,"w":30,"h":30}, + "frame": {"x":606,"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":184,"y":508,"w":30,"h":30}, + "frame": {"x":640,"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":184,"y":542,"w":30,"h":30}, + "frame": {"x":674,"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":178,"y":576,"w":30,"h":30}, + "frame": {"x":402,"y":281,"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":178,"y":644,"w":30,"h":30}, + "frame": {"x":470,"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":178,"y":678,"w":30,"h":30}, + "frame": {"x":504,"y":281,"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":250,"y":523,"w":30,"h":30}, + "frame": {"x":538,"y":281,"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":250,"y":557,"w":30,"h":30}, + "frame": {"x":572,"y":281,"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":212,"y":608,"w":30,"h":30}, + "frame": {"x":606,"y":281,"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":212,"y":642,"w":30,"h":30}, + "frame": {"x":640,"y":281,"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":212,"y":676,"w":30,"h":30}, + "frame": {"x":674,"y":281,"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":212,"y":710,"w":30,"h":30}, + "frame": {"x":351,"y":295,"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":414,"y":579,"w":30,"h":30}, + "frame": {"x":660,"y":315,"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":448,"y":565,"w":30,"h":30}, + "frame": {"x":558,"y":349,"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":312,"y":778,"w":30,"h":30}, + "frame": {"x":394,"y":423,"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":414,"y":715,"w":30,"h":30}, + "frame": {"x":694,"y":315,"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":448,"y":701,"w":30,"h":30}, + "frame": {"x":694,"y":349,"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":380,"y":766,"w":30,"h":30}, + "frame": {"x":696,"y":383,"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":414,"y":749,"w":30,"h":30}, + "frame": {"x":330,"y":437,"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":448,"y":735,"w":30,"h":30}, + "frame": {"x":496,"y":451,"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":414,"y":783,"w":30,"h":30}, + "frame": {"x":530,"y":451,"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":448,"y":769,"w":30,"h":30}, + "frame": {"x":564,"y":451,"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":278,"y":645,"w":30,"h":30}, + "frame": {"x":592,"y":349,"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":278,"y":679,"w":30,"h":30}, + "frame": {"x":626,"y":349,"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":278,"y":713,"w":30,"h":30}, + "frame": {"x":660,"y":349,"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":278,"y":747,"w":30,"h":30}, + "frame": {"x":458,"y":387,"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":278,"y":781,"w":30,"h":30}, + "frame": {"x":492,"y":383,"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":448,"y":599,"w":30,"h":30}, + "frame": {"x":526,"y":383,"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":414,"y":613,"w":30,"h":30}, + "frame": {"x":560,"y":383,"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":312,"y":676,"w":30,"h":30}, + "frame": {"x":594,"y":383,"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":312,"y":710,"w":30,"h":30}, + "frame": {"x":628,"y":383,"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":312,"y":744,"w":30,"h":30}, + "frame": {"x":662,"y":383,"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":448,"y":633,"w":30,"h":30}, + "frame": {"x":428,"y":423,"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":414,"y":647,"w":30,"h":30}, + "frame": {"x":462,"y":421,"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":346,"y":700,"w":30,"h":30}, + "frame": {"x":496,"y":417,"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":346,"y":734,"w":30,"h":30}, + "frame": {"x":530,"y":417,"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":346,"y":768,"w":30,"h":30}, + "frame": {"x":564,"y":417,"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":414,"y":681,"w":30,"h":30}, + "frame": {"x":598,"y":417,"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":448,"y":667,"w":30,"h":30}, + "frame": {"x":632,"y":417,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -666,23 +666,15 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":380,"y":732,"w":30,"h":30}, + "frame": {"x":666,"y":417,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, "sourceSize": {"w":32,"h":32} }, -"sprites/blueprints/advanced_processor.png": -{ - "frame": {"x":3,"y":344,"w":95,"h":92}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":2,"w":95,"h":92}, - "sourceSize": {"w":96,"h":96} -}, "sprites/blueprints/belt_left.png": { - "frame": {"x":448,"y":803,"w":30,"h":30}, + "frame": {"x":598,"y":451,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -690,7 +682,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":103,"y":340,"w":30,"h":30}, + "frame": {"x":632,"y":451,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -698,7 +690,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":382,"y":696,"w":28,"h":32}, + "frame": {"x":458,"y":351,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -714,23 +706,15 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":196,"y":315,"w":87,"h":48}, + "frame": {"x":583,"y":55,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, "sourceSize": {"w":96,"h":48} }, -"sprites/blueprints/energy_generator.png": -{ - "frame": {"x":3,"y":735,"w":89,"h":92}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":4,"y":4,"w":89,"h":92}, - "sourceSize": {"w":96,"h":96} -}, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":248,"y":419,"w":47,"h":48}, + "frame": {"x":196,"y":328,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -738,7 +722,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":299,"y":419,"w":47,"h":48}, + "frame": {"x":247,"y":301,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -746,7 +730,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":196,"y":211,"w":89,"h":48}, + "frame": {"x":480,"y":107,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -754,7 +738,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":383,"y":3,"w":96,"h":96}, + "frame": {"x":191,"y":107,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -762,7 +746,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":191,"y":159,"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}, @@ -778,7 +762,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":291,"y":159,"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}, @@ -786,7 +770,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":92,"y":535,"w":48,"h":48}, + "frame": {"x":671,"y":3,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -794,7 +778,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":92,"y":587,"w":48,"h":48}, + "frame": {"x":674,"y":55,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -802,7 +786,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":92,"y":639,"w":48,"h":48}, + "frame": {"x":664,"y":107,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -810,7 +794,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":96,"y":733,"w":48,"h":48}, + "frame": {"x":656,"y":159,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -818,7 +802,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":299,"y":471,"w":47,"h":47}, + "frame": {"x":247,"y":405,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -826,7 +810,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":287,"y":315,"w":87,"h":48}, + "frame": {"x":573,"y":107,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -834,7 +818,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":196,"y":263,"w":89,"h":48}, + "frame": {"x":380,"y":159,"w":89,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":89,"h":48}, @@ -842,7 +826,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":3,"y":535,"w":85,"h":96}, + "frame": {"x":291,"y":107,"w":85,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":85,"h":96}, @@ -850,7 +834,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":96,"y":785,"w":48,"h":48}, + "frame": {"x":92,"y":348,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -858,7 +842,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":196,"y":419,"w":48,"h":43}, + "frame": {"x":92,"y":400,"w":48,"h":43}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":48,"h":43}, @@ -866,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":92,"y":691,"w":48,"h":38}, + "frame": {"x":247,"y":259,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":10,"w":48,"h":38}, @@ -874,7 +858,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":144,"y":443,"w":48,"h":38}, + "frame": {"x":299,"y":258,"w":48,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":38}, @@ -882,63 +866,15 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":196,"y":466,"w":48,"h":38}, + "frame": {"x":195,"y":286,"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":352,"y":367,"w":34,"h":48}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":14,"y":0,"w":34,"h":48}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/blueprints/wire_crossings.png": -{ - "frame": {"x":378,"y":315,"w":34,"h":48}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":14,"y":0,"w":34,"h":48}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/blueprints/wire_left.png": -{ - "frame": {"x":466,"y":373,"w":21,"h":21}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":11,"w":21,"h":21}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/blueprints/wire_right.png": -{ - "frame": {"x":466,"y":398,"w":21,"h":21}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":11,"y":11,"w":21,"h":21}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/blueprints/wire_top.png": -{ - "frame": {"x":472,"y":259,"w":10,"h":32}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":11,"y":0,"w":10,"h":32}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/buildings/advanced_processor.png": -{ - "frame": {"x":3,"y":440,"w":94,"h":91}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":2,"w":94,"h":91}, - "sourceSize": {"w":96,"h":96} -}, "sprites/buildings/belt_left.png": { - "frame": {"x":102,"y":374,"w":30,"h":30}, + "frame": {"x":666,"y":451,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":30,"h":30}, @@ -946,7 +882,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":102,"y":408,"w":30,"h":30}, + "frame": {"x":462,"y":455,"w":30,"h":30}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":30,"h":30}, @@ -954,7 +890,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":452,"y":459,"w":28,"h":32}, + "frame": {"x":141,"y":452,"w":28,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":28,"h":32}, @@ -962,7 +898,7 @@ }, "sprites/buildings/cutter-quad.png": { - "frame": {"x":191,"y":107,"w":184,"h":48}, + "frame": {"x":383,"y":3,"w":184,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":184,"h":48}, @@ -970,20 +906,12 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":391,"y":207,"w":87,"h":48}, + "frame": {"x":565,"y":159,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, "sourceSize": {"w":96,"h":48} }, -"sprites/buildings/energy_generator.png": -{ - "frame": {"x":103,"y":244,"w":89,"h":92}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":4,"y":4,"w":89,"h":92}, - "sourceSize": {"w":96,"h":96} -}, "sprites/buildings/hub.png": { "frame": {"x":3,"y":3,"w":184,"h":185}, @@ -994,7 +922,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":350,"y":419,"w":47,"h":48}, + "frame": {"x":196,"y":380,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -1002,7 +930,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":248,"y":471,"w":47,"h":48}, + "frame": {"x":247,"y":353,"w":47,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":48}, @@ -1010,7 +938,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":289,"y":211,"w":88,"h":48}, + "frame": {"x":473,"y":159,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -1026,7 +954,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":391,"y":103,"w":96,"h":48}, + "frame": {"x":380,"y":107,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -1042,7 +970,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":391,"y":155,"w":96,"h":48}, + "frame": {"x":483,"y":55,"w":96,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":48}, @@ -1050,7 +978,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":144,"y":340,"w":48,"h":48}, + "frame": {"x":144,"y":348,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1058,7 +986,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":196,"y":367,"w":48,"h":48}, + "frame": {"x":144,"y":400,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1066,7 +994,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":248,"y":367,"w":48,"h":48}, + "frame": {"x":195,"y":234,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1074,7 +1002,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":144,"y":392,"w":48,"h":47}, + "frame": {"x":299,"y":207,"w":48,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":47}, @@ -1082,7 +1010,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":350,"y":471,"w":47,"h":47}, + "frame": {"x":196,"y":432,"w":47,"h":47}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":47}, @@ -1090,7 +1018,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":381,"y":259,"w":87,"h":48}, + "frame": {"x":103,"y":296,"w":87,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":87,"h":48}, @@ -1098,7 +1026,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":289,"y":263,"w":88,"h":48}, + "frame": {"x":103,"y":244,"w":88,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":88,"h":48}, @@ -1106,7 +1034,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":3,"y":635,"w":85,"h":96}, + "frame": {"x":3,"y":344,"w":85,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":85,"h":96}, @@ -1114,7 +1042,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":300,"y":367,"w":48,"h":48}, + "frame": {"x":247,"y":207,"w":48,"h":48}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":48,"h":48}, @@ -1122,7 +1050,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":416,"y":311,"w":47,"h":42}, + "frame": {"x":3,"y":444,"w":47,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":6,"w":47,"h":42}, @@ -1130,7 +1058,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":401,"y":419,"w":47,"h":38}, + "frame": {"x":90,"y":447,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":10,"w":47,"h":38}, @@ -1138,7 +1066,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":401,"y":461,"w":47,"h":38}, + "frame": {"x":351,"y":211,"w":47,"h":38}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":47,"h":38}, @@ -1146,55 +1074,15 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":401,"y":503,"w":47,"h":38}, + "frame": {"x":351,"y":253,"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":367,"w":34,"h":48}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":14,"y":0,"w":34,"h":48}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/buildings/wire_crossings.png": -{ - "frame": {"x":428,"y":357,"w":34,"h":48}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":14,"y":0,"w":34,"h":48}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/buildings/wire_left.png": -{ - "frame": {"x":318,"y":543,"w":21,"h":21}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":11,"w":21,"h":21}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/buildings/wire_right.png": -{ - "frame": {"x":238,"y":812,"w":21,"h":21}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":11,"y":11,"w":21,"h":21}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/buildings/wire_top.png": -{ - "frame": {"x":101,"y":472,"w":10,"h":32}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":11,"y":0,"w":10,"h":32}, - "sourceSize": {"w":32,"h":32} -}, "sprites/debug/acceptor_slot.png": { - "frame": {"x":430,"y":817,"w":14,"h":16}, + "frame": {"x":173,"y":452,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1202,7 +1090,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":123,"y":442,"w":14,"h":16}, + "frame": {"x":700,"y":445,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1210,7 +1098,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":184,"y":485,"w":8,"h":8}, + "frame": {"x":718,"y":445,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1218,7 +1106,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":200,"y":820,"w":8,"h":8}, + "frame": {"x":718,"y":457,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1226,7 +1114,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":379,"y":107,"w":8,"h":8}, + "frame": {"x":173,"y":472,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1234,39 +1122,23 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":212,"y":812,"w":22,"h":22}, + "frame": {"x":364,"y":437,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, "sourceSize": {"w":24,"h":24} }, -"sprites/misc/energy_generator_overlay.png": -{ - "frame": {"x":299,"y":522,"w":40,"h":17}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":45,"y":71,"w":40,"h":17}, - "sourceSize": {"w":96,"h":96} -}, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":379,"y":119,"w":8,"h":8}, + "frame": {"x":385,"y":295,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, "sourceSize": {"w":8,"h":8} }, -"sprites/misc/lock_direction_indicator.png": -{ - "frame": {"x":115,"y":494,"w":12,"h":10}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":1,"w":12,"h":10}, - "sourceSize": {"w":12,"h":12} -}, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":212,"y":812,"w":22,"h":22}, + "frame": {"x":364,"y":437,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":22,"h":22}, @@ -1274,7 +1146,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":218,"y":508,"w":22,"h":24}, + "frame": {"x":700,"y":417,"w":22,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":22,"h":24}, @@ -1282,7 +1154,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":101,"y":508,"w":45,"h":23}, + "frame": {"x":191,"y":207,"w":45,"h":23}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":45,"h":23}, @@ -1290,7 +1162,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":379,"y":131,"w":8,"h":8}, + "frame": {"x":708,"y":281,"w":8,"h":8}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":8,"h":8}, @@ -1298,107 +1170,19 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":452,"y":423,"w":32,"h":32}, + "frame": {"x":54,"y":444,"w":32,"h":32}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":32,"h":32}, "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/battery_empty.png": -{ - "frame": {"x":263,"y":815,"w":12,"h":16}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":0,"w":12,"h":16}, - "sourceSize": {"w":16,"h":16} -}, -"sprites/wires/battery_full.png": -{ - "frame": {"x":180,"y":820,"w":16,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":2,"w":16,"h":12}, - "sourceSize": {"w":16,"h":16} -}, -"sprites/wires/battery_low.png": -{ - "frame": {"x":123,"y":462,"w":16,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":2,"w":16,"h":12}, - "sourceSize": {"w":16,"h":16} -}, -"sprites/wires/battery_medium.png": -{ - "frame": {"x":115,"y":478,"w":16,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":2,"w":16,"h":12}, - "sourceSize": {"w":16,"h":16} -}, -"sprites/wires/negative_energy.png": -{ - "frame": {"x":472,"y":295,"w":12,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":2,"w":12,"h":12}, - "sourceSize": {"w":16,"h":16} -}, -"sprites/wires/pin_negative_accept.png": -{ - "frame": {"x":467,"y":311,"w":20,"h":27}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":6,"y":0,"w":20,"h":27}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/pin_negative_eject.png": -{ - "frame": {"x":377,"y":522,"w":18,"h":26}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":7,"y":0,"w":18,"h":26}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/pin_positive_accept.png": -{ - "frame": {"x":101,"y":442,"w":18,"h":26}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":7,"y":0,"w":18,"h":26}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/pin_positive_eject.png": -{ - "frame": {"x":467,"y":342,"w":20,"h":27}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":6,"y":0,"w":20,"h":27}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/positive_energy.png": -{ - "frame": {"x":279,"y":815,"w":12,"h":12}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":2,"w":12,"h":12}, - "sourceSize": {"w":16,"h":16} -}, -"sprites/wires/waste_piled.png": -{ - "frame": {"x":410,"y":817,"w":16,"h":16}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, - "sourceSize": {"w":16,"h":16} }}, "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "1.0", "image": "atlas0_25.png", "format": "RGBA8888", - "size": {"w":490,"h":837}, + "size": {"w":729,"h":489}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:dfc84e4381978113df4ad0cd8a5aace9:4e9bd6f6c82aaaa8a4a583cab68dc719:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:a7ec474d30eba3dcfb9e1ce36dc9a3df:a66fdbb2f105a54e9a5193362b6c2d4d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png index c58d7738..20433f95 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 07a7a7fc..e13bbcc2 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":949,"y":270,"w":51,"h":63}, + "frame": {"x":1214,"y":403,"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":849,"y":469,"w":51,"h":63}, + "frame": {"x":1214,"y":470,"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":958,"y":731,"w":51,"h":63}, + "frame": {"x":796,"y":498,"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":850,"y":859,"w":51,"h":63}, + "frame": {"x":908,"y":543,"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":905,"y":859,"w":51,"h":63}, + "frame": {"x":963,"y":543,"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":853,"y":926,"w":51,"h":63}, + "frame": {"x":865,"y":610,"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":908,"y":926,"w":51,"h":63}, + "frame": {"x":920,"y":610,"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":893,"y":1054,"w":51,"h":63}, + "frame": {"x":975,"y":610,"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":948,"y":1048,"w":51,"h":63}, + "frame": {"x":1018,"y":543,"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":850,"y":1126,"w":51,"h":63}, + "frame": {"x":1073,"y":542,"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":848,"y":703,"w":51,"h":63}, + "frame": {"x":366,"y":786,"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":467,"y":1057,"w":51,"h":63}, + "frame": {"x":421,"y":786,"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":908,"y":408,"w":51,"h":63}, + "frame": {"x":376,"y":853,"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":910,"y":536,"w":51,"h":63}, + "frame": {"x":431,"y":853,"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":965,"y":469,"w":51,"h":63}, + "frame": {"x":476,"y":786,"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":965,"y":536,"w":51,"h":63}, + "frame": {"x":486,"y":853,"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":848,"y":770,"w":51,"h":63}, + "frame": {"x":531,"y":773,"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":903,"y":664,"w":51,"h":63}, + "frame": {"x":647,"y":791,"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":903,"y":731,"w":51,"h":63}, + "frame": {"x":686,"y":498,"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":958,"y":664,"w":51,"h":63}, + "frame": {"x":741,"y":498,"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":964,"y":798,"w":51,"h":63}, + "frame": {"x":1156,"y":481,"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":740,"y":803,"w":51,"h":63}, + "frame": {"x":688,"y":565,"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":740,"y":870,"w":51,"h":63}, + "frame": {"x":743,"y":565,"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":795,"y":859,"w":51,"h":63}, + "frame": {"x":690,"y":693,"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":728,"y":1059,"w":51,"h":63}, + "frame": {"x":798,"y":565,"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":798,"y":926,"w":51,"h":63}, + "frame": {"x":745,"y":693,"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":783,"y":1059,"w":51,"h":63}, + "frame": {"x":810,"y":632,"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":838,"y":1059,"w":51,"h":63}, + "frame": {"x":853,"y":543,"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":827,"y":286,"w":57,"h":57}, + "frame": {"x":1269,"y":495,"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":888,"y":286,"w":57,"h":57}, + "frame": {"x":373,"y":725,"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":903,"y":798,"w":57,"h":57}, + "frame": {"x":1030,"y":610,"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":789,"y":1126,"w":57,"h":57}, + "frame": {"x":763,"y":821,"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":905,"y":1121,"w":57,"h":57}, + "frame": {"x":824,"y":760,"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":905,"y":1182,"w":57,"h":57}, + "frame": {"x":824,"y":821,"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":372,"y":1261,"w":57,"h":57}, + "frame": {"x":861,"y":699,"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":372,"y":1322,"w":57,"h":57}, + "frame": {"x":922,"y":677,"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":433,"y":1260,"w":57,"h":57}, + "frame": {"x":983,"y":677,"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":433,"y":1321,"w":57,"h":57}, + "frame": {"x":1044,"y":671,"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":873,"y":347,"w":57,"h":57}, + "frame": {"x":434,"y":725,"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":847,"y":408,"w":57,"h":57}, + "frame": {"x":586,"y":791,"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":849,"y":536,"w":57,"h":57}, + "frame": {"x":851,"y":482,"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":831,"y":597,"w":57,"h":57}, + "frame": {"x":912,"y":482,"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":522,"y":1077,"w":57,"h":57}, + "frame": {"x":973,"y":482,"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":904,"y":475,"w":57,"h":57}, + "frame": {"x":1034,"y":481,"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":934,"y":347,"w":57,"h":57}, + "frame": {"x":1095,"y":481,"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":963,"y":408,"w":57,"h":57}, + "frame": {"x":688,"y":632,"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":892,"y":603,"w":57,"h":57}, + "frame": {"x":749,"y":632,"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":953,"y":603,"w":57,"h":57}, + "frame": {"x":800,"y":699,"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":737,"y":937,"w":57,"h":57}, + "frame": {"x":1091,"y":609,"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":731,"y":998,"w":57,"h":57}, + "frame": {"x":1128,"y":548,"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":792,"y":998,"w":57,"h":57}, + "frame": {"x":1152,"y":609,"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":960,"y":865,"w":57,"h":57}, + "frame": {"x":1189,"y":548,"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":963,"y":926,"w":57,"h":57}, + "frame": {"x":1213,"y":609,"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":963,"y":987,"w":57,"h":57}, + "frame": {"x":702,"y":760,"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":853,"y":993,"w":57,"h":57}, + "frame": {"x":763,"y":760,"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":728,"y":1126,"w":57,"h":57}, + "frame": {"x":702,"y":821,"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":469,"y":1187,"w":57,"h":57}, + "frame": {"x":1105,"y":670,"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":494,"y":1248,"w":57,"h":57}, + "frame": {"x":1166,"y":670,"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":774,"y":1187,"w":57,"h":57}, + "frame": {"x":1129,"y":792,"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":921,"y":1243,"w":57,"h":57}, + "frame": {"x":1190,"y":853,"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":921,"y":1304,"w":57,"h":57}, + "frame": {"x":1251,"y":853,"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":494,"y":1370,"w":57,"h":57}, + "frame": {"x":541,"y":852,"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":555,"y":1370,"w":57,"h":57}, + "frame": {"x":602,"y":858,"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":616,"y":1370,"w":57,"h":57}, + "frame": {"x":1274,"y":556,"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":677,"y":1370,"w":57,"h":57}, + "frame": {"x":663,"y":882,"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":738,"y":1370,"w":57,"h":57}, + "frame": {"x":724,"y":882,"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":494,"y":1309,"w":57,"h":57}, + "frame": {"x":1227,"y":670,"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":530,"y":1187,"w":57,"h":57}, + "frame": {"x":885,"y":760,"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":555,"y":1248,"w":57,"h":57}, + "frame": {"x":885,"y":821,"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":555,"y":1309,"w":57,"h":57}, + "frame": {"x":946,"y":738,"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":591,"y":1187,"w":57,"h":57}, + "frame": {"x":946,"y":799,"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":616,"y":1248,"w":57,"h":57}, + "frame": {"x":1007,"y":738,"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":616,"y":1309,"w":57,"h":57}, + "frame": {"x":1007,"y":799,"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":652,"y":1187,"w":57,"h":57}, + "frame": {"x":1068,"y":732,"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":713,"y":1187,"w":57,"h":57}, + "frame": {"x":1068,"y":793,"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":677,"y":1248,"w":57,"h":57}, + "frame": {"x":1129,"y":731,"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":677,"y":1309,"w":57,"h":57}, + "frame": {"x":1190,"y":731,"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":738,"y":1248,"w":57,"h":57}, + "frame": {"x":1190,"y":792,"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":738,"y":1309,"w":57,"h":57}, + "frame": {"x":1251,"y":731,"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":835,"y":1193,"w":57,"h":57}, + "frame": {"x":1251,"y":792,"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":799,"y":1254,"w":57,"h":57}, + "frame": {"x":946,"y":860,"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":799,"y":1315,"w":57,"h":57}, + "frame": {"x":1007,"y":860,"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":860,"y":1254,"w":57,"h":57}, + "frame": {"x":1068,"y":854,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -666,23 +666,15 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":860,"y":1315,"w":57,"h":57}, + "frame": {"x":1129,"y":853,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, "sourceSize": {"w":63,"h":63} }, -"sprites/blueprints/advanced_processor.png": -{ - "frame": {"x":3,"y":669,"w":188,"h":181}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":4,"y":5,"w":188,"h":181}, - "sourceSize": {"w":192,"h":192} -}, "sprites/blueprints/belt_left.png": { - "frame": {"x":765,"y":278,"w":58,"h":58}, + "frame": {"x":1272,"y":371,"w":58,"h":58}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":5,"w":58,"h":58}, @@ -690,7 +682,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":765,"y":340,"w":58,"h":58}, + "frame": {"x":1269,"y":433,"w":58,"h":58}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":58,"h":58}, @@ -698,7 +690,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":944,"y":203,"w":53,"h":63}, + "frame": {"x":674,"y":399,"w":53,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":53,"h":63}, @@ -714,23 +706,15 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":194,"y":861,"w":172,"h":96}, + "frame": {"x":1143,"y":103,"w":172,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":172,"h":96}, "sourceSize": {"w":192,"h":96} }, -"sprites/blueprints/energy_generator.png": -{ - "frame": {"x":199,"y":474,"w":175,"h":183}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":9,"y":9,"w":175,"h":183}, - "sourceSize": {"w":192,"h":192} -}, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":373,"y":1160,"w":92,"h":96}, + "frame": {"x":399,"y":547,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -738,7 +722,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":735,"y":603,"w":92,"h":96}, + "frame": {"x":495,"y":499,"w":92,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":96}, @@ -746,7 +730,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":556,"y":603,"w":175,"h":96}, + "frame": {"x":936,"y":203,"w":175,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":175,"h":96}, @@ -754,7 +738,7 @@ }, "sprites/blueprints/painter-double.png": { - "frame": {"x":751,"y":3,"w":192,"h":192}, + "frame": {"x":373,"y":203,"w":192,"h":192}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":192}, @@ -762,7 +746,7 @@ }, "sprites/blueprints/painter-mirrored.png": { - "frame": {"x":373,"y":303,"w":192,"h":96}, + "frame": {"x":751,"y":103,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -778,7 +762,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":569,"y":303,"w":192,"h":96}, + "frame": {"x":1121,"y":3,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -786,7 +770,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":553,"y":703,"w":96,"h":96}, + "frame": {"x":199,"y":574,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -794,7 +778,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":274,"y":1161,"w":95,"h":96}, + "frame": {"x":178,"y":862,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":95,"h":96}, @@ -802,7 +786,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":653,"y":703,"w":96,"h":96}, + "frame": {"x":299,"y":574,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -810,7 +794,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":641,"y":803,"w":95,"h":93}, + "frame": {"x":575,"y":399,"w":95,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":95,"h":93}, @@ -818,7 +802,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":349,"y":1063,"w":93,"h":93}, + "frame": {"x":593,"y":694,"w":93,"h":93}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":1,"w":93,"h":93}, @@ -826,7 +810,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":194,"y":961,"w":171,"h":96}, + "frame": {"x":1115,"y":203,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -834,7 +818,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":199,"y":661,"w":175,"h":96}, + "frame": {"x":740,"y":303,"w":175,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":175,"h":96}, @@ -842,7 +826,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":3,"y":1037,"w":167,"h":192}, + "frame": {"x":569,"y":203,"w":167,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":167,"h":192}, @@ -850,7 +834,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":174,"y":1161,"w":96,"h":96}, + "frame": {"x":173,"y":674,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -858,7 +842,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":752,"y":502,"w":93,"h":84}, + "frame": {"x":173,"y":774,"w":93,"h":84}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":12,"w":93,"h":84}, @@ -866,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":535,"y":998,"w":93,"h":75}, + "frame": {"x":828,"y":403,"w":93,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":21,"w":93,"h":75}, @@ -874,7 +858,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":369,"y":984,"w":94,"h":75}, + "frame": {"x":495,"y":694,"w":94,"h":75}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":94,"h":75}, @@ -882,63 +866,15 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":751,"y":199,"w":93,"h":75}, + "frame": {"x":925,"y":403,"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":947,"y":3,"w":66,"h":96}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":30,"y":0,"w":66,"h":96}, - "sourceSize": {"w":96,"h":96} -}, -"sprites/blueprints/wire_crossings.png": -{ - "frame": {"x":472,"y":789,"w":66,"h":96}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":30,"y":0,"w":66,"h":96}, - "sourceSize": {"w":96,"h":96} -}, -"sprites/blueprints/wire_left.png": -{ - "frame": {"x":921,"y":1365,"w":40,"h":40}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":23,"w":40,"h":40}, - "sourceSize": {"w":63,"h":63} -}, -"sprites/blueprints/wire_right.png": -{ - "frame": {"x":831,"y":658,"w":40,"h":41}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":23,"y":22,"w":40,"h":41}, - "sourceSize": {"w":63,"h":63} -}, -"sprites/blueprints/wire_top.png": -{ - "frame": {"x":446,"y":1063,"w":17,"h":63}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":23,"y":0,"w":17,"h":63}, - "sourceSize": {"w":63,"h":63} -}, -"sprites/buildings/advanced_processor.png": -{ - "frame": {"x":3,"y":854,"w":187,"h":179}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":5,"y":6,"w":187,"h":179}, - "sourceSize": {"w":192,"h":192} -}, "sprites/buildings/belt_left.png": { - "frame": {"x":799,"y":1376,"w":57,"h":57}, + "frame": {"x":785,"y":882,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":6,"w":57,"h":57}, @@ -946,7 +882,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":860,"y":1376,"w":57,"h":57}, + "frame": {"x":846,"y":882,"w":57,"h":57}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":6,"w":57,"h":57}, @@ -954,7 +890,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":949,"y":270,"w":51,"h":63}, + "frame": {"x":1214,"y":403,"w":51,"h":63}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":6,"y":0,"w":51,"h":63}, @@ -962,7 +898,7 @@ }, "sprites/buildings/cutter-quad.png": { - "frame": {"x":373,"y":203,"w":366,"h":96}, + "frame": {"x":751,"y":3,"w":366,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":366,"h":96}, @@ -970,20 +906,12 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":174,"y":1061,"w":171,"h":96}, + "frame": {"x":1097,"y":303,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, "sourceSize": {"w":192,"h":96} }, -"sprites/buildings/energy_generator.png": -{ - "frame": {"x":378,"y":403,"w":174,"h":182}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":10,"y":10,"w":174,"h":182}, - "sourceSize": {"w":192,"h":192} -}, "sprites/buildings/hub.png": { "frame": {"x":3,"y":3,"w":366,"h":367}, @@ -994,7 +922,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":753,"y":703,"w":91,"h":95}, + "frame": {"x":591,"y":496,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -1002,7 +930,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":752,"y":403,"w":91,"h":95}, + "frame": {"x":593,"y":595,"w":91,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":91,"h":95}, @@ -1010,7 +938,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":378,"y":589,"w":174,"h":96}, + "frame": {"x":919,"y":303,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -1026,7 +954,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":556,"y":403,"w":192,"h":96}, + "frame": {"x":740,"y":203,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -1042,7 +970,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":556,"y":503,"w":192,"h":96}, + "frame": {"x":947,"y":103,"w":192,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":192,"h":96}, @@ -1050,7 +978,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":273,"y":1261,"w":95,"h":96}, + "frame": {"x":277,"y":861,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -1058,7 +986,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":373,"y":789,"w":95,"h":96}, + "frame": {"x":377,"y":447,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":95,"h":96}, @@ -1066,7 +994,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":542,"y":803,"w":95,"h":96}, + "frame": {"x":476,"y":399,"w":95,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":95,"h":96}, @@ -1074,7 +1002,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":370,"y":889,"w":94,"h":91}, + "frame": {"x":495,"y":599,"w":94,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":94,"h":91}, @@ -1082,7 +1010,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":538,"y":903,"w":93,"h":91}, + "frame": {"x":731,"y":403,"w":93,"h":91}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":2,"w":93,"h":91}, @@ -1090,7 +1018,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":378,"y":689,"w":171,"h":96}, + "frame": {"x":3,"y":865,"w":171,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":11,"y":0,"w":171,"h":96}, @@ -1098,7 +1026,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":195,"y":761,"w":174,"h":96}, + "frame": {"x":199,"y":474,"w":174,"h":96}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":174,"h":96}, @@ -1106,7 +1034,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":3,"y":1233,"w":166,"h":192}, + "frame": {"x":3,"y":669,"w":166,"h":192}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":166,"h":192}, @@ -1114,7 +1042,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":173,"y":1261,"w":96,"h":96}, + "frame": {"x":273,"y":674,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, @@ -1122,7 +1050,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":848,"y":199,"w":92,"h":83}, + "frame": {"x":270,"y":774,"w":92,"h":83}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":13,"w":92,"h":83}, @@ -1130,7 +1058,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":641,"y":900,"w":92,"h":74}, + "frame": {"x":399,"y":647,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":22,"w":92,"h":74}, @@ -1138,7 +1066,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":635,"y":978,"w":92,"h":74}, + "frame": {"x":1022,"y":403,"w":92,"h":74}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":92,"h":74}, @@ -1146,55 +1074,15 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":632,"y":1056,"w":92,"h":74}, + "frame": {"x":1118,"y":403,"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":947,"y":103,"w":66,"h":96}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":30,"y":0,"w":66,"h":96}, - "sourceSize": {"w":96,"h":96} -}, -"sprites/buildings/wire_crossings.png": -{ - "frame": {"x":468,"y":889,"w":66,"h":96}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":30,"y":0,"w":66,"h":96}, - "sourceSize": {"w":96,"h":96} -}, -"sprites/buildings/wire_left.png": -{ - "frame": {"x":965,"y":1365,"w":40,"h":40}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":23,"w":40,"h":40}, - "sourceSize": {"w":63,"h":63} -}, -"sprites/buildings/wire_right.png": -{ - "frame": {"x":372,"y":1383,"w":40,"h":40}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":23,"y":23,"w":40,"h":40}, - "sourceSize": {"w":63,"h":63} -}, -"sprites/buildings/wire_top.png": -{ - "frame": {"x":1001,"y":203,"w":17,"h":63}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":23,"y":0,"w":17,"h":63}, - "sourceSize": {"w":63,"h":63} -}, "sprites/debug/acceptor_slot.png": { - "frame": {"x":416,"y":1383,"w":26,"h":32}, + "frame": {"x":1290,"y":255,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -1202,7 +1090,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":266,"y":1395,"w":26,"h":32}, + "frame": {"x":422,"y":920,"w":26,"h":32}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":26,"h":32}, @@ -1210,7 +1098,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":446,"y":1130,"w":14,"h":16}, + "frame": {"x":1317,"y":3,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1218,7 +1106,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":875,"y":684,"w":15,"h":15}, + "frame": {"x":476,"y":499,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":1,"w":15,"h":15}, @@ -1226,7 +1114,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":416,"y":1419,"w":15,"h":15}, + "frame": {"x":476,"y":518,"w":15,"h":15}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":15,"h":15}, @@ -1234,39 +1122,23 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":914,"y":993,"w":42,"h":42}, + "frame": {"x":376,"y":920,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, "sourceSize": {"w":48,"h":48} }, -"sprites/misc/energy_generator_overlay.png": -{ - "frame": {"x":266,"y":1361,"w":78,"h":30}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":91,"y":144,"w":78,"h":30}, - "sourceSize": {"w":192,"h":192} -}, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":174,"y":1037,"w":16,"h":16}, + "frame": {"x":1320,"y":255,"w":16,"h":16}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":16}, "sourceSize": {"w":16,"h":16} }, -"sprites/misc/lock_direction_indicator.png": -{ - "frame": {"x":875,"y":664,"w":24,"h":16}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":4,"w":24,"h":16}, - "sourceSize": {"w":24,"h":24} -}, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":914,"y":993,"w":42,"h":42}, + "frame": {"x":376,"y":920,"w":42,"h":42}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":3,"w":42,"h":42}, @@ -1274,7 +1146,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":827,"y":347,"w":42,"h":48}, + "frame": {"x":1290,"y":203,"w":42,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":3,"y":0,"w":42,"h":48}, @@ -1282,7 +1154,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":173,"y":1361,"w":89,"h":44}, + "frame": {"x":373,"y":399,"w":89,"h":44}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":1,"w":89,"h":44}, @@ -1290,7 +1162,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1004,"y":270,"w":14,"h":16}, + "frame": {"x":377,"y":547,"w":14,"h":16}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":14,"h":16}, @@ -1298,107 +1170,19 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":467,"y":989,"w":64,"h":64}, + "frame": {"x":1272,"y":303,"w":64,"h":64}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":64,"h":64}, "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/battery_empty.png": -{ - "frame": {"x":348,"y":1361,"w":20,"h":32}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":6,"y":0,"w":20,"h":32}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/battery_full.png": -{ - "frame": {"x":921,"y":1409,"w":30,"h":21}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":6,"w":30,"h":21}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/battery_low.png": -{ - "frame": {"x":955,"y":1409,"w":30,"h":21}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":6,"w":30,"h":21}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/battery_medium.png": -{ - "frame": {"x":173,"y":1409,"w":30,"h":21}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":6,"w":30,"h":21}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/negative_energy.png": -{ - "frame": {"x":207,"y":1409,"w":22,"h":22}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":5,"y":5,"w":22,"h":22}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/pin_negative_accept.png": -{ - "frame": {"x":583,"y":1077,"w":38,"h":53}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":13,"y":0,"w":38,"h":53}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/pin_negative_eject.png": -{ - "frame": {"x":966,"y":1115,"w":33,"h":51}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":15,"y":0,"w":33,"h":51}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/pin_positive_accept.png": -{ - "frame": {"x":966,"y":1170,"w":33,"h":51}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":15,"y":0,"w":33,"h":51}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/pin_positive_eject.png": -{ - "frame": {"x":795,"y":802,"w":38,"h":53}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":13,"y":0,"w":38,"h":53}, - "sourceSize": {"w":64,"h":64} -}, -"sprites/wires/positive_energy.png": -{ - "frame": {"x":233,"y":1409,"w":22,"h":22}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":5,"y":5,"w":22,"h":22}, - "sourceSize": {"w":32,"h":32} -}, -"sprites/wires/waste_piled.png": -{ - "frame": {"x":446,"y":1382,"w":30,"h":29}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":1,"y":1,"w":30,"h":29}, - "sourceSize": {"w":32,"h":32} }}, "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "1.0", "image": "atlas0_50.png", "format": "RGBA8888", - "size": {"w":1023,"h":1437}, + "size": {"w":1339,"h":965}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:dfc84e4381978113df4ad0cd8a5aace9:4e9bd6f6c82aaaa8a4a583cab68dc719:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:a7ec474d30eba3dcfb9e1ce36dc9a3df:a66fdbb2f105a54e9a5193362b6c2d4d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png index 020e7ecf..80297cd3 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 e03e4e6b..3858baf9 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":1103,"y":739,"w":77,"h":95}, + "frame": {"x":945,"y":1268,"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":1184,"y":737,"w":77,"h":95}, + "frame": {"x":1026,"y":1244,"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":1468,"y":1511,"w":77,"h":95}, + "frame": {"x":1668,"y":446,"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":1661,"y":1220,"w":77,"h":95}, + "frame": {"x":1269,"y":1243,"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":1580,"y":1301,"w":77,"h":95}, + "frame": {"x":1350,"y":1243,"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":1661,"y":1319,"w":77,"h":95}, + "frame": {"x":1431,"y":1243,"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":1549,"y":1400,"w":77,"h":95}, + "frame": {"x":1557,"y":1332,"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":1549,"y":1499,"w":77,"h":95}, + "frame": {"x":1638,"y":1332,"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":1558,"y":1598,"w":77,"h":95}, + "frame": {"x":1719,"y":1332,"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":1630,"y":1418,"w":77,"h":95}, + "frame": {"x":1800,"y":1322,"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":1355,"y":683,"w":77,"h":95}, + "frame": {"x":1839,"y":394,"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":1445,"y":759,"w":77,"h":95}, + "frame": {"x":1114,"y":595,"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":1445,"y":858,"w":77,"h":95}, + "frame": {"x":1130,"y":874,"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":1184,"y":836,"w":77,"h":95}, + "frame": {"x":1107,"y":1243,"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":1177,"y":935,"w":77,"h":95}, + "frame": {"x":1211,"y":874,"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":1238,"y":1180,"w":77,"h":95}, + "frame": {"x":1292,"y":864,"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":1238,"y":1279,"w":77,"h":95}, + "frame": {"x":1188,"y":1243,"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":843,"y":1478,"w":77,"h":95}, + "frame": {"x":1310,"y":963,"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":847,"y":1330,"w":77,"h":95}, + "frame": {"x":1373,"y":864,"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":1468,"y":1412,"w":77,"h":95}, + "frame": {"x":1391,"y":963,"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":1588,"y":1004,"w":77,"h":95}, + "frame": {"x":1454,"y":864,"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":1669,"y":1022,"w":77,"h":95}, + "frame": {"x":1472,"y":963,"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":1499,"y":1074,"w":77,"h":95}, + "frame": {"x":1535,"y":864,"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":1499,"y":1173,"w":77,"h":95}, + "frame": {"x":1553,"y":963,"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":1499,"y":1272,"w":77,"h":95}, + "frame": {"x":1634,"y":953,"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":1580,"y":1103,"w":77,"h":95}, + "frame": {"x":1715,"y":953,"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":1580,"y":1202,"w":77,"h":95}, + "frame": {"x":1839,"y":493,"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":1661,"y":1121,"w":77,"h":95}, + "frame": {"x":1796,"y":863,"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":1672,"y":554,"w":86,"h":86}, + "frame": {"x":1195,"y":594,"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":1535,"y":624,"w":86,"h":86}, + "frame": {"x":1285,"y":594,"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":1706,"y":842,"w":86,"h":86}, + "frame": {"x":1220,"y":973,"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":1304,"y":1052,"w":86,"h":86}, + "frame": {"x":1474,"y":683,"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":1394,"y":1052,"w":86,"h":86}, + "frame": {"x":1564,"y":683,"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":1319,"y":1142,"w":86,"h":86}, + "frame": {"x":1645,"y":593,"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":1409,"y":1142,"w":86,"h":86}, + "frame": {"x":1654,"y":683,"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":1319,"y":1232,"w":86,"h":86}, + "frame": {"x":1749,"y":443,"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":1409,"y":1232,"w":86,"h":86}, + "frame": {"x":1458,"y":774,"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":1319,"y":1322,"w":86,"h":86}, + "frame": {"x":1548,"y":773,"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":1625,"y":644,"w":86,"h":86}, + "frame": {"x":1114,"y":694,"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":1265,"y":683,"w":86,"h":86}, + "frame": {"x":1204,"y":684,"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":1265,"y":773,"w":86,"h":86}, + "frame": {"x":1294,"y":684,"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":1436,"y":669,"w":86,"h":86}, + "frame": {"x":1098,"y":784,"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":1355,"y":782,"w":86,"h":86}, + "frame": {"x":1130,"y":973,"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":1526,"y":714,"w":86,"h":86}, + "frame": {"x":1112,"y":1063,"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":1616,"y":734,"w":86,"h":86}, + "frame": {"x":1086,"y":1153,"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":1526,"y":804,"w":86,"h":86}, + "frame": {"x":1107,"y":1342,"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":1616,"y":824,"w":86,"h":86}, + "frame": {"x":1188,"y":784,"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":1706,"y":752,"w":86,"h":86}, + "frame": {"x":1278,"y":774,"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":1526,"y":894,"w":86,"h":86}, + "frame": {"x":1202,"y":1063,"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":1616,"y":914,"w":86,"h":86}, + "frame": {"x":1176,"y":1153,"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":1706,"y":932,"w":86,"h":86}, + "frame": {"x":1197,"y":1342,"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":1265,"y":863,"w":86,"h":86}, + "frame": {"x":1375,"y":594,"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":1355,"y":872,"w":86,"h":86}, + "frame": {"x":1465,"y":593,"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":1258,"y":953,"w":86,"h":86}, + "frame": {"x":1555,"y":593,"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":1348,"y":962,"w":86,"h":86}, + "frame": {"x":1384,"y":684,"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":1214,"y":1043,"w":86,"h":86}, + "frame": {"x":1368,"y":774,"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":1409,"y":1322,"w":86,"h":86}, + "frame": {"x":1638,"y":773,"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":928,"y":1328,"w":86,"h":86}, + "frame": {"x":1616,"y":863,"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":1015,"y":1688,"w":86,"h":86}, + "frame": {"x":1652,"y":1052,"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":1105,"y":1687,"w":86,"h":86}, + "frame": {"x":1602,"y":1242,"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":1198,"y":1558,"w":86,"h":86}, + "frame": {"x":1626,"y":1152,"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":1195,"y":1648,"w":86,"h":86}, + "frame": {"x":1716,"y":1142,"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":1288,"y":1592,"w":86,"h":86}, + "frame": {"x":1806,"y":1142,"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":1378,"y":1592,"w":86,"h":86}, + "frame": {"x":1692,"y":1242,"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":1285,"y":1682,"w":86,"h":86}, + "frame": {"x":1782,"y":1232,"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":1375,"y":1682,"w":86,"h":86}, + "frame": {"x":1744,"y":623,"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":1018,"y":1328,"w":86,"h":86}, + "frame": {"x":1706,"y":863,"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":1108,"y":1327,"w":86,"h":86}, + "frame": {"x":1728,"y":773,"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":928,"y":1418,"w":86,"h":86}, + "frame": {"x":1749,"y":533,"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":1018,"y":1418,"w":86,"h":86}, + "frame": {"x":1796,"y":962,"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":1108,"y":1417,"w":86,"h":86}, + "frame": {"x":1266,"y":1153,"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":924,"y":1508,"w":86,"h":86}, + "frame": {"x":1287,"y":1342,"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":1014,"y":1508,"w":86,"h":86}, + "frame": {"x":1292,"y":1063,"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":925,"y":1598,"w":86,"h":86}, + "frame": {"x":1382,"y":1062,"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":1015,"y":1598,"w":86,"h":86}, + "frame": {"x":1472,"y":1062,"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":925,"y":1688,"w":86,"h":86}, + "frame": {"x":1562,"y":1062,"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":1198,"y":1378,"w":86,"h":86}, + "frame": {"x":1742,"y":1052,"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":1198,"y":1468,"w":86,"h":86}, + "frame": {"x":1832,"y":1052,"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":1288,"y":1412,"w":86,"h":86}, + "frame": {"x":1377,"y":1342,"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":1378,"y":1412,"w":86,"h":86}, + "frame": {"x":1356,"y":1153,"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":1288,"y":1502,"w":86,"h":86}, + "frame": {"x":1446,"y":1152,"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":1378,"y":1502,"w":86,"h":86}, + "frame": {"x":1536,"y":1152,"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":1108,"y":1507,"w":86,"h":86}, + "frame": {"x":1467,"y":1342,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -666,23 +666,15 @@ }, "sprites/belt/right_27.png": { - "frame": {"x":1105,"y":1597,"w":86,"h":86}, + "frame": {"x":1512,"y":1242,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, "sourceSize": {"w":95,"h":95} }, -"sprites/blueprints/advanced_processor.png": -{ - "frame": {"x":3,"y":994,"w":281,"h":270}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":7,"y":8,"w":281,"h":270}, - "sourceSize": {"w":288,"h":288} -}, "sprites/blueprints/belt_left.png": { - "frame": {"x":3,"y":1688,"w":87,"h":87}, + "frame": {"x":995,"y":1153,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":8,"w":87,"h":87}, @@ -690,7 +682,7 @@ }, "sprites/blueprints/belt_right.png": { - "frame": {"x":94,"y":1688,"w":87,"h":87}, + "frame": {"x":854,"y":1268,"w":87,"h":87}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":8,"w":87,"h":87}, @@ -698,7 +690,7 @@ }, "sprites/blueprints/belt_top.png": { - "frame": {"x":1715,"y":653,"w":79,"h":95}, + "frame": {"x":1839,"y":295,"w":79,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":8,"y":0,"w":79,"h":95}, @@ -714,23 +706,15 @@ }, "sprites/blueprints/cutter.png": { - "frame": {"x":554,"y":886,"w":256,"h":144}, + "frame": {"x":1411,"y":150,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, "sourceSize": {"w":288,"h":144} }, -"sprites/blueprints/energy_generator.png": -{ - "frame": {"x":288,"y":996,"w":262,"h":274}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":14,"y":14,"w":262,"h":274}, - "sourceSize": {"w":288,"h":288} -}, "sprites/blueprints/miner-chainable.png": { - "frame": {"x":1671,"y":3,"w":136,"h":143}, + "frame": {"x":850,"y":890,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -738,7 +722,7 @@ }, "sprites/blueprints/miner.png": { - "frame": {"x":1098,"y":1180,"w":136,"h":143}, + "frame": {"x":990,"y":890,"w":136,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":143}, @@ -746,7 +730,7 @@ }, "sprites/blueprints/mixer.png": { - "frame": {"x":3,"y":1540,"w":261,"h":144}, + "frame": {"x":1139,"y":446,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -778,7 +762,7 @@ }, "sprites/blueprints/painter.png": { - "frame": {"x":1411,"y":150,"w":288,"h":144}, + "frame": {"x":847,"y":299,"w":288,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, @@ -786,7 +770,7 @@ }, "sprites/blueprints/rotater-ccw.png": { - "frame": {"x":702,"y":1182,"w":143,"h":144}, + "frame": {"x":820,"y":595,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -794,7 +778,7 @@ }, "sprites/blueprints/rotater-fl.png": { - "frame": {"x":849,"y":1180,"w":142,"h":144}, + "frame": {"x":559,"y":885,"w":142,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":0,"w":142,"h":144}, @@ -802,7 +786,7 @@ }, "sprites/blueprints/rotater.png": { - "frame": {"x":700,"y":1330,"w":143,"h":144}, + "frame": {"x":967,"y":595,"w":143,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":143,"h":144}, @@ -810,7 +794,7 @@ }, "sprites/blueprints/splitter-compact-inverse.png": { - "frame": {"x":552,"y":1478,"w":142,"h":138}, + "frame": {"x":283,"y":1286,"w":142,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":142,"h":138}, @@ -818,7 +802,7 @@ }, "sprites/blueprints/splitter-compact.png": { - "frame": {"x":1241,"y":298,"w":139,"h":138}, + "frame": {"x":429,"y":1286,"w":139,"h":138}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":2,"w":139,"h":138}, @@ -826,7 +810,7 @@ }, "sprites/blueprints/splitter.png": { - "frame": {"x":554,"y":1034,"w":256,"h":144}, + "frame": {"x":1431,"y":298,"w":256,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":144}, @@ -834,7 +818,7 @@ }, "sprites/blueprints/stacker.png": { - "frame": {"x":847,"y":591,"w":261,"h":144}, + "frame": {"x":295,"y":704,"w":261,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":13,"y":0,"w":261,"h":144}, @@ -842,7 +826,7 @@ }, "sprites/blueprints/trash-storage.png": { - "frame": {"x":847,"y":299,"w":250,"h":288}, + "frame": {"x":1671,"y":3,"w":250,"h":288}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":21,"y":0,"w":250,"h":288}, @@ -850,7 +834,7 @@ }, "sprites/blueprints/trash.png": { - "frame": {"x":554,"y":1182,"w":144,"h":144}, + "frame": {"x":1691,"y":295,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -858,7 +842,7 @@ }, "sprites/blueprints/underground_belt_entry-tier2.png": { - "frame": {"x":1101,"y":445,"w":138,"h":125}, + "frame": {"x":543,"y":1103,"w":138,"h":125}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":19,"w":138,"h":125}, @@ -866,7 +850,7 @@ }, "sprites/blueprints/underground_belt_entry.png": { - "frame": {"x":1527,"y":438,"w":138,"h":112}, + "frame": {"x":828,"y":1037,"w":138,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":32,"w":138,"h":112}, @@ -874,7 +858,7 @@ }, "sprites/blueprints/underground_belt_exit-tier2.png": { - "frame": {"x":1384,"y":438,"w":139,"h":112}, + "frame": {"x":685,"y":1037,"w":139,"h":112}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":4,"y":0,"w":139,"h":112}, @@ -882,63 +866,15 @@ }, "sprites/blueprints/underground_belt_exit.png": { - "frame": {"x":1669,"y":438,"w":138,"h":112}, + "frame": {"x":970,"y":1037,"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":1703,"y":150,"w":99,"h":144}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":45,"y":0,"w":99,"h":144}, - "sourceSize": {"w":144,"h":144} -}, -"sprites/blueprints/wire_crossings.png": -{ - "frame": {"x":995,"y":1180,"w":99,"h":144}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":45,"y":0,"w":99,"h":144}, - "sourceSize": {"w":144,"h":144} -}, -"sprites/blueprints/wire_left.png": -{ - "frame": {"x":441,"y":1698,"w":60,"h":60}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":35,"w":60,"h":60}, - "sourceSize": {"w":95,"h":95} -}, -"sprites/blueprints/wire_right.png": -{ - "frame": {"x":377,"y":1698,"w":60,"h":61}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":35,"y":34,"w":60,"h":61}, - "sourceSize": {"w":95,"h":95} -}, -"sprites/blueprints/wire_top.png": -{ - "frame": {"x":1772,"y":298,"w":25,"h":95}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":35,"y":0,"w":25,"h":95}, - "sourceSize": {"w":95,"h":95} -}, -"sprites/buildings/advanced_processor.png": -{ - "frame": {"x":3,"y":1268,"w":280,"h":268}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":8,"y":9,"w":280,"h":268}, - "sourceSize": {"w":288,"h":288} -}, "sprites/buildings/belt_left.png": { - "frame": {"x":1468,"y":1610,"w":86,"h":86}, + "frame": {"x":1834,"y":668,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":9,"w":86,"h":86}, @@ -946,7 +882,7 @@ }, "sprites/buildings/belt_right.png": { - "frame": {"x":1498,"y":984,"w":86,"h":86}, + "frame": {"x":1818,"y":758,"w":86,"h":86}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":9,"w":86,"h":86}, @@ -954,7 +890,7 @@ }, "sprites/buildings/belt_top.png": { - "frame": {"x":1103,"y":739,"w":77,"h":95}, + "frame": {"x":945,"y":1268,"w":77,"h":95}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":9,"y":0,"w":77,"h":95}, @@ -970,20 +906,12 @@ }, "sprites/buildings/cutter.png": { - "frame": {"x":814,"y":886,"w":256,"h":143}, + "frame": {"x":255,"y":999,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, "sourceSize": {"w":288,"h":144} }, -"sprites/buildings/energy_generator.png": -{ - "frame": {"x":287,"y":1274,"w":261,"h":273}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":15,"y":15,"w":261,"h":273}, - "sourceSize": {"w":288,"h":288} -}, "sprites/buildings/hub.png": { "frame": {"x":3,"y":3,"w":548,"h":549}, @@ -994,7 +922,7 @@ }, "sprites/buildings/miner-chainable.png": { - "frame": {"x":1074,"y":1034,"w":136,"h":142}, + "frame": {"x":3,"y":1286,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -1002,7 +930,7 @@ }, "sprites/buildings/miner.png": { - "frame": {"x":1101,"y":299,"w":136,"h":142}, + "frame": {"x":143,"y":1286,"w":136,"h":142}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":136,"h":142}, @@ -1010,7 +938,7 @@ }, "sprites/buildings/mixer.png": { - "frame": {"x":839,"y":739,"w":260,"h":143}, + "frame": {"x":295,"y":852,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -1026,7 +954,7 @@ }, "sprites/buildings/painter-mirrored.png": { - "frame": {"x":555,"y":590,"w":288,"h":144}, + "frame": {"x":1139,"y":298,"w":288,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, @@ -1042,7 +970,7 @@ }, "sprites/buildings/painter.png": { - "frame": {"x":547,"y":738,"w":288,"h":144}, + "frame": {"x":847,"y":447,"w":288,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":288,"h":144}, @@ -1050,7 +978,7 @@ }, "sprites/buildings/rotater-ccw.png": { - "frame": {"x":698,"y":1478,"w":141,"h":143}, + "frame": {"x":808,"y":743,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -1058,7 +986,7 @@ }, "sprites/buildings/rotater-fl.png": { - "frame": {"x":532,"y":1620,"w":141,"h":143}, + "frame": {"x":953,"y":743,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":1,"y":0,"w":141,"h":143}, @@ -1066,7 +994,7 @@ }, "sprites/buildings/rotater.png": { - "frame": {"x":677,"y":1625,"w":141,"h":143}, + "frame": {"x":705,"y":890,"w":141,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":141,"h":143}, @@ -1074,7 +1002,7 @@ }, "sprites/buildings/splitter-compact-inverse.png": { - "frame": {"x":1384,"y":298,"w":141,"h":136}, + "frame": {"x":255,"y":1146,"w":141,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":3,"w":141,"h":136}, @@ -1082,7 +1010,7 @@ }, "sprites/buildings/splitter-compact.png": { - "frame": {"x":1529,"y":298,"w":139,"h":136}, + "frame": {"x":400,"y":1146,"w":139,"h":136}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":3,"w":139,"h":136}, @@ -1090,7 +1018,7 @@ }, "sprites/buildings/splitter.png": { - "frame": {"x":814,"y":1033,"w":256,"h":143}, + "frame": {"x":560,"y":590,"w":256,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":17,"y":0,"w":256,"h":143}, @@ -1098,7 +1026,7 @@ }, "sprites/buildings/stacker.png": { - "frame": {"x":268,"y":1551,"w":260,"h":143}, + "frame": {"x":1404,"y":446,"w":260,"h":143}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":14,"y":0,"w":260,"h":143}, @@ -1106,7 +1034,7 @@ }, "sprites/buildings/trash-storage.png": { - "frame": {"x":295,"y":704,"w":248,"h":288}, + "frame": {"x":3,"y":994,"w":248,"h":288}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":22,"y":0,"w":248,"h":288}, @@ -1114,7 +1042,7 @@ }, "sprites/buildings/trash.png": { - "frame": {"x":552,"y":1330,"w":144,"h":144}, + "frame": {"x":560,"y":737,"w":144,"h":144}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":144,"h":144}, @@ -1122,7 +1050,7 @@ }, "sprites/buildings/underground_belt_entry-tier2.png": { - "frame": {"x":1243,"y":440,"w":137,"h":124}, + "frame": {"x":572,"y":1232,"w":137,"h":124}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":20,"w":137,"h":124}, @@ -1130,7 +1058,7 @@ }, "sprites/buildings/underground_belt_entry.png": { - "frame": {"x":1112,"y":574,"w":137,"h":111}, + "frame": {"x":713,"y":1153,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":33,"w":137,"h":111}, @@ -1138,7 +1066,7 @@ }, "sprites/buildings/underground_belt_exit-tier2.png": { - "frame": {"x":1253,"y":568,"w":137,"h":111}, + "frame": {"x":854,"y":1153,"w":137,"h":111}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":137,"h":111}, @@ -1146,55 +1074,15 @@ }, "sprites/buildings/underground_belt_exit.png": { - "frame": {"x":1394,"y":554,"w":137,"h":111}, + "frame": {"x":713,"y":1268,"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":1074,"y":886,"w":99,"h":144}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":45,"y":0,"w":99,"h":144}, - "sourceSize": {"w":144,"h":144} -}, -"sprites/buildings/wire_crossings.png": -{ - "frame": {"x":822,"y":1625,"w":99,"h":144}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":45,"y":0,"w":99,"h":144}, - "sourceSize": {"w":144,"h":144} -}, -"sprites/buildings/wire_left.png": -{ - "frame": {"x":1465,"y":1700,"w":60,"h":60}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":35,"w":60,"h":60}, - "sourceSize": {"w":95,"h":95} -}, -"sprites/buildings/wire_right.png": -{ - "frame": {"x":1529,"y":1700,"w":60,"h":60}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":35,"y":35,"w":60,"h":60}, - "sourceSize": {"w":95,"h":95} -}, -"sprites/buildings/wire_top.png": -{ - "frame": {"x":1762,"y":554,"w":25,"h":95}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":35,"y":0,"w":25,"h":95}, - "sourceSize": {"w":95,"h":95} -}, "sprites/debug/acceptor_slot.png": { - "frame": {"x":1639,"y":1597,"w":38,"h":48}, + "frame": {"x":638,"y":1360,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -1202,7 +1090,7 @@ }, "sprites/debug/ejector_slot.png": { - "frame": {"x":1593,"y":1697,"w":38,"h":48}, + "frame": {"x":1744,"y":713,"w":38,"h":48}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":38,"h":48}, @@ -1210,7 +1098,7 @@ }, "sprites/map_overview/belt_forward.png": { - "frame": {"x":1499,"y":1371,"w":20,"h":24}, + "frame": {"x":543,"y":1232,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -1218,7 +1106,7 @@ }, "sprites/map_overview/belt_left.png": { - "frame": {"x":505,"y":1698,"w":22,"h":22}, + "frame": {"x":708,"y":837,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":0,"y":2,"w":22,"h":22}, @@ -1226,7 +1114,7 @@ }, "sprites/map_overview/belt_right.png": { - "frame": {"x":1195,"y":1738,"w":22,"h":22}, + "frame": {"x":515,"y":999,"w":22,"h":22}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":22,"h":22}, @@ -1234,39 +1122,23 @@ }, "sprites/misc/deletion_marker.png": { - "frame": {"x":311,"y":1698,"w":62,"h":62}, + "frame": {"x":572,"y":1360,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, "sourceSize": {"w":72,"h":72} }, -"sprites/misc/energy_generator_overlay.png": -{ - "frame": {"x":1112,"y":689,"w":116,"h":44}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":137,"y":217,"w":116,"h":44}, - "sourceSize": {"w":288,"h":288} -}, "sprites/misc/hub_direction_indicator.png": { - "frame": {"x":1288,"y":1378,"w":24,"h":24}, + "frame": {"x":515,"y":1103,"w":24,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":24,"h":24}, "sourceSize": {"w":24,"h":24} }, -"sprites/misc/lock_direction_indicator.png": -{ - "frame": {"x":1198,"y":1327,"w":36,"h":24}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":0,"y":6,"w":36,"h":24}, - "sourceSize": {"w":36,"h":36} -}, "sprites/misc/slot_bad_arrow.png": { - "frame": {"x":311,"y":1698,"w":62,"h":62}, + "frame": {"x":572,"y":1360,"w":62,"h":62}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":5,"w":62,"h":62}, @@ -1274,7 +1146,7 @@ }, "sprites/misc/slot_good_arrow.png": { - "frame": {"x":245,"y":1698,"w":62,"h":72}, + "frame": {"x":1839,"y":592,"w":62,"h":72}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":5,"y":0,"w":62,"h":72}, @@ -1282,7 +1154,7 @@ }, "sprites/misc/storage_overlay.png": { - "frame": {"x":1535,"y":554,"w":133,"h":66}, + "frame": {"x":515,"y":1033,"w":133,"h":66}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":2,"w":133,"h":66}, @@ -1290,7 +1162,7 @@ }, "sprites/misc/waypoint.png": { - "frame": {"x":1683,"y":1517,"w":20,"h":24}, + "frame": {"x":652,"y":1033,"w":20,"h":24}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":2,"y":0,"w":20,"h":24}, @@ -1298,107 +1170,19 @@ }, "sprites/misc/wires_overlay_tile.png": { - "frame": {"x":1672,"y":298,"w":96,"h":96}, + "frame": {"x":708,"y":737,"w":96,"h":96}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":96,"h":96}, "sourceSize": {"w":96,"h":96} -}, -"sprites/wires/battery_empty.png": -{ - "frame": {"x":1711,"y":1418,"w":29,"h":46}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":9,"y":1,"w":29,"h":46}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/wires/battery_full.png": -{ - "frame": {"x":1672,"y":398,"w":44,"h":30}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":10,"w":44,"h":30}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/wires/battery_low.png": -{ - "frame": {"x":1103,"y":838,"w":44,"h":30}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":10,"w":44,"h":30}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/wires/battery_medium.png": -{ - "frame": {"x":847,"y":1429,"w":44,"h":30}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":10,"w":44,"h":30}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/wires/negative_energy.png": -{ - "frame": {"x":1262,"y":1133,"w":32,"h":32}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":8,"y":8,"w":32,"h":32}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/wires/pin_negative_accept.png": -{ - "frame": {"x":185,"y":1688,"w":56,"h":79}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":20,"y":0,"w":56,"h":79}, - "sourceSize": {"w":96,"h":96} -}, -"sprites/wires/pin_negative_eject.png": -{ - "frame": {"x":1750,"y":1022,"w":49,"h":76}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":23,"y":0,"w":49,"h":76}, - "sourceSize": {"w":96,"h":96} -}, -"sprites/wires/pin_positive_accept.png": -{ - "frame": {"x":1630,"y":1517,"w":49,"h":76}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":23,"y":0,"w":49,"h":76}, - "sourceSize": {"w":96,"h":96} -}, -"sprites/wires/pin_positive_eject.png": -{ - "frame": {"x":1438,"y":962,"w":56,"h":79}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":20,"y":0,"w":56,"h":79}, - "sourceSize": {"w":96,"h":96} -}, -"sprites/wires/positive_energy.png": -{ - "frame": {"x":843,"y":1577,"w":32,"h":32}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":8,"y":8,"w":32,"h":32}, - "sourceSize": {"w":48,"h":48} -}, -"sprites/wires/waste_piled.png": -{ - "frame": {"x":1214,"y":1133,"w":44,"h":43}, - "rotated": false, - "trimmed": true, - "spriteSourceSize": {"x":2,"y":2,"w":44,"h":43}, - "sourceSize": {"w":48,"h":48} }}, "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "1.0", "image": "atlas0_75.png", "format": "RGBA8888", - "size": {"w":1810,"h":1778}, + "size": {"w":1924,"h":1431}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:dfc84e4381978113df4ad0cd8a5aace9:4e9bd6f6c82aaaa8a4a583cab68dc719:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:a7ec474d30eba3dcfb9e1ce36dc9a3df:a66fdbb2f105a54e9a5193362b6c2d4d:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png index d865f650..530922ba 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/advanced_processor.png b/res_raw/sprites/blueprints/advanced_processor.png deleted file mode 100644 index ab385816..00000000 Binary files a/res_raw/sprites/blueprints/advanced_processor.png and /dev/null differ diff --git a/res_raw/sprites/blueprints/energy_generator.png b/res_raw/sprites/blueprints/energy_generator.png deleted file mode 100644 index 42258c63..00000000 Binary files a/res_raw/sprites/blueprints/energy_generator.png and /dev/null differ diff --git a/res_raw/sprites/blueprints/wire_crossings-merger.png b/res_raw/sprites/blueprints/wire_crossings-merger.png deleted file mode 100644 index f58ae10e..00000000 Binary files a/res_raw/sprites/blueprints/wire_crossings-merger.png and /dev/null differ diff --git a/res_raw/sprites/blueprints/wire_crossings.png b/res_raw/sprites/blueprints/wire_crossings.png deleted file mode 100644 index a1d44678..00000000 Binary files a/res_raw/sprites/blueprints/wire_crossings.png and /dev/null differ diff --git a/res_raw/sprites/blueprints/wire_left.png b/res_raw/sprites/blueprints/wire_left.png deleted file mode 100644 index 232c13e9..00000000 Binary files a/res_raw/sprites/blueprints/wire_left.png and /dev/null differ diff --git a/res_raw/sprites/blueprints/wire_right.png b/res_raw/sprites/blueprints/wire_right.png deleted file mode 100644 index fba98482..00000000 Binary files a/res_raw/sprites/blueprints/wire_right.png and /dev/null differ diff --git a/res_raw/sprites/blueprints/wire_top.png b/res_raw/sprites/blueprints/wire_top.png deleted file mode 100644 index 52efcc01..00000000 Binary files a/res_raw/sprites/blueprints/wire_top.png and /dev/null differ diff --git a/res_raw/sprites/buildings/advanced_processor.png b/res_raw/sprites/buildings/advanced_processor.png deleted file mode 100644 index 5402760b..00000000 Binary files a/res_raw/sprites/buildings/advanced_processor.png and /dev/null differ diff --git a/res_raw/sprites/buildings/energy_generator.png b/res_raw/sprites/buildings/energy_generator.png deleted file mode 100644 index 5bd9f9a2..00000000 Binary files a/res_raw/sprites/buildings/energy_generator.png and /dev/null differ diff --git a/res_raw/sprites/buildings/wire_crossings-merger.png b/res_raw/sprites/buildings/wire_crossings-merger.png deleted file mode 100644 index ee0db056..00000000 Binary files a/res_raw/sprites/buildings/wire_crossings-merger.png and /dev/null differ diff --git a/res_raw/sprites/buildings/wire_crossings.png b/res_raw/sprites/buildings/wire_crossings.png deleted file mode 100644 index 243fe45d..00000000 Binary files a/res_raw/sprites/buildings/wire_crossings.png and /dev/null differ diff --git a/res_raw/sprites/buildings/wire_left.png b/res_raw/sprites/buildings/wire_left.png deleted file mode 100644 index 5799ab5b..00000000 Binary files a/res_raw/sprites/buildings/wire_left.png and /dev/null differ diff --git a/res_raw/sprites/buildings/wire_right.png b/res_raw/sprites/buildings/wire_right.png deleted file mode 100644 index b3f2df5a..00000000 Binary files a/res_raw/sprites/buildings/wire_right.png and /dev/null differ diff --git a/res_raw/sprites/buildings/wire_top.png b/res_raw/sprites/buildings/wire_top.png deleted file mode 100644 index a9f90aaa..00000000 Binary files a/res_raw/sprites/buildings/wire_top.png and /dev/null differ diff --git a/res_raw/sprites/misc/energy_generator_overlay.png b/res_raw/sprites/misc/energy_generator_overlay.png deleted file mode 100644 index 634c2e10..00000000 Binary files a/res_raw/sprites/misc/energy_generator_overlay.png and /dev/null differ diff --git a/res_raw/sprites/wires/battery_empty.png b/res_raw/sprites/wires/battery_empty.png deleted file mode 100644 index 78095666..00000000 Binary files a/res_raw/sprites/wires/battery_empty.png and /dev/null differ diff --git a/res_raw/sprites/wires/battery_full.png b/res_raw/sprites/wires/battery_full.png deleted file mode 100644 index 5256150f..00000000 Binary files a/res_raw/sprites/wires/battery_full.png and /dev/null differ diff --git a/res_raw/sprites/wires/battery_low.png b/res_raw/sprites/wires/battery_low.png deleted file mode 100644 index 79fbd8a4..00000000 Binary files a/res_raw/sprites/wires/battery_low.png and /dev/null differ diff --git a/res_raw/sprites/wires/battery_medium.png b/res_raw/sprites/wires/battery_medium.png deleted file mode 100644 index ba0151a0..00000000 Binary files a/res_raw/sprites/wires/battery_medium.png and /dev/null differ diff --git a/res_raw/sprites/wires/negative_energy.png b/res_raw/sprites/wires/negative_energy.png deleted file mode 100644 index cc372330..00000000 Binary files a/res_raw/sprites/wires/negative_energy.png and /dev/null differ diff --git a/res_raw/sprites/wires/pin_negative_accept.png b/res_raw/sprites/wires/pin_negative_accept.png deleted file mode 100644 index 82581abb..00000000 Binary files a/res_raw/sprites/wires/pin_negative_accept.png and /dev/null differ diff --git a/res_raw/sprites/wires/pin_negative_eject.png b/res_raw/sprites/wires/pin_negative_eject.png deleted file mode 100644 index e816bd83..00000000 Binary files a/res_raw/sprites/wires/pin_negative_eject.png and /dev/null differ diff --git a/res_raw/sprites/wires/pin_positive_accept.png b/res_raw/sprites/wires/pin_positive_accept.png deleted file mode 100644 index 57044532..00000000 Binary files a/res_raw/sprites/wires/pin_positive_accept.png and /dev/null differ diff --git a/res_raw/sprites/wires/pin_positive_eject.png b/res_raw/sprites/wires/pin_positive_eject.png deleted file mode 100644 index a7da6bc0..00000000 Binary files a/res_raw/sprites/wires/pin_positive_eject.png and /dev/null differ diff --git a/res_raw/sprites/wires/positive_energy.png b/res_raw/sprites/wires/positive_energy.png deleted file mode 100644 index c95c80c9..00000000 Binary files a/res_raw/sprites/wires/positive_energy.png and /dev/null differ diff --git a/res_raw/sprites/wires/waste_piled.png b/res_raw/sprites/wires/waste_piled.png deleted file mode 100644 index 062d0df6..00000000 Binary files a/res_raw/sprites/wires/waste_piled.png and /dev/null differ diff --git a/src/css/icons.scss b/src/css/icons.scss index 6d10e2d7..04253fc1 100644 --- a/src/css/icons.scss +++ b/src/css/icons.scss @@ -1,5 +1,4 @@ -$buildings: belt, cutter, miner, mixer, painter, rotater, splitter, stacker, trash, underground_belt, - energy_generator, wire, advanced_processor, wire_crossings; +$buildings: belt, cutter, miner, mixer, painter, rotater, splitter, stacker, trash, underground_belt; @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 235904d9..8f0f02e1 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -53,10 +53,7 @@ export const globalConfig = { beltSpeedItemsPerSecond: 2, minerSpeedItemsPerSecond: 0, // COMPUTED - beltItemSpacingByLayer: { - regular: 0.63, - wires: 0.4, - }, + itemSpacingOnBelts: 0.63, wiresSpeedItemsPerSecond: 6, diff --git a/src/js/game/base_item.js b/src/js/game/base_item.js index d0da5fa1..3a79ed3b 100644 --- a/src/js/game/base_item.js +++ b/src/js/game/base_item.js @@ -1,6 +1,5 @@ import { DrawParameters } from "../core/draw_parameters"; import { BasicSerializableObject } from "../savegame/serialization"; -import { enumLayer } from "./root"; /** @enum {string} */ export const enumItemType = { @@ -13,15 +12,6 @@ export const enumItemType = { genericEnergy: "genericEnergy", }; -/** @enum {enumLayer} */ -export const enumItemTypeToLayer = { - [enumItemType.shape]: enumLayer.regular, - [enumItemType.color]: enumLayer.regular, - [enumItemType.positiveEnergy]: enumLayer.wires, - [enumItemType.negativeEnergy]: enumLayer.wires, - [enumItemType.genericEnergy]: enumLayer.wires, -}; - /** * Class for items on belts etc. Not an entity for performance reasons */ diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js index 09e73636..41dffd73 100644 --- a/src/js/game/belt_path.js +++ b/src/js/game/belt_path.js @@ -8,7 +8,7 @@ import { enumDirection, enumDirectionToVector, Vector, enumInvertedDirections } import { BasicSerializableObject, types } from "../savegame/serialization"; import { BaseItem } from "./base_item"; import { Entity } from "./entity"; -import { GameRoot } from "./root"; +import { GameRoot, enumLayer } from "./root"; const logger = createLogger("belt_path"); @@ -115,14 +115,7 @@ export class BeltPath extends BasicSerializableObject { * @returns {boolean} */ canAcceptItem() { - return this.spacingToFirstItem >= this.getItemSpacing(); - } - - /** - * Returns the spacing between items - */ - getItemSpacing() { - return globalConfig.beltItemSpacingByLayer[this.layer]; + return this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts; } /** @@ -130,15 +123,15 @@ export class BeltPath extends BasicSerializableObject { * @param {BaseItem} item */ tryAcceptItem(item) { - if (this.spacingToFirstItem >= this.getItemSpacing()) { + if (this.spacingToFirstItem >= globalConfig.itemSpacingOnBelts) { // So, since we already need one tick to accept this item we will add this directly. const beltProgressPerTick = - this.root.hubGoals.getBeltBaseSpeed(this.layer) * + this.root.hubGoals.getBeltBaseSpeed() * this.root.dynamicTickrate.deltaSeconds * - this.getItemSpacing(); + globalConfig.itemSpacingOnBelts; // First, compute how much progress we can make *at max* - const maxProgress = Math.max(0, this.spacingToFirstItem - this.getItemSpacing()); + const maxProgress = Math.max(0, this.spacingToFirstItem - globalConfig.itemSpacingOnBelts); const initialProgress = Math.min(maxProgress, beltProgressPerTick); this.items.unshift([this.spacingToFirstItem - initialProgress, item]); @@ -178,10 +171,9 @@ export class BeltPath extends BasicSerializableObject { } /** - * Recomputes the layer of the path and the target acceptor + * Recomputes cache variables once the path was changed */ onPathChanged() { - this.layer = this.entityPath[0].layer; this.acceptorTarget = this.computeAcceptingEntityAndSlot(); } @@ -208,15 +200,13 @@ export class BeltPath extends BasicSerializableObject { const ejectSlotTargetWsTile = ejectSlotWsTile.add(ejectSlotWsDirectionVector); // Try to find the given acceptor component to take the item - // Since there can be cross layer dependencies, check on all layers - const targetEntities = this.root.map.getLayersContentsMultipleXY( + const targetEntity = this.root.map.getLayerContentXY( ejectSlotTargetWsTile.x, - ejectSlotTargetWsTile.y + ejectSlotTargetWsTile.y, + enumLayer.regular ); - for (let i = 0; i < targetEntities.length; ++i) { - const targetEntity = targetEntities[i]; - + if (targetEntity) { const targetStaticComp = targetEntity.components.StaticMapEntity; const targetBeltComp = targetEntity.components.Belt; @@ -236,19 +226,18 @@ export class BeltPath extends BasicSerializableObject { const targetAcceptorComp = targetEntity.components.ItemAcceptor; if (!targetAcceptorComp) { // Entity doesn't accept items - continue; + return; } const ejectingDirection = targetStaticComp.worldDirectionToLocal(ejectSlotWsDirection); const matchingSlot = targetAcceptorComp.findMatchingSlot( targetStaticComp.worldToLocalTile(ejectSlotTargetWsTile), - ejectingDirection, - lastEntity.layer + ejectingDirection ); if (!matchingSlot) { // No matching slot found - continue; + return; } return { @@ -406,7 +395,7 @@ export class BeltPath extends BasicSerializableObject { this.onPathChanged(); // Extend the path length - const additionalLength = beltComp.getEffectiveLengthTiles(entity.layer); + const additionalLength = beltComp.getEffectiveLengthTiles(); this.totalLength += additionalLength; DEBUG && logger.log(" Extended total length by", additionalLength, "to", this.totalLength); @@ -449,7 +438,7 @@ export class BeltPath extends BasicSerializableObject { // All items on that belt are simply lost (for now) - const length = beltComp.getEffectiveLengthTiles(entity.layer); + const length = beltComp.getEffectiveLengthTiles(); // Extend the length of this path this.totalLength += length; @@ -501,7 +490,7 @@ export class BeltPath extends BasicSerializableObject { const beltComp = entity.components.Belt; beltComp.assignedPath = null; - const entityLength = beltComp.getEffectiveLengthTiles(entity.layer); + const entityLength = beltComp.getEffectiveLengthTiles(); assert(this.entityPath.indexOf(entity) >= 0, "Entity not contained for split"); assert(this.entityPath.indexOf(entity) !== 0, "Entity is first"); assert(this.entityPath.indexOf(entity) !== this.entityPath.length - 1, "Entity is last"); @@ -519,7 +508,7 @@ export class BeltPath extends BasicSerializableObject { ++firstPathEntityCount; firstPathEndEntity = otherEntity; - firstPathLength += otherEntity.components.Belt.getEffectiveLengthTiles(otherEntity.layer); + firstPathLength += otherEntity.components.Belt.getEffectiveLengthTiles(); } DEBUG && @@ -663,7 +652,7 @@ export class BeltPath extends BasicSerializableObject { // Ok, first remove the entity const beltComp = entity.components.Belt; - const beltLength = beltComp.getEffectiveLengthTiles(entity.layer); + const beltLength = beltComp.getEffectiveLengthTiles(); DEBUG && logger.log( @@ -772,7 +761,7 @@ export class BeltPath extends BasicSerializableObject { // Ok, first remove the entity const beltComp = entity.components.Belt; - const beltLength = beltComp.getEffectiveLengthTiles(entity.layer); + const beltLength = beltComp.getEffectiveLengthTiles(); DEBUG && logger.log( @@ -912,7 +901,7 @@ export class BeltPath extends BasicSerializableObject { beltComp.assignedPath = this; // Update our length - const additionalLength = beltComp.getEffectiveLengthTiles(entity.layer); + const additionalLength = beltComp.getEffectiveLengthTiles(); this.totalLength += additionalLength; } @@ -970,7 +959,7 @@ export class BeltPath extends BasicSerializableObject { let length = 0; for (let i = 0; i < this.entityPath.length; ++i) { const entity = this.entityPath[i]; - length += entity.components.Belt.getEffectiveLengthTiles(this.layer); + length += entity.components.Belt.getEffectiveLengthTiles(); } return length; } @@ -985,9 +974,9 @@ export class BeltPath extends BasicSerializableObject { // Divide by item spacing on belts since we use throughput and not speed let beltSpeed = - this.root.hubGoals.getBeltBaseSpeed(this.layer) * + this.root.hubGoals.getBeltBaseSpeed() * this.root.dynamicTickrate.deltaSeconds * - this.getItemSpacing(); + globalConfig.itemSpacingOnBelts; if (G_IS_DEV && globalConfig.debug.instantBelts) { beltSpeed *= 100; @@ -1014,7 +1003,7 @@ export class BeltPath extends BasicSerializableObject { break; } - minimumDistance = this.getItemSpacing(); + minimumDistance = globalConfig.itemSpacingOnBelts; } // Check if we have an item which is ready to be emitted @@ -1060,14 +1049,14 @@ export class BeltPath extends BasicSerializableObject { for (let i = 0; i < this.entityPath.length; ++i) { const beltComp = this.entityPath[i].components.Belt; - const localLength = beltComp.getEffectiveLengthTiles(this.layer); + const localLength = beltComp.getEffectiveLengthTiles(); if (currentLength + localLength >= progress || i === this.entityPath.length - 1) { // Min required here due to floating point issues const localProgress = Math.min(1.0, progress - currentLength); assert(localProgress >= 0.0, "Invalid local progress: " + localProgress); - const localSpace = beltComp.transformBeltToLocalSpace(localProgress, this.layer); + const localSpace = beltComp.transformBeltToLocalSpace(localProgress); return this.entityPath[i].components.StaticMapEntity.localTileToWorld(localSpace); } currentLength += localLength; @@ -1085,11 +1074,6 @@ export class BeltPath extends BasicSerializableObject { return; } - if (this.entityPath[0].layer !== this.root.currentLayer) { - // Don't draw - return; - } - parameters.context.fillStyle = "#d79a25"; parameters.context.strokeStyle = "#d79a25"; parameters.context.beginPath(); @@ -1171,7 +1155,7 @@ export class BeltPath extends BasicSerializableObject { for (let i = 0; i < this.entityPath.length; ++i) { const entity = this.entityPath[i]; const beltComp = entity.components.Belt; - const beltLength = beltComp.getEffectiveLengthTiles(this.layer); + const beltLength = beltComp.getEffectiveLengthTiles(); // Check if the current items are on the belt while (trackPos + beltLength >= currentItemPos - 1e-51) { @@ -1182,7 +1166,7 @@ export class BeltPath extends BasicSerializableObject { "invalid track pos: " + currentItemPos + " vs " + trackPos + " (l =" + beltLength + ")" ); - const localPos = beltComp.transformBeltToLocalSpace(currentItemPos - trackPos, this.layer); + const localPos = beltComp.transformBeltToLocalSpace(currentItemPos - trackPos); const worldPos = staticComp.localTileToWorld(localPos).toWorldSpaceCenterOfTile(); const distanceAndItem = this.items[currentItemIndex]; diff --git a/src/js/game/buildings/advanced_processor.js b/src/js/game/buildings/advanced_processor.js deleted file mode 100644 index a688c878..00000000 --- a/src/js/game/buildings/advanced_processor.js +++ /dev/null @@ -1,108 +0,0 @@ -import { formatItemsPerSecond } from "../../core/utils"; -import { enumDirection, Vector } from "../../core/vector"; -import { T } from "../../translations"; -import { enumItemType } from "../base_item"; -import { EnergyConsumerComponent } from "../components/energy_consumer"; -import { ItemAcceptorComponent } from "../components/item_acceptor"; -import { ItemEjectorComponent } from "../components/item_ejector"; -import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; -import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; -import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; -import { enumLayer, GameRoot } from "../root"; - -export class MetaAdvancedProcessorBuilding extends MetaBuilding { - constructor() { - super("advanced_processor"); - } - - getSilhouetteColor() { - return "#25d7b8"; - } - - getDimensions(variant) { - return new Vector(2, 2); - } - - /** - * @param {GameRoot} root - * @param {string} variant - * @returns {Array<[string, string]>} - */ - getAdditionalStatistics(root, variant) { - const speed = root.hubGoals.getProcessorBaseSpeed(enumItemProcessorTypes.advancedProcessor); - return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(speed)]]; - } - - /** - * @param {GameRoot} root - */ - getIsUnlocked(root) { - // TODO - return true; - // return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_cutter_and_trash); - } - - /** - * Creates the entity at the given location - * @param {Entity} entity - */ - setupEntityComponents(entity) { - entity.addComponent( - new ItemProcessorComponent({ - inputsPerCharge: 1, - processorType: enumItemProcessorTypes.advancedProcessor, - }) - ); - entity.addComponent( - new ItemEjectorComponent({ - slots: [ - { pos: new Vector(1, 0), direction: enumDirection.right }, - { pos: new Vector(1, 0), direction: enumDirection.top, layer: enumLayer.wires }, - ], - }) - ); - entity.addComponent( - new EnergyConsumerComponent({ - bufferSize: 3, - perCharge: 1, - batteryPosition: new Vector(0.63, 0.7), - acceptorSlotIndex: 1, - ejectorSlotIndex: 1, - }) - ); - - entity.addComponent( - new WiredPinsComponent({ - slots: [ - { - pos: new Vector(0, 0), - direction: enumDirection.top, - type: enumPinSlotType.positiveEnergyAcceptor, - }, - { - pos: new Vector(1, 0), - direction: enumDirection.top, - type: enumPinSlotType.negativeEnergyEjector, - }, - ], - }) - ); - entity.addComponent( - new ItemAcceptorComponent({ - slots: [ - { - pos: new Vector(0, 1), - directions: [enumDirection.left], - }, - { - pos: new Vector(0, 0), - directions: [enumDirection.top], - filter: enumItemType.positiveEnergy, - layer: enumLayer.wires, - }, - ], - }) - ); - } -} diff --git a/src/js/game/buildings/belt_base.js b/src/js/game/buildings/belt_base.js index 796b27b5..116350d5 100644 --- a/src/js/game/buildings/belt_base.js +++ b/src/js/game/buildings/belt_base.js @@ -23,7 +23,7 @@ export class MetaBeltBaseBuilding extends MetaBuilding { * @returns {Array<[string, string]>} */ getAdditionalStatistics(root, variant) { - const beltSpeed = root.hubGoals.getBeltBaseSpeed(enumLayer.regular); + const beltSpeed = root.hubGoals.getBeltBaseSpeed(); return [[T.ingame.buildingPlacement.infoTexts.speed, formatItemsPerSecond(beltSpeed)]]; } @@ -82,7 +82,7 @@ export class MetaBeltBaseBuilding extends MetaBuilding { const bottomDirection = enumAngleToDirection[(rotation + 180) % 360]; const leftDirection = enumAngleToDirection[(rotation + 270) % 360]; - const { ejectors, acceptors } = root.logic.getEjectorsAndAcceptorsAtTile(tile, layer); + const { ejectors, acceptors } = root.logic.getEjectorsAndAcceptorsAtTile(tile); let hasBottomEjector = false; let hasRightEjector = false; diff --git a/src/js/game/buildings/energy_generator.js b/src/js/game/buildings/energy_generator.js deleted file mode 100644 index a63b4b3f..00000000 --- a/src/js/game/buildings/energy_generator.js +++ /dev/null @@ -1,108 +0,0 @@ -import { enumDirection, Vector } from "../../core/vector"; -import { enumItemType } from "../base_item"; -import { EnergyGeneratorComponent } from "../components/energy_generator"; -import { ItemAcceptorComponent } from "../components/item_acceptor"; -import { ItemEjectorComponent } from "../components/item_ejector"; -import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; -import { Entity } from "../entity"; -import { MetaBuilding } from "../meta_building"; -import { enumLayer, GameRoot } from "../root"; -import { enumHubGoalRewards } from "../tutorial_goals"; - -export class MetaEnergyGenerator extends MetaBuilding { - constructor() { - super("energy_generator"); - } - - getSilhouetteColor() { - return "#c425d7"; - } - - /** - * @param {GameRoot} root - * @param {string} variant - * @returns {Array<[string, string]>} - */ - getAdditionalStatistics(root, variant) { - // TODO - return []; - } - - getDimensions(variant) { - return new Vector(2, 2); - } - - /** - * @param {GameRoot} root - */ - getIsUnlocked(root) { - return true; - // return root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_cutter_and_trash); - } - - /** - * Creates the entity at the given location - * @param {Entity} entity - */ - setupEntityComponents(entity) { - entity.addComponent( - new ItemAcceptorComponent({ - slots: [ - { - pos: new Vector(0, 1), - directions: [enumDirection.bottom], - filter: enumItemType.shape, - }, - { - pos: new Vector(1, 1), - directions: [enumDirection.bottom], - filter: enumItemType.shape, - }, - { - pos: new Vector(1, 0), - directions: [enumDirection.top], - layer: enumLayer.wires, - filter: enumItemType.negativeEnergy, - }, - ], - }) - ); - - entity.addComponent( - new ItemEjectorComponent({ - slots: [ - { - pos: new Vector(0, 0), - direction: enumDirection.top, - layer: enumLayer.wires, - }, - ], - }) - ); - - entity.addComponent( - new EnergyGeneratorComponent({ - // Set by the energy generator system later - requiredKey: null, - wasteAcceptorSlotIndex: 2, - }) - ); - - entity.addComponent( - new WiredPinsComponent({ - slots: [ - { - pos: new Vector(0, 0), - type: enumPinSlotType.positiveEnergyEjector, - direction: enumDirection.top, - }, - { - pos: new Vector(1, 0), - type: enumPinSlotType.negativeEnergyAcceptor, - direction: enumDirection.top, - }, - ], - }) - ); - } -} diff --git a/src/js/game/buildings/wire_base.js b/src/js/game/buildings/wire_base.js deleted file mode 100644 index 6f3ffec8..00000000 --- a/src/js/game/buildings/wire_base.js +++ /dev/null @@ -1,52 +0,0 @@ -import { Loader } from "../../core/loader"; -import { enumDirection } from "../../core/vector"; -import { enumLayer } from "../root"; -import { arrayBeltVariantToRotation, MetaBeltBaseBuilding } from "./belt_base"; - -export class MetaWireBaseBuilding extends MetaBeltBaseBuilding { - constructor() { - super("wire"); - } - - getSilhouetteColor() { - return "#c425d7"; - } - - getLayer() { - return enumLayer.wires; - } - - getPreviewSprite(rotationVariant) { - switch (arrayBeltVariantToRotation[rotationVariant]) { - case enumDirection.top: { - return Loader.getSprite("sprites/buildings/wire_top.png"); - } - case enumDirection.left: { - return Loader.getSprite("sprites/buildings/wire_left.png"); - } - case enumDirection.right: { - return Loader.getSprite("sprites/buildings/wire_right.png"); - } - default: { - assertAlways(false, "Invalid belt rotation variant"); - } - } - } - - getBlueprintSprite(rotationVariant) { - switch (arrayBeltVariantToRotation[rotationVariant]) { - case enumDirection.top: { - return Loader.getSprite("sprites/blueprints/wire_top.png"); - } - case enumDirection.left: { - return Loader.getSprite("sprites/blueprints/wire_left.png"); - } - case enumDirection.right: { - return Loader.getSprite("sprites/blueprints/wire_right.png"); - } - default: { - assertAlways(false, "Invalid belt rotation variant"); - } - } - } -} diff --git a/src/js/game/buildings/wire_crossings.js b/src/js/game/buildings/wire_crossings.js deleted file mode 100644 index 82c057d2..00000000 --- a/src/js/game/buildings/wire_crossings.js +++ /dev/null @@ -1,119 +0,0 @@ -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.top, 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.top], - 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.bottom, 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 9c7d0d2d..e7219175 100644 --- a/src/js/game/colors.js +++ b/src/js/game/colors.js @@ -10,8 +10,6 @@ export const enumColors = { white: "white", uncolored: "uncolored", - - black: "black", }; /** @enum {string} */ @@ -26,8 +24,6 @@ export const enumColorToShortcode = { [enumColors.white]: "w", [enumColors.uncolored]: "u", - - [enumColors.black]: "0", }; /** @enum {enumColors} */ @@ -54,27 +50,9 @@ export const enumColorsToHexCode = { // blue + green + red [enumColors.white]: "#ffffff", - [enumColors.black]: "#31383a", - [enumColors.uncolored]: "#aaaaaa", }; -/** @enum {enumColors} */ -export const enumInvertedColors = { - [enumColors.red]: enumColors.cyan, - [enumColors.green]: enumColors.purple, - [enumColors.blue]: enumColors.yellow, - - [enumColors.yellow]: enumColors.blue, - [enumColors.purple]: enumColors.green, - [enumColors.cyan]: enumColors.red, - - [enumColors.white]: enumColors.black, - [enumColors.black]: enumColors.white, - - [enumColors.uncolored]: enumColors.uncolored, -}; - const c = enumColors; /** @enum {Object.} */ export const enumColorMixingResults = { @@ -88,7 +66,6 @@ export const enumColorMixingResults = { [c.cyan]: c.white, [c.white]: c.white, - [c.black]: c.red, }, // 0, 255, 0 @@ -100,7 +77,6 @@ export const enumColorMixingResults = { [c.cyan]: c.cyan, [c.white]: c.white, - [c.black]: c.green, }, // 0, 255, 0 @@ -110,20 +86,17 @@ export const enumColorMixingResults = { [c.cyan]: c.cyan, [c.white]: c.white, - [c.black]: c.blue, }, // 255, 255, 0 [c.yellow]: { [c.purple]: c.white, [c.cyan]: c.white, - [c.black]: c.yellow, }, // 255, 0, 255 [c.purple]: { [c.cyan]: c.white, - [c.black]: c.purple, }, // 0, 255, 255 @@ -140,24 +113,12 @@ export const enumColorMixingResults = { [c.uncolored]: { // auto }, - - [c.black]: { - // auto - [c.white]: c.uncolored, - [c.cyan]: c.cyan, - [c.uncolored]: c.uncolored, - }, }; // Create same color lookups for (const color in enumColors) { enumColorMixingResults[color][color] = color; - - // Anything with white is white again, except for black which creates gray - if (color !== enumColors.black) { - enumColorMixingResults[color][c.white] = c.white; - } - + enumColorMixingResults[color][c.white] = c.white; // Anything with uncolored is the same color enumColorMixingResults[color][c.uncolored] = color; } diff --git a/src/js/game/component_registry.js b/src/js/game/component_registry.js index ea0e43e8..4d28e757 100644 --- a/src/js/game/component_registry.js +++ b/src/js/game/component_registry.js @@ -10,9 +10,7 @@ import { UndergroundBeltComponent } from "./components/underground_belt"; import { UnremovableComponent } from "./components/unremovable"; import { HubComponent } from "./components/hub"; import { StorageComponent } from "./components/storage"; -import { EnergyGeneratorComponent } from "./components/energy_generator"; import { WiredPinsComponent } from "./components/wired_pins"; -import { EnergyConsumerComponent } from "./components/energy_consumer"; import { BeltUnderlaysComponent } from "./components/belt_underlays"; export function initComponentRegistry() { @@ -27,9 +25,7 @@ export function initComponentRegistry() { gComponentRegistry.register(UnremovableComponent); gComponentRegistry.register(HubComponent); gComponentRegistry.register(StorageComponent); - gComponentRegistry.register(EnergyGeneratorComponent); gComponentRegistry.register(WiredPinsComponent); - gComponentRegistry.register(EnergyConsumerComponent); gComponentRegistry.register(BeltUnderlaysComponent); // IMPORTANT ^^^^^ UPDATE ENTITY COMPONENT STORAGE AFTERWARDS diff --git a/src/js/game/components/belt.js b/src/js/game/components/belt.js index f2e990f0..4f106437 100644 --- a/src/js/game/components/belt.js +++ b/src/js/game/components/belt.js @@ -11,7 +11,6 @@ export const curvedBeltLength = /* Math.PI / 4 */ 0.78; export const FAKE_BELT_ACCEPTOR_SLOT = { pos: new Vector(0, 0), directions: [enumDirection.bottom], - layer: enumLayer.regular, }; /** @type {Object} */ @@ -20,7 +19,6 @@ export const FAKE_BELT_EJECTOR_SLOT_BY_DIRECTION = { pos: new Vector(0, 0), direction: enumDirection.top, item: null, - layer: enumLayer.regular, progress: 0, }, @@ -28,7 +26,6 @@ export const FAKE_BELT_EJECTOR_SLOT_BY_DIRECTION = { pos: new Vector(0, 0), direction: enumDirection.right, item: null, - layer: enumLayer.regular, progress: 0, }, @@ -36,7 +33,6 @@ export const FAKE_BELT_EJECTOR_SLOT_BY_DIRECTION = { pos: new Vector(0, 0), direction: enumDirection.left, item: null, - layer: enumLayer.regular, progress: 0, }, }; @@ -79,14 +75,9 @@ export class BeltComponent extends Component { /** * Returns the effective length of this belt in tile space - * @param {enumLayer} layer * @returns {number} */ - getEffectiveLengthTiles(layer) { - assert(layer, "no layer given"); - if (layer === enumLayer.wires) { - return 1.0; - } + getEffectiveLengthTiles() { return this.direction === enumDirection.top ? 1.0 : curvedBeltLength; } @@ -115,62 +106,28 @@ export class BeltComponent extends Component { * Converts from belt space (0 = start of belt ... 1 = end of belt) to the local * belt coordinates (-0.5|-0.5 to 0.5|0.5) * @param {number} progress - * @param {enumLayer} layer * @returns {Vector} */ - transformBeltToLocalSpace(progress, layer) { + transformBeltToLocalSpace(progress) { assert(progress >= 0.0, "Invalid progress ( < 0): " + progress); + switch (this.direction) { + case enumDirection.top: + assert(progress <= 1.02, "Invalid progress: " + progress); + return new Vector(0, 0.5 - progress); - switch (layer) { - case enumLayer.regular: { - switch (this.direction) { - case enumDirection.top: - assert(progress <= 1.02, "Invalid progress: " + progress); - return new Vector(0, 0.5 - progress); - - case enumDirection.right: { - assert(progress <= curvedBeltLength + 0.02, "Invalid progress 2: " + progress); - const arcProgress = (progress / curvedBeltLength) * 0.5 * Math.PI; - return new Vector( - 0.5 - 0.5 * Math.cos(arcProgress), - 0.5 - 0.5 * Math.sin(arcProgress) - ); - } - case enumDirection.left: { - assert(progress <= curvedBeltLength + 0.02, "Invalid progress 3: " + progress); - const arcProgress = (progress / curvedBeltLength) * 0.5 * Math.PI; - return new Vector( - -0.5 + 0.5 * Math.cos(arcProgress), - 0.5 - 0.5 * Math.sin(arcProgress) - ); - } - default: - assertAlways(false, "Invalid belt direction: " + this.direction); - return new Vector(0, 0); - } + case enumDirection.right: { + assert(progress <= curvedBeltLength + 0.02, "Invalid progress 2: " + progress); + const arcProgress = (progress / curvedBeltLength) * 0.5 * Math.PI; + return new Vector(0.5 - 0.5 * Math.cos(arcProgress), 0.5 - 0.5 * Math.sin(arcProgress)); } - case enumLayer.wires: { - const pow = 0.5; - switch (this.direction) { - case enumDirection.top: - assert(progress <= 1.02, "Invalid progress: " + progress); - return new Vector(0, 0.5 - progress); - - case enumDirection.right: { - assert(progress <= 1.02, "Invalid progress 2: " + progress); - return progress > 0.5 ? new Vector(progress - 0.5, 0) : new Vector(0, 0.5 - progress); - } - case enumDirection.left: { - assert(progress <= 1.02, "Invalid progress 3: " + progress); - return progress > 0.5 - ? new Vector(-progress + 0.5, 0) - : new Vector(0, 0.5 - progress); - } - default: - assertAlways(false, "Invalid belt direction: " + this.direction); - return new Vector(0, 0); - } + case enumDirection.left: { + assert(progress <= curvedBeltLength + 0.02, "Invalid progress 3: " + progress); + const arcProgress = (progress / curvedBeltLength) * 0.5 * Math.PI; + return new Vector(-0.5 + 0.5 * Math.cos(arcProgress), 0.5 - 0.5 * Math.sin(arcProgress)); } + default: + assertAlways(false, "Invalid belt direction: " + this.direction); + return new Vector(0, 0); } } } diff --git a/src/js/game/components/energy_consumer.js b/src/js/game/components/energy_consumer.js deleted file mode 100644 index 6e54af86..00000000 --- a/src/js/game/components/energy_consumer.js +++ /dev/null @@ -1,133 +0,0 @@ -import { Component } from "../component"; -import { types } from "../../savegame/serialization"; -import { Vector } from "../../core/vector"; -import { BaseItem, enumItemTypeToLayer, enumItemType } from "../base_item"; - -export class EnergyConsumerComponent extends Component { - static getId() { - return "EnergyConsumer"; - } - - static getSchema() { - return { - bufferSize: types.float, - perCharge: types.float, - batteryPosition: types.vector, - energyType: types.enum(enumItemType), - wasteType: types.enum(enumItemType), - acceptorSlotIndex: types.uint, - ejectorSlotIndex: types.uint, - - stored: types.float, - piledOutput: types.float, - }; - } - - duplicateWithoutContents() { - return new EnergyConsumerComponent({ - bufferSize: this.bufferSize, - perCharge: this.perCharge, - batteryPosition: this.batteryPosition.copy(), - acceptorSlotIndex: this.acceptorSlotIndex, - ejectorSlotIndex: this.ejectorSlotIndex, - }); - } - - /** - * - * @param {object} param0 - * @param {number} param0.bufferSize How much energy this consumer can store - * @param {number} param0.perCharge How much energy this consumer needs per charge - * @param {Vector} param0.batteryPosition world space render offset of the battery icon - * @param {number} param0.acceptorSlotIndex Which slot to accept energy on - * @param {number} param0.ejectorSlotIndex Which slot to eject energy off - * - */ - constructor({ - bufferSize = 3, - perCharge = 1, - batteryPosition = new Vector(), - acceptorSlotIndex = 0, - ejectorSlotIndex = 0, - }) { - super(); - this.bufferSize = bufferSize; - this.perCharge = perCharge; - this.batteryPosition = batteryPosition; - this.energyType = enumItemType.positiveEnergy; - this.wasteType = enumItemType.negativeEnergy; - this.acceptorSlotIndex = acceptorSlotIndex; - this.ejectorSlotIndex = ejectorSlotIndex; - - /** - * How much energy we have stored right now - */ - this.stored = 0; - - /** - * How much waste we have piled up so far - */ - this.piledOutput = 0; - } - - /** - * Tries to accept a given item - * @param {BaseItem} item - * @param {number} slotIndex - */ - tryAcceptItem(item, slotIndex) { - if (slotIndex !== this.acceptorSlotIndex) { - // Wrong slot - return false; - } - - if (item.getItemType() !== this.energyType) { - // Not the right type - return false; - } - - if (this.stored >= this.bufferSize) { - // We are full - return false; - } - - // All good, consume - this.stored = Math.min(this.stored + 1, this.bufferSize); - - return true; - } - - /** - * Tries to start the next charge - */ - tryStartNextCharge() { - if (this.hasTooMuchWastePiled()) { - // Too much waste remaining - return false; - } - - if (this.stored < this.perCharge) { - // Not enough energy stored - return false; - } - - this.stored -= this.perCharge; - this.piledOutput += this.perCharge; - return true; - } - - /** - * Returns if there is too much waste piled - */ - hasTooMuchWastePiled() { - return this.piledOutput >= 1.0; - } - - /** - * Reduces the waste by the given amount - * @param {number} amount - */ - reduceWaste(amount) { - this.piledOutput = Math.max(0, this.piledOutput - amount); - } -} diff --git a/src/js/game/components/energy_generator.js b/src/js/game/components/energy_generator.js deleted file mode 100644 index a45492d7..00000000 --- a/src/js/game/components/energy_generator.js +++ /dev/null @@ -1,93 +0,0 @@ -import { types } from "../../savegame/serialization"; -import { BaseItem, enumItemType } from "../base_item"; -import { Component } from "../component"; -import { ShapeItem } from "../items/shape_item"; - -const maxQueueSize = 4; - -export class EnergyGeneratorComponent extends Component { - static getId() { - return "EnergyGenerator"; - } - - static getSchema() { - return { - requiredKey: types.nullable(types.string), - itemsInQueue: types.uint, - wasteAcceptorSlotIndex: types.uint, - }; - } - - duplicateWithoutContents() { - return new EnergyGeneratorComponent({ - requiredKey: null, - wasteAcceptorSlotIndex: this.wasteAcceptorSlotIndex, - }); - } - - /** - * - * @param {object} param0 - * @param {string=} param0.requiredKey Which shape this generator needs, can be null if not computed yet - * @param {number} param0.wasteAcceptorSlotIndex Which slot accepts the waste - */ - constructor({ requiredKey, wasteAcceptorSlotIndex = 0 }) { - super(); - this.requiredKey = requiredKey; - - /** - * Stores how many items are ready to be converted to energy - * @type {number} - */ - this.itemsInQueue = 0; - - /** - * Stores which slot accepts the waste - * @type {number} - */ - this.wasteAcceptorSlotIndex = wasteAcceptorSlotIndex; - } - - /** - * - * @param {BaseItem} item - * @param {number} slot - */ - tryTakeItem(item, slot) { - if (slot === this.wasteAcceptorSlotIndex) { - // this is the acceptor slot on the wires layer - // just destroy it - return true; - } else { - if (item.getItemType() !== enumItemType.shape) { - // This shouldn't happen since we have a filter - still, it doesn't hurt - // to check either - assertAlways( - false, - "Energy generator took wrong item: " + - item.getItemType() + - " on slot " + - slot + - " (waste slot = " + - this.wasteAcceptorSlotIndex + - ")" - ); - return false; - } - - if (/** @type {ShapeItem} */ (item).definition.getHash() !== this.requiredKey) { - // Not our shape - return false; - } - - if (this.itemsInQueue >= maxQueueSize) { - // Queue is full - return false; - } - - // Take item and put it into the queue - ++this.itemsInQueue; - return true; - } - } -} diff --git a/src/js/game/components/item_acceptor.js b/src/js/game/components/item_acceptor.js index fd38651f..b9faa486 100644 --- a/src/js/game/components/item_acceptor.js +++ b/src/js/game/components/item_acceptor.js @@ -7,7 +7,6 @@ import { enumLayer } from "../root"; /** @typedef {{ * pos: Vector, * directions: enumDirection[], - * layer: enumLayer, * filter?: enumItemType * }} ItemAcceptorSlot */ @@ -22,7 +21,6 @@ import { enumLayer } from "../root"; /** @typedef {{ * pos: Vector, * directions: enumDirection[], - * layer?: enumLayer, * filter?: enumItemType * }} ItemAcceptorSlotConfig */ @@ -38,9 +36,6 @@ export class ItemAcceptorComponent extends Component { pos: types.vector, directions: types.array(types.enum(enumDirection)), filter: types.nullable(types.enum(enumItemType)), - - // TODO: MIGRATE - layer: types.enum(enumLayer), }) ), }; @@ -54,7 +49,6 @@ export class ItemAcceptorComponent extends Component { pos: slot.pos.copy(), directions: slot.directions.slice(), filter: slot.filter, - layer: slot.layer, }); } @@ -92,7 +86,6 @@ export class ItemAcceptorComponent extends Component { this.slots.push({ pos: slot.pos, directions: slot.directions, - layer: slot.layer || enumLayer.regular, // Which type of item to accept (shape | color | all) @see enumItemType filter: slot.filter, @@ -147,10 +140,9 @@ export class ItemAcceptorComponent extends Component { * Tries to find a slot which accepts the current item * @param {Vector} targetLocalTile * @param {enumDirection} fromLocalDirection - * @param {enumLayer} layer * @returns {ItemAcceptorLocatedSlot|null} */ - findMatchingSlot(targetLocalTile, fromLocalDirection, layer) { + findMatchingSlot(targetLocalTile, fromLocalDirection) { // We need to invert our direction since the acceptor specifies *from* which direction // it accepts items, but the ejector specifies *into* which direction it ejects items. // E.g.: Ejector ejects into "right" direction but acceptor accepts from "left" direction. @@ -165,11 +157,6 @@ export class ItemAcceptorComponent extends Component { continue; } - // Make sure the layer matches - if (slot.layer !== layer) { - continue; - } - // Check if the acceptor slot accepts items from our direction for (let i = 0; i < slot.directions.length; ++i) { // const localDirection = targetStaticComp.localDirectionToWorld(slot.directions[l]); diff --git a/src/js/game/components/item_ejector.js b/src/js/game/components/item_ejector.js index acb6b604..905ac81a 100644 --- a/src/js/game/components/item_ejector.js +++ b/src/js/game/components/item_ejector.js @@ -12,7 +12,6 @@ import { BeltPath } from "../belt_path"; * pos: Vector, * direction: enumDirection, * item: BaseItem, - * layer: enumLayer, * progress: number?, * cachedDestSlot?: import("./item_acceptor").ItemAcceptorLocatedSlot, * cachedBeltPath?: BeltPath, @@ -34,9 +33,6 @@ export class ItemEjectorComponent extends Component { direction: types.enum(enumDirection), item: types.nullable(types.obj(gItemRegistry)), progress: types.float, - - // TODO: Migrate - layer: types.enum(enumLayer), }) ), }; @@ -49,7 +45,6 @@ export class ItemEjectorComponent extends Component { slotsCopy.push({ pos: slot.pos.copy(), direction: slot.direction, - layer: slot.layer, }); } @@ -61,7 +56,7 @@ export class ItemEjectorComponent extends Component { /** * * @param {object} param0 - * @param {Array<{pos: Vector, direction: enumDirection, layer?: enumLayer}>=} param0.slots The slots to eject on + * @param {Array<{pos: Vector, direction: enumDirection }>=} param0.slots The slots to eject on */ constructor({ slots = [] }) { super(); @@ -75,7 +70,7 @@ export class ItemEjectorComponent extends Component { } /** - * @param {Array<{pos: Vector, direction: enumDirection, layer?: enumLayer}>} slots The slots to eject on + * @param {Array<{pos: Vector, direction: enumDirection }>} slots The slots to eject on */ setSlots(slots) { /** @type {Array} */ @@ -87,7 +82,6 @@ export class ItemEjectorComponent extends Component { direction: slot.direction, item: null, progress: 0, - layer: slot.layer || enumLayer.regular, cachedDestSlot: null, cachedTargetEntity: null, }); @@ -108,11 +102,10 @@ export class ItemEjectorComponent extends Component { /** * Returns whether any slot ejects to the given local tile * @param {Vector} tile - * @param {enumLayer} layer */ - anySlotEjectsToLocalTile(tile, layer) { + anySlotEjectsToLocalTile(tile) { for (let i = 0; i < this.slots.length; ++i) { - if (this.getSlotTargetLocalTile(i).equals(tile) && this.slots[i].layer === layer) { + if (this.getSlotTargetLocalTile(i).equals(tile)) { return true; } } @@ -131,12 +124,11 @@ export class ItemEjectorComponent extends Component { /** * Returns the first free slot on this ejector or null if there is none - * @param {enumLayer} layer * @returns {number?} */ - getFirstFreeSlot(layer) { + getFirstFreeSlot() { for (let i = 0; i < this.slots.length; ++i) { - if (this.canEjectOnSlot(i) && this.slots[i].layer === layer) { + if (this.canEjectOnSlot(i)) { return i; } } diff --git a/src/js/game/components/item_processor.js b/src/js/game/components/item_processor.js index 806ec7c8..3bc7c53a 100644 --- a/src/js/game/components/item_processor.js +++ b/src/js/game/components/item_processor.js @@ -18,7 +18,6 @@ export const enumItemProcessorTypes = { painter: "painter", painterDouble: "painterDouble", painterQuad: "painterQuad", - advancedProcessor: "advancedProcessor", hub: "hub", }; diff --git a/src/js/game/components/underground_belt.js b/src/js/game/components/underground_belt.js index e94b7cb1..68420b20 100644 --- a/src/js/game/components/underground_belt.js +++ b/src/js/game/components/underground_belt.js @@ -103,8 +103,7 @@ export class UndergroundBeltComponent extends Component { } // Notice: We assume that for all items the travel distance is the same - const maxItemsInTunnel = - (2 + travelDistance) / globalConfig.beltItemSpacingByLayer[enumLayer.regular]; + const maxItemsInTunnel = (2 + travelDistance) / globalConfig.itemSpacingOnBelts; if (this.pendingItems.length >= maxItemsInTunnel) { // Simulate a real belt which gets full at some point return false; @@ -114,8 +113,7 @@ export class UndergroundBeltComponent extends Component { // This corresponds to the item ejector - it needs 0.5 additional tiles to eject the item. // So instead of adding 1 we add 0.5 only. // Additionally it takes 1 tile for the acceptor which we just add on top. - const travelDuration = - (travelDistance + 1.5) / beltSpeed / globalConfig.beltItemSpacingByLayer[enumLayer.regular]; + const travelDuration = (travelDistance + 1.5) / beltSpeed / globalConfig.itemSpacingOnBelts; this.pendingItems.push([item, travelDuration]); diff --git a/src/js/game/core.js b/src/js/game/core.js index e48c01e7..9ca99a8e 100644 --- a/src/js/game/core.js +++ b/src/js/game/core.js @@ -398,14 +398,14 @@ export class GameCore { if (!this.root.camera.getIsMapOverlayActive()) { // Underlays for splitters / balancers - systems.beltUnderlays.drawUnderlays(params, enumLayer.regular); + systems.beltUnderlays.drawUnderlays(params); // Belt items - systems.belt.drawLayerBeltItems(params, enumLayer.regular); + systems.belt.drawBeltItems(params); // Items being ejected / accepted currently (animations) - systems.itemEjector.drawLayer(params, enumLayer.regular); - systems.itemAcceptor.drawLayer(params, enumLayer.regular); + systems.itemEjector.draw(params); + systems.itemAcceptor.draw(params); } // Miner & Static map entities @@ -415,28 +415,15 @@ export class GameCore { // 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 && !this.root.camera.getIsMapOverlayActive()) { - // Belt sprites & Static map entities - root.map.drawWiresLayer(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); - + // Static map entities root.map.drawWiresForegroundLayer(params); // pins diff --git a/src/js/game/entity.js b/src/js/game/entity.js index c86aa3b7..1086a677 100644 --- a/src/js/game/entity.js +++ b/src/js/game/entity.js @@ -169,9 +169,6 @@ export class Entity extends BasicSerializableObject { const ejectorSprite = Loader.getSprite("sprites/debug/ejector_slot.png"); for (let i = 0; i < ejectorComp.slots.length; ++i) { const slot = ejectorComp.slots[i]; - if (slot.layer !== this.root.currentLayer) { - continue; - } const slotTile = staticComp.localTileToWorld(slot.pos); const direction = staticComp.localDirectionToWorld(slot.direction); const directionVector = enumDirectionToVector[direction]; @@ -194,9 +191,6 @@ export class Entity extends BasicSerializableObject { const acceptorSprite = Loader.getSprite("sprites/debug/acceptor_slot.png"); for (let i = 0; i < acceptorComp.slots.length; ++i) { const slot = acceptorComp.slots[i]; - if (slot.layer !== this.root.currentLayer) { - continue; - } const slotTile = staticComp.localTileToWorld(slot.pos); for (let k = 0; k < slot.directions.length; ++k) { const direction = staticComp.localDirectionToWorld(slot.directions[k]); diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index bfdb1407..6e82db6c 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -13,9 +13,7 @@ import { HubSystem } from "./systems/hub"; import { StaticMapEntitySystem } from "./systems/static_map_entity"; import { ItemAcceptorSystem } from "./systems/item_acceptor"; import { StorageSystem } from "./systems/storage"; -import { EnergyGeneratorSystem } from "./systems/energy_generator"; import { WiredPinsSystem } from "./systems/wired_pins"; -import { EnergyConsumerSystem } from "./systems/energy_consumer"; import { BeltUnderlaysSystem } from "./systems/belt_underlays"; const logger = createLogger("game_system_manager"); @@ -60,15 +58,9 @@ export class GameSystemManager { /** @type {StorageSystem} */ storage: null, - /** @type {EnergyGeneratorSystem} */ - energyGenerator: null, - /** @type {WiredPinsSystem} */ wiredPins: null, - /** @type {EnergyConsumerSystem} */ - energyConsumer: null, - /** @type {BeltUnderlaysSystem} */ beltUnderlays: null, @@ -106,14 +98,10 @@ export class GameSystemManager { add("hub", HubSystem); - add("energyGenerator", EnergyGeneratorSystem); - add("staticMapEntities", StaticMapEntitySystem); add("wiredPins", WiredPinsSystem); - add("energyConsumer", EnergyConsumerSystem); - add("beltUnderlays", BeltUnderlaysSystem); // IMPORTANT: Must be after belt system since belt system can change the diff --git a/src/js/game/game_system_with_filter.js b/src/js/game/game_system_with_filter.js index 82ab4c22..ef6dfd52 100644 --- a/src/js/game/game_system_with_filter.js +++ b/src/js/game/game_system_with_filter.js @@ -3,7 +3,7 @@ import { Component } from "./component"; import { Entity } from "./entity"; /* typehints:end */ -import { GameRoot, enumLayer } from "./root"; +import { GameRoot } from "./root"; import { GameSystem } from "./game_system"; import { arrayDelete, arrayDeleteValue } from "../core/utils"; import { DrawParameters } from "../core/draw_parameters"; @@ -39,9 +39,8 @@ export class GameSystemWithFilter extends GameSystem { * Calls a function for each matching entity on the screen, useful for drawing them * @param {DrawParameters} parameters * @param {function} callback - * @param {enumLayer=} layerFilter Can be null for no filter */ - forEachMatchingEntityOnScreen(parameters, callback, layerFilter = null) { + forEachMatchingEntityOnScreen(parameters, callback) { const cullRange = parameters.visibleRect.toTileCullRectangle(); if (this.allEntities.length < 100) { // So, its much quicker to simply perform per-entity checking @@ -49,9 +48,7 @@ export class GameSystemWithFilter extends GameSystem { for (let i = 0; i < this.allEntities.length; ++i) { const entity = this.allEntities[i]; if (cullRange.containsRect(entity.components.StaticMapEntity.getTileSpaceBounds())) { - if (!layerFilter || entity.layer === layerFilter) { - callback(parameters, entity); - } + callback(parameters, entity); } } return; @@ -94,11 +91,6 @@ export class GameSystemWithFilter extends GameSystem { entityLoop: for (let i = 0; i < entities.length; ++i) { const entity = entities[i]; - // Avoid drawing non-layer contents - if (layerFilter && entity.layer !== layerFilter) { - continue; - } - // Avoid drawing twice if (seenUids.has(entity.uid)) { continue; diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index cd319059..4b1c8447 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -367,13 +367,9 @@ export class HubGoals extends BasicSerializableObject { /** * Belt speed - * @param {enumLayer} layer * @returns {number} items / sec */ - getBeltBaseSpeed(layer) { - if (layer === enumLayer.wires) { - return globalConfig.wiresSpeedItemsPerSecond; - } + getBeltBaseSpeed() { return globalConfig.beltSpeedItemsPerSecond * this.upgradeImprovements.belt; } diff --git a/src/js/game/hud/parts/building_placer.js b/src/js/game/hud/parts/building_placer.js index ce6e116b..5a2f42de 100644 --- a/src/js/game/hud/parts/building_placer.js +++ b/src/js/game/hud/parts/building_placer.js @@ -440,11 +440,6 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { for (let acceptorSlotIndex = 0; acceptorSlotIndex < slots.length; ++acceptorSlotIndex) { const slot = slots[acceptorSlotIndex]; - // Only draw same layer slots - if (slot.layer !== this.root.currentLayer) { - continue; - } - const acceptorSlotWsTile = staticComp.localTileToWorld(slot.pos); const acceptorSlotWsPos = acceptorSlotWsTile.toWorldSpaceCenterOfTile(); @@ -478,20 +473,12 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { // If this entity is on the same layer as the slot - if so, it can either be // connected, or it can not be connected and thus block the input - if (sourceEntity.layer === slot.layer) { - if ( - sourceEjector && - sourceEjector.anySlotEjectsToLocalTile( - ejectorAcceptLocalTile, - this.root.currentLayer - ) - ) { - // This one is connected, all good - isConnected = true; - } else { - // This one is blocked - isBlocked = true; - } + if (sourceEjector && sourceEjector.anySlotEjectsToLocalTile(ejectorAcceptLocalTile)) { + // This one is connected, all good + isConnected = true; + } else { + // This one is blocked + isBlocked = true; } } @@ -520,11 +507,6 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { for (let ejectorSlotIndex = 0; ejectorSlotIndex < slots.length; ++ejectorSlotIndex) { const slot = slots[ejectorSlotIndex]; - // Only draw same layer slots - if (slot.layer !== this.root.currentLayer) { - continue; - } - const ejectorSlotWsTile = staticComp.localTileToWorld( ejectorComp.getSlotTargetLocalTile(ejectorSlotIndex) ); @@ -546,21 +528,14 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic { const destAcceptor = destEntity.components.ItemAcceptor; const destStaticComp = destEntity.components.StaticMapEntity; - // If this entity is on the same layer as the slot - if so, it can either be - // connected, or it can not be connected and thus block the input - if (destEntity.layer === slot.layer) { - const destLocalTile = destStaticComp.worldToLocalTile(ejectorSlotWsTile); - const destLocalDir = destStaticComp.worldDirectionToLocal(ejectorSlotWsDirection); - if ( - destAcceptor && - destAcceptor.findMatchingSlot(destLocalTile, destLocalDir, this.root.currentLayer) - ) { - // This one is connected, all good - isConnected = true; - } else { - // This one is blocked - isBlocked = true; - } + const destLocalTile = destStaticComp.worldToLocalTile(ejectorSlotWsTile); + const destLocalDir = destStaticComp.worldDirectionToLocal(ejectorSlotWsDirection); + if (destAcceptor && destAcceptor.findMatchingSlot(destLocalTile, destLocalDir)) { + // This one is connected, all good + isConnected = true; + } else { + // This one is blocked + isBlocked = true; } } diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js index c46a5c98..929f72b1 100644 --- a/src/js/game/hud/parts/buildings_toolbar.js +++ b/src/js/game/hud/parts/buildings_toolbar.js @@ -1,6 +1,5 @@ import { MetaBeltBaseBuilding } from "../../buildings/belt_base"; import { MetaCutterBuilding } from "../../buildings/cutter"; -import { MetaEnergyGenerator } from "../../buildings/energy_generator"; import { MetaMinerBuilding } from "../../buildings/miner"; import { MetaMixerBuilding } from "../../buildings/mixer"; import { MetaPainterBuilding } from "../../buildings/painter"; @@ -11,7 +10,6 @@ import { MetaTrashBuilding } from "../../buildings/trash"; import { MetaUndergroundBeltBuilding } from "../../buildings/underground_belt"; import { enumLayer } from "../../root"; import { HUDBaseToolbar } from "./base_toolbar"; -import { MetaAdvancedProcessorBuilding } from "../../buildings/advanced_processor"; const supportedBuildings = [ MetaBeltBaseBuilding, @@ -24,9 +22,6 @@ const supportedBuildings = [ MetaMixerBuilding, MetaPainterBuilding, MetaTrashBuilding, - - MetaEnergyGenerator, - MetaAdvancedProcessorBuilding, ]; export class HUDBuildingsToolbar extends HUDBaseToolbar { diff --git a/src/js/game/hud/parts/color_blind_helper.js b/src/js/game/hud/parts/color_blind_helper.js index c7dd6288..46890979 100644 --- a/src/js/game/hud/parts/color_blind_helper.js +++ b/src/js/game/hud/parts/color_blind_helper.js @@ -66,9 +66,6 @@ export class HUDColorBlindHelper extends BaseHUDPart { if (ejectorComp) { for (let i = 0; i < ejectorComp.slots.length; ++i) { const slot = ejectorComp.slots[i]; - if (slot.layer !== this.root.currentLayer) { - continue; - } if (slot.item && slot.item.getItemType() === enumItemType.color) { return /** @type {ColorItem} */ (slot.item).color; } diff --git a/src/js/game/hud/parts/wires_toolbar.js b/src/js/game/hud/parts/wires_toolbar.js index 6ebc0a98..deb73f18 100644 --- a/src/js/game/hud/parts/wires_toolbar.js +++ b/src/js/game/hud/parts/wires_toolbar.js @@ -1,9 +1,7 @@ -import { MetaWireBaseBuilding } from "../../buildings/wire_base"; import { enumLayer } from "../../root"; import { HUDBaseToolbar } from "./base_toolbar"; -import { MetaWireCrossingsBuilding } from "../../buildings/wire_crossings"; -const supportedBuildings = [MetaWireBaseBuilding, MetaWireCrossingsBuilding]; +const supportedBuildings = []; export class HUDWiresToolbar extends HUDBaseToolbar { constructor(root) { diff --git a/src/js/game/hud/trailer_maker.js b/src/js/game/hud/trailer_maker.js index 2834b40d..cb81aab3 100644 --- a/src/js/game/hud/trailer_maker.js +++ b/src/js/game/hud/trailer_maker.js @@ -92,7 +92,7 @@ export class TrailerMaker { const speed = globalConfig.tileSize * globalConfig.beltSpeedItemsPerSecond * - globalConfig.beltItemSpacingByLayer[enumLayer.regular]; + globalConfig.itemSpacingOnBelts; // let time = // this.currentPlaybackOrigin.distance(Vector.fromSerializedObject(nextMarker.pos)) / speed; const time = nextMarker.time; diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js index 2dfc5bb1..542009ee 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -54,12 +54,6 @@ export const KEYMAPPINGS = { mixer: { keyCode: key("8") }, painter: { keyCode: key("9") }, trash: { keyCode: key("0") }, - energy_generator: { keyCode: key("O") }, - advanced_processor: { keyCode: key("P") }, - - // Wires layer - wire: { keyCode: key("1") }, - wire_crossings: { keyCode: key("2") }, }, placement: { diff --git a/src/js/game/logic.js b/src/js/game/logic.js index f703691e..b28d346b 100644 --- a/src/js/game/logic.js +++ b/src/js/game/logic.js @@ -3,7 +3,7 @@ import { round2Digits } from "../core/utils"; import { enumDirection, enumDirectionToVector, Vector } from "../core/vector"; import { Entity } from "./entity"; import { MetaBuilding } from "./meta_building"; -import { enumLayer, GameRoot } from "./root"; +import { GameRoot, enumLayer } from "./root"; import { STOP_PROPAGATION } from "../core/signal"; const logger = createLogger("ingame/logic"); @@ -178,10 +178,9 @@ export class GameLogic { /** * Returns the acceptors and ejectors which affect the current tile * @param {Vector} tile - * @param {enumLayer} layer * @returns {AcceptorsAndEjectorsAffectingTile} */ - getEjectorsAndAcceptorsAtTile(tile, layer) { + getEjectorsAndAcceptorsAtTile(tile) { /** @type {EjectorsAffectingTile} */ let ejectors = []; /** @type {AcceptorsAffectingTile} */ @@ -194,10 +193,8 @@ export class GameLogic { continue; } - const entities = this.root.map.getLayersContentsMultipleXY(tile.x + dx, tile.y + dy); - for (let i = 0; i < entities.length; ++i) { - const entity = entities[i]; - + const entity = this.root.map.getLayerContentXY(tile.x + dx, tile.y + dy, enumLayer.regular); + if (entity) { let ejectorSlots = []; let acceptorSlots = []; @@ -223,9 +220,6 @@ export class GameLogic { for (let ejectorSlot = 0; ejectorSlot < ejectorSlots.length; ++ejectorSlot) { const slot = ejectorSlots[ejectorSlot]; - if (slot.layer !== layer) { - continue; - } const wsTile = staticComp.localTileToWorld(slot.pos); const wsDirection = staticComp.localDirectionToWorld(slot.direction); const targetTile = wsTile.add(enumDirectionToVector[wsDirection]); @@ -241,10 +235,6 @@ export class GameLogic { for (let acceptorSlot = 0; acceptorSlot < acceptorSlots.length; ++acceptorSlot) { const slot = acceptorSlots[acceptorSlot]; - if (slot.layer !== layer) { - continue; - } - const wsTile = staticComp.localTileToWorld(slot.pos); for (let k = 0; k < slot.directions.length; ++k) { const direction = slot.directions[k]; diff --git a/src/js/game/map_chunk_view.js b/src/js/game/map_chunk_view.js index 491939f4..80ffa12e 100644 --- a/src/js/game/map_chunk_view.js +++ b/src/js/game/map_chunk_view.js @@ -48,15 +48,6 @@ export class MapChunkView extends MapChunk { systems.staticMapEntities.drawChunk(parameters, this); } - /** - * Draws the wires layer - * @param {DrawParameters} parameters - */ - drawWiresLayer(parameters) { - const systems = this.root.systemMgr.systems; - systems.belt.drawWiresChunk(parameters, this); - } - /** * Draws the wires layer * @param {DrawParameters} parameters diff --git a/src/js/game/map_view.js b/src/js/game/map_view.js index bd10755c..f7b9a7b3 100644 --- a/src/js/game/map_view.js +++ b/src/js/game/map_view.js @@ -167,14 +167,6 @@ export class MapView extends BaseMap { } } - /** - * Draws the wires background - * @param {DrawParameters} parameters - */ - drawWiresLayer(parameters) { - this.drawVisibleChunks(parameters, MapChunkView.prototype.drawWiresLayer); - } - /** * Draws the wires foreground * @param {DrawParameters} parameters diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js index 20ca6f41..36e534ac 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -1,10 +1,8 @@ import { gMetaBuildingRegistry } from "../core/global_registries"; import { createLogger } from "../core/logging"; -import { MetaAdvancedProcessorBuilding } from "./buildings/advanced_processor"; import { MetaBeltBuilding } from "./buildings/belt"; import { MetaBeltBaseBuilding } from "./buildings/belt_base"; import { enumCutterVariants, MetaCutterBuilding } from "./buildings/cutter"; -import { MetaEnergyGenerator } from "./buildings/energy_generator"; import { MetaHubBuilding } from "./buildings/hub"; import { enumMinerVariants, MetaMinerBuilding } from "./buildings/miner"; import { MetaMixerBuilding } from "./buildings/mixer"; @@ -14,8 +12,6 @@ import { enumSplitterVariants, MetaSplitterBuilding } from "./buildings/splitter import { MetaStackerBuilding } from "./buildings/stacker"; import { enumTrashVariants, MetaTrashBuilding } from "./buildings/trash"; import { enumUndergroundBeltVariants, MetaUndergroundBeltBuilding } from "./buildings/underground_belt"; -import { MetaWireBaseBuilding } from "./buildings/wire_base"; -import { enumWireCrossingVariants, MetaWireCrossingsBuilding } from "./buildings/wire_crossings"; import { gBuildingVariants, registerBuildingVariant } from "./building_codes"; import { defaultBuildingVariant } from "./meta_building"; @@ -33,10 +29,6 @@ export function initMetaBuildingRegistry() { gMetaBuildingRegistry.register(MetaBeltBuilding); gMetaBuildingRegistry.register(MetaUndergroundBeltBuilding); gMetaBuildingRegistry.register(MetaHubBuilding); - gMetaBuildingRegistry.register(MetaEnergyGenerator); - gMetaBuildingRegistry.register(MetaWireBaseBuilding); - gMetaBuildingRegistry.register(MetaAdvancedProcessorBuilding); - gMetaBuildingRegistry.register(MetaWireCrossingsBuilding); // Belt registerBuildingVariant(1, MetaBeltBaseBuilding, defaultBuildingVariant, 0); @@ -86,21 +78,6 @@ export function initMetaBuildingRegistry() { // Hub registerBuildingVariant(26, MetaHubBuilding); - // Energy generator - registerBuildingVariant(27, MetaEnergyGenerator); - - // Wire - registerBuildingVariant(28, MetaWireBaseBuilding, defaultBuildingVariant, 0); - registerBuildingVariant(29, MetaWireBaseBuilding, defaultBuildingVariant, 1); - registerBuildingVariant(30, MetaWireBaseBuilding, defaultBuildingVariant, 2); - - // Advanced processor - registerBuildingVariant(31, MetaAdvancedProcessorBuilding); - - // Wire crossing - registerBuildingVariant(32, MetaWireCrossingsBuilding); - registerBuildingVariant(33, MetaWireCrossingsBuilding, enumWireCrossingVariants.merger); - // Propagate instances for (const key in gBuildingVariants) { gBuildingVariants[key].metaInstance = gMetaBuildingRegistry.findByClass( diff --git a/src/js/game/shape_definition.js b/src/js/game/shape_definition.js index f6117a52..8da82d80 100644 --- a/src/js/game/shape_definition.js +++ b/src/js/game/shape_definition.js @@ -5,13 +5,7 @@ import { DrawParameters } from "../core/draw_parameters"; import { createLogger } from "../core/logging"; import { Vector } from "../core/vector"; import { BasicSerializableObject, types } from "../savegame/serialization"; -import { - enumColors, - enumColorsToHexCode, - enumColorToShortcode, - enumShortcodeToColor, - enumInvertedColors, -} from "./colors"; +import { enumColors, enumColorsToHexCode, enumColorToShortcode, enumShortcodeToColor } from "./colors"; import { THEME } from "./theme"; const rusha = require("rusha"); @@ -598,23 +592,6 @@ export class ShapeDefinition extends BasicSerializableObject { return new ShapeDefinition({ layers: newLayers }); } - /** - * Clones the shape and inverts all colors - */ - cloneAndInvertColors() { - const newLayers = this.internalCloneLayers(); - for (let layerIndex = 0; layerIndex < newLayers.length; ++layerIndex) { - const quadrants = newLayers[layerIndex]; - for (let quadrantIndex = 0; quadrantIndex < 4; ++quadrantIndex) { - const item = quadrants[quadrantIndex]; - if (item) { - item.color = enumInvertedColors[item.color]; - } - } - } - return new ShapeDefinition({ layers: newLayers }); - } - /** * Clones the shape and colors everything in the given colors * @param {[enumColors, enumColors, enumColors, enumColors]} colors diff --git a/src/js/game/shape_definition_manager.js b/src/js/game/shape_definition_manager.js index a3b8c841..bf240071 100644 --- a/src/js/game/shape_definition_manager.js +++ b/src/js/game/shape_definition_manager.js @@ -179,22 +179,6 @@ export class ShapeDefinitionManager extends BasicSerializableObject { )); } - /** - * Generates a definition for inverting all colors on that shape - * @param {ShapeDefinition} definition - * @returns {ShapeDefinition} - */ - shapeActionInvertColors(definition) { - const key = "invert:" + definition.getHash(); - if (this.operationCache[key]) { - return /** @type {ShapeDefinition} */ (this.operationCache[key]); - } - const inverted = definition.cloneAndInvertColors(); - return /** @type {ShapeDefinition} */ (this.operationCache[key] = this.registerOrReturnHandle( - inverted - )); - } - /** * Generates a definition for painting it with the 4 colors * @param {ShapeDefinition} definition diff --git a/src/js/game/systems/belt.js b/src/js/game/systems/belt.js index 08832e16..7f09a873 100644 --- a/src/js/game/systems/belt.js +++ b/src/js/game/systems/belt.js @@ -13,9 +13,6 @@ import { Entity } from "../entity"; import { GameSystemWithFilter } from "../game_system_with_filter"; import { MapChunkView } from "../map_chunk_view"; import { defaultBuildingVariant } from "../meta_building"; -import { enumLayer } from "../root"; -import { MetaWireBaseBuilding } from "../buildings/wire_base"; -import { enumItemType } from "../base_item"; export const BELT_ANIM_COUNT = 28; @@ -320,14 +317,10 @@ export class BeltSystem extends GameSystemWithFilter { /** * Draws all belt paths * @param {DrawParameters} parameters - * @param {enumLayer} layer */ - drawLayerBeltItems(parameters, layer) { + drawBeltItems(parameters) { for (let i = 0; i < this.beltPaths.length; ++i) { - const path = this.beltPaths[i]; - if (path.layer === layer) { - path.draw(parameters); - } + this.beltPaths[i].draw(parameters); } } @@ -497,13 +490,13 @@ export class BeltSystem extends GameSystemWithFilter { } // Limit speed to avoid belts going backwards - const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(enumLayer.regular), 10); + const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10); // SYNC with systems/item_acceptor.js:drawEntityUnderlays! // 126 / 42 is the exact animation speed of the png animation const animationIndex = Math.floor( ((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) * - globalConfig.beltItemSpacingByLayer[enumLayer.regular] + globalConfig.itemSpacingOnBelts ); const contents = chunk.contents; for (let y = 0; y < globalConfig.mapChunkSize; ++y) { @@ -526,35 +519,6 @@ export class BeltSystem extends GameSystemWithFilter { 1; } - /** - * Draws a given chunk - * @param {DrawParameters} parameters - * @param {MapChunkView} chunk - */ - drawWiresChunk(parameters, chunk) { - if (parameters.zoomLevel < globalConfig.mapChunkOverviewMinZoom) { - return; - } - - const contents = chunk.wireContents; - for (let y = 0; y < globalConfig.mapChunkSize; ++y) { - for (let x = 0; x < globalConfig.mapChunkSize; ++x) { - const entity = contents[x][y]; - - if (entity && entity.components.Belt) { - const direction = entity.components.Belt.direction; - const sprite = this.wireSprites[direction]; - entity.components.StaticMapEntity.drawSpriteOnFullEntityBounds( - parameters, - sprite, - 0, - false - ); - } - } - } - } - /** * Draws the belt path debug overlays * @param {DrawParameters} parameters diff --git a/src/js/game/systems/belt_underlays.js b/src/js/game/systems/belt_underlays.js index 28d6b71d..4bfd4b48 100644 --- a/src/js/game/systems/belt_underlays.js +++ b/src/js/game/systems/belt_underlays.js @@ -1,12 +1,11 @@ -import { GameSystemWithFilter } from "../game_system_with_filter"; -import { BeltUnderlaysComponent } from "../components/belt_underlays"; -import { BELT_ANIM_COUNT } from "./belt"; -import { Loader } from "../../core/loader"; -import { enumLayer } from "../root"; -import { Entity } from "../entity"; -import { enumDirectionToAngle } from "../../core/vector"; import { globalConfig } from "../../core/config"; import { drawRotatedSprite } from "../../core/draw_utils"; +import { Loader } from "../../core/loader"; +import { enumDirectionToAngle } from "../../core/vector"; +import { BeltUnderlaysComponent } from "../components/belt_underlays"; +import { Entity } from "../entity"; +import { GameSystemWithFilter } from "../game_system_with_filter"; +import { BELT_ANIM_COUNT } from "./belt"; export class BeltUnderlaysSystem extends GameSystemWithFilter { constructor(root) { @@ -22,32 +21,25 @@ export class BeltUnderlaysSystem extends GameSystemWithFilter { /** * Draws the acceptor underlays * @param {import("../../core/draw_utils").DrawParameters} parameters - * @param {enumLayer} layer */ - drawUnderlays(parameters, layer) { - this.forEachMatchingEntityOnScreen(parameters, this.drawEntityUnderlays.bind(this, layer)); + drawUnderlays(parameters) { + this.forEachMatchingEntityOnScreen(parameters, this.drawEntityUnderlays.bind(this)); } /** - * @param {enumLayer} layer * @param {import("../../core/draw_utils").DrawParameters} parameters * @param {Entity} entity */ - drawEntityUnderlays(layer, parameters, entity) { + drawEntityUnderlays(parameters, entity) { const staticComp = entity.components.StaticMapEntity; const underlayComp = entity.components.BeltUnderlays; - if (entity.layer !== layer) { - // Not our layer - return; - } - if (!staticComp.shouldBeDrawn(parameters)) { return; } // Limit speed to avoid belts going backwards - const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(layer), 10); + const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10); const underlays = underlayComp.underlays; for (let i = 0; i < underlays.length; ++i) { @@ -59,7 +51,7 @@ export class BeltUnderlaysSystem extends GameSystemWithFilter { // SYNC with systems/belt.js:drawSingleEntity! const animationIndex = Math.floor( ((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) * - globalConfig.beltItemSpacingByLayer[layer] + globalConfig.itemSpacingOnBelts ); drawRotatedSprite({ diff --git a/src/js/game/systems/energy_consumer.js b/src/js/game/systems/energy_consumer.js deleted file mode 100644 index 6552fb9a..00000000 --- a/src/js/game/systems/energy_consumer.js +++ /dev/null @@ -1,90 +0,0 @@ -import { DrawParameters } from "../../core/draw_parameters"; -import { Loader } from "../../core/loader"; -import { clamp } from "../../core/utils"; -import { enumItemType } from "../base_item"; -import { EnergyConsumerComponent } from "../components/energy_consumer"; -import { Entity } from "../entity"; -import { GameSystemWithFilter } from "../game_system_with_filter"; -import { NEGATIVE_ENERGY_ITEM_SINGLETON } from "../items/negative_energy_item"; -import { POSITIVE_ENERGY_ITEM_SINGLETON } from "../items/positive_energy_item"; - -export class EnergyConsumerSystem extends GameSystemWithFilter { - constructor(root) { - super(root, [EnergyConsumerComponent]); - - this.batterySprites = [ - Loader.getSprite("sprites/wires/battery_empty.png"), - Loader.getSprite("sprites/wires/battery_low.png"), - Loader.getSprite("sprites/wires/battery_medium.png"), - Loader.getSprite("sprites/wires/battery_full.png"), - ]; - - this.piledWasteSprite = Loader.getSprite("sprites/wires/waste_piled.png"); - } - - update() { - for (let i = 0; i < this.allEntities.length; ++i) { - const entity = this.allEntities[i]; - const energyConsumerComp = entity.components.EnergyConsumer; - - if (energyConsumerComp.piledOutput >= 1.0) { - // Try to get rid of waste - - const ejectorComp = entity.components.ItemEjector; - const item = this.getItemSingletonByType(energyConsumerComp.wasteType); - if (ejectorComp.tryEject(energyConsumerComp.ejectorSlotIndex, item)) { - // Got rid of waste - energyConsumerComp.reduceWaste(1.0); - } - } - } - } - - /** - * - * @param {enumItemType} itemType - */ - getItemSingletonByType(itemType) { - switch (itemType) { - case enumItemType.positiveEnergy: - return POSITIVE_ENERGY_ITEM_SINGLETON; - case enumItemType.negativeEnergy: - return NEGATIVE_ENERGY_ITEM_SINGLETON; - default: - assertAlways(false, "Bad item type: " + itemType); - } - } - - /** - * Draws everything - * @param {DrawParameters} parameters - */ - draw(parameters) { - this.forEachMatchingEntityOnScreen(parameters, this.drawSingleEntity.bind(this)); - } - - /** - * Draws a given entity - * @param {DrawParameters} parameters - * @param {Entity} entity - */ - drawSingleEntity(parameters, entity) { - const staticComp = entity.components.StaticMapEntity; - const consumerComp = entity.components.EnergyConsumer; - - const position = staticComp.localTileToWorld(consumerComp.batteryPosition).toWorldSpaceCenterOfTile(); - - if (consumerComp.hasTooMuchWastePiled()) { - this.piledWasteSprite.drawCachedCentered(parameters, position.x, position.y, 12); - } else { - const percentage = consumerComp.stored / consumerComp.bufferSize; - const index = clamp( - Math.round(percentage * this.batterySprites.length), - 0, - this.batterySprites.length - 1 - ); - - this.batterySprites[index].drawCachedCentered(parameters, position.x, position.y, 12); - } - } -} diff --git a/src/js/game/systems/energy_generator.js b/src/js/game/systems/energy_generator.js deleted file mode 100644 index 76e14c01..00000000 --- a/src/js/game/systems/energy_generator.js +++ /dev/null @@ -1,97 +0,0 @@ -import { DrawParameters } from "../../core/draw_parameters"; -import { formatBigNumber } from "../../core/utils"; -import { T } from "../../translations"; -import { EnergyGeneratorComponent } from "../components/energy_generator"; -import { Entity } from "../entity"; -import { GameSystemWithFilter } from "../game_system_with_filter"; -import { POSITIVE_ENERGY_ITEM_SINGLETON } from "../items/positive_energy_item"; -import { ShapeDefinition } from "../shape_definition"; -import { Loader } from "../../core/loader"; -import { globalConfig } from "../../core/config"; - -export class EnergyGeneratorSystem extends GameSystemWithFilter { - constructor(root) { - super(root, [EnergyGeneratorComponent]); - - this.energyGeneratorOverlay = Loader.getSprite("sprites/misc/energy_generator_overlay.png"); - } - - draw(parameters) { - this.forEachMatchingEntityOnScreen(parameters, this.drawEntity.bind(this)); - } - - /** - * Returns which shape is required for a given generator - * @param {Entity} entity - */ - getShapeRequiredForGenerator(entity) { - return "CuCuCuCu"; - } - - update() { - for (let i = 0; i < this.allEntities.length; ++i) { - const entity = this.allEntities[i]; - const energyGenComp = entity.components.EnergyGenerator; - const ejectorComp = entity.components.ItemEjector; - - if (!energyGenComp.requiredKey) { - // Compute required key for this generator - energyGenComp.requiredKey = this.getShapeRequiredForGenerator(entity); - } - - if (energyGenComp.itemsInQueue > 0) { - // FIXME: Find slot dynamically - if (ejectorComp.tryEject(0, POSITIVE_ENERGY_ITEM_SINGLETON)) { - energyGenComp.itemsInQueue -= 1; - } - } - } - } - - /** - * @param {DrawParameters} parameters - * @param {Entity} entity - */ - drawEntity(parameters, entity) { - const context = parameters.context; - const staticComp = entity.components.StaticMapEntity; - - if (!staticComp.shouldBeDrawn(parameters)) { - return; - } - - const energyGenComp = entity.components.EnergyGenerator; - if (!energyGenComp.requiredKey) { - // Not initialized yet - return; - } - - const pos = staticComp.getTileSpaceBounds().getCenter().toWorldSpace(); - - const definition = ShapeDefinition.fromShortKey(energyGenComp.requiredKey); - definition.draw(pos.x, pos.y, parameters, 30); - - // Draw background - this.energyGeneratorOverlay.drawCachedCentered( - parameters, - pos.x, - pos.y, - globalConfig.tileSize * 2 + 8 - ); - - // TODO - const energyGenerated = 5; - - // deliver: Deliver - // toGenerateEnergy: For energy - context.font = "bold 9px GameFont"; - context.fillStyle = "#64666e"; - context.textAlign = "left"; - context.fillText(T.buildings.energy_generator.deliver.toUpperCase(), pos.x - 25, pos.y - 18); - context.fillText(T.buildings.energy_generator.toGenerateEnergy.toUpperCase(), pos.x - 25, pos.y + 27); - - context.font = "700 9px GameFont"; - context.fillStyle = "#dee1ea"; - context.fillText("" + formatBigNumber(energyGenerated), pos.x + 1, pos.y + 27); - } -} diff --git a/src/js/game/systems/item_acceptor.js b/src/js/game/systems/item_acceptor.js index 06d4df16..1caf14c6 100644 --- a/src/js/game/systems/item_acceptor.js +++ b/src/js/game/systems/item_acceptor.js @@ -23,11 +23,8 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { // Process item consumption animations to avoid items popping from the belts for (let animIndex = 0; animIndex < animations.length; ++animIndex) { const anim = animations[animIndex]; - const layer = aceptorComp.slots[anim.slotIndex].layer; anim.animProgress += - progress * - this.root.hubGoals.getBeltBaseSpeed(layer) * - globalConfig.beltItemSpacingByLayer[layer]; + progress * this.root.hubGoals.getBeltBaseSpeed() * globalConfig.itemSpacingOnBelts; if (anim.animProgress > 1) { // Original // animations.splice(animIndex, 1); @@ -44,18 +41,16 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { /** * Draws the acceptor items * @param {DrawParameters} parameters - * @param {enumLayer} layer */ - drawLayer(parameters, layer) { - this.forEachMatchingEntityOnScreen(parameters, this.drawEntityRegularLayer.bind(this, layer)); + draw(parameters) { + this.forEachMatchingEntityOnScreen(parameters, this.drawEntityRegularLayer.bind(this)); } /** - * @param {enumLayer} layer * @param {DrawParameters} parameters * @param {Entity} entity */ - drawEntityRegularLayer(layer, parameters, entity) { + drawEntityRegularLayer(parameters, entity) { const staticComp = entity.components.StaticMapEntity; const acceptorComp = entity.components.ItemAcceptor; @@ -69,10 +64,6 @@ export class ItemAcceptorSystem extends GameSystemWithFilter { ]; const slotData = acceptorComp.slots[slotIndex]; - if (slotData.layer !== layer) { - // Don't draw non-regular slots for now - continue; - } const slotWorldPos = staticComp.applyRotationToVector(slotData.pos).add(staticComp.origin); const fadeOutDirection = enumDirectionToVector[staticComp.localDirectionToWorld(direction)]; diff --git a/src/js/game/systems/item_ejector.js b/src/js/game/systems/item_ejector.js index c0c53f04..8d6f0efe 100644 --- a/src/js/game/systems/item_ejector.js +++ b/src/js/game/systems/item_ejector.js @@ -3,11 +3,10 @@ import { DrawParameters } from "../../core/draw_parameters"; import { createLogger } from "../../core/logging"; import { Rectangle } from "../../core/rectangle"; import { enumDirection, enumDirectionToVector, Vector } from "../../core/vector"; -import { BaseItem, enumItemTypeToLayer } from "../base_item"; +import { BaseItem } from "../base_item"; import { ItemEjectorComponent } from "../components/item_ejector"; import { Entity } from "../entity"; import { GameSystemWithFilter } from "../game_system_with_filter"; -import { enumLayer } from "../root"; const logger = createLogger("systems/ejector"); @@ -166,8 +165,7 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const matchingSlot = targetAcceptorComp.findMatchingSlot( targetStaticComp.worldToLocalTile(ejectSlotTargetWsTile), - targetStaticComp.worldDirectionToLocal(ejectSlotWsDirection), - ejectorSlot.layer + targetStaticComp.worldDirectionToLocal(ejectSlotWsDirection) ); if (!matchingSlot) { @@ -219,8 +217,8 @@ export class ItemEjectorSystem extends GameSystemWithFilter { 1, sourceSlot.progress + progressGrowth * - this.root.hubGoals.getBeltBaseSpeed(sourceSlot.layer) * - globalConfig.beltItemSpacingByLayer[sourceSlot.layer] + this.root.hubGoals.getBeltBaseSpeed() * + globalConfig.itemSpacingOnBelts ); // Check if we are still in the process of ejecting, can't proceed then @@ -272,8 +270,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { // TODO: Kinda hacky. How to solve this properly? Don't want to go through inheritance hell. // Also its just a few cases (hope it stays like this .. :x). - const itemLayer = enumItemTypeToLayer[item.getItemType()]; - const beltComp = receiver.components.Belt; if (beltComp) { const path = beltComp.assignedPath; @@ -297,15 +293,12 @@ export class ItemEjectorSystem extends GameSystemWithFilter { const itemProcessorComp = receiver.components.ItemProcessor; if (itemProcessorComp) { - // Make sure its the same layer - if (itemLayer === receiver.layer) { - // Its an item processor .. - if (itemProcessorComp.tryTakeItem(item, slotIndex)) { - return true; - } - // Item processor can have nothing else - return false; + // Its an item processor .. + if (itemProcessorComp.tryTakeItem(item, slotIndex)) { + return true; } + // Item processor can have nothing else + return false; } const undergroundBeltComp = receiver.components.UndergroundBelt; @@ -336,35 +329,22 @@ export class ItemEjectorSystem extends GameSystemWithFilter { return false; } - const energyGeneratorComp = receiver.components.EnergyGenerator; - if (energyGeneratorComp) { - if (energyGeneratorComp.tryTakeItem(item, slotIndex)) { - // Passed it over - return true; - } - - // Energy generator comp can't have anything else - return false; - } - return false; } /** - * Draws the given layer + * Draws everything * @param {DrawParameters} parameters - * @param {enumLayer} layer */ - drawLayer(parameters, layer) { - this.forEachMatchingEntityOnScreen(parameters, this.drawSingleEntity.bind(this, layer)); + draw(parameters) { + this.forEachMatchingEntityOnScreen(parameters, this.drawSingleEntity.bind(this)); } /** - * @param {enumLayer} layer * @param {DrawParameters} parameters * @param {Entity} entity */ - drawSingleEntity(layer, parameters, entity) { + drawSingleEntity(parameters, entity) { const ejectorComp = entity.components.ItemEjector; const staticComp = entity.components.StaticMapEntity; @@ -381,11 +361,6 @@ export class ItemEjectorSystem extends GameSystemWithFilter { continue; } - if (slot.layer !== layer) { - // Not our layer - continue; - } - const realPosition = slot.pos.rotateFastMultipleOf90(staticComp.rotation); const realDirection = Vector.transformDirectionFromMultipleOf90( slot.direction, diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js index 582ea8fe..5baecc4e 100644 --- a/src/js/game/systems/item_processor.js +++ b/src/js/game/systems/item_processor.js @@ -1,6 +1,6 @@ import { globalConfig } from "../../core/config"; import { BaseItem, enumItemType } from "../base_item"; -import { enumColorMixingResults, enumInvertedColors } from "../colors"; +import { enumColorMixingResults } from "../colors"; import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor"; import { Entity } from "../entity"; import { GameSystemWithFilter } from "../game_system_with_filter"; @@ -48,11 +48,11 @@ export class ItemProcessorSystem extends GameSystemWithFilter { if (ejectorComp.canEjectOnSlot(preferredSlot)) { slot = preferredSlot; } else { - slot = ejectorComp.getFirstFreeSlot(entity.layer); + slot = ejectorComp.getFirstFreeSlot(); } } else { // We can eject on any slot - slot = ejectorComp.getFirstFreeSlot(entity.layer); + slot = ejectorComp.getFirstFreeSlot(); } if (slot !== null) { @@ -354,35 +354,6 @@ export class ItemProcessorSystem extends GameSystemWithFilter { break; } - // ADVANCED PROCESSING - - case enumItemProcessorTypes.advancedProcessor: { - const item = items[0].item; - - if (item.getItemType() === enumItemType.color) { - const colorItem = /** @type {ColorItem} */ (items[0].item); - const newColor = enumInvertedColors[colorItem.color]; - outItems.push({ - item: new ColorItem(newColor), - requiredSlot: 0, - }); - } else if (item.getItemType() === enumItemType.shape) { - const shapeItem = /** @type {ShapeItem} */ (items[0].item); - const newItem = this.root.shapeDefinitionMgr.shapeActionInvertColors( - shapeItem.definition - ); - - outItems.push({ - item: new ShapeItem(newItem), - requiredSlot: 0, - }); - } else { - assertAlways(false, "Bad item type: " + item.getItemType() + " for advanced processor."); - } - - break; - } - default: assertAlways(false, "Unkown item processor type: " + processorComp.type); } diff --git a/src/js/game/systems/static_map_entity.js b/src/js/game/systems/static_map_entity.js index 886291a6..c5089eb3 100644 --- a/src/js/game/systems/static_map_entity.js +++ b/src/js/game/systems/static_map_entity.js @@ -1,10 +1,9 @@ -import { GameSystem } from "../game_system"; -import { DrawParameters } from "../../core/draw_parameters"; import { globalConfig } from "../../core/config"; -import { MapChunkView } from "../map_chunk_view"; +import { DrawParameters } from "../../core/draw_parameters"; import { Loader } from "../../core/loader"; import { enumDirection } from "../../core/vector"; -import { enumLayer } from "../root"; +import { GameSystem } from "../game_system"; +import { MapChunkView } from "../map_chunk_view"; export class StaticMapEntitySystem extends GameSystem { constructor(root) { diff --git a/src/js/game/systems/storage.js b/src/js/game/systems/storage.js index 7f946e5b..b6f62d46 100644 --- a/src/js/game/systems/storage.js +++ b/src/js/game/systems/storage.js @@ -22,8 +22,7 @@ export class StorageSystem extends GameSystemWithFilter { if (storageComp.storedItem && storageComp.storedCount > 0) { const ejectorComp = entity.components.ItemEjector; - /* FIXME: WIRES */ - const nextSlot = ejectorComp.getFirstFreeSlot(enumLayer.regular); + const nextSlot = ejectorComp.getFirstFreeSlot(); if (nextSlot !== null) { if (ejectorComp.tryEject(nextSlot, storageComp.storedItem)) { storageComp.storedCount--; diff --git a/src/js/game/systems/underground_belt.js b/src/js/game/systems/underground_belt.js index f5e1b0ab..5bbb280c 100644 --- a/src/js/game/systems/underground_belt.js +++ b/src/js/game/systems/underground_belt.js @@ -395,7 +395,7 @@ export class UndergroundBeltSystem extends GameSystemWithFilter { if (remainingTime <= 0) { const ejectorComp = entity.components.ItemEjector; - const nextSlotIndex = ejectorComp.getFirstFreeSlot(entity.layer); + const nextSlotIndex = ejectorComp.getFirstFreeSlot(); if (nextSlotIndex !== null) { if (ejectorComp.tryEject(nextSlotIndex, nextItem)) { items.shift(); diff --git a/src/js/game/systems/wired_pins.js b/src/js/game/systems/wired_pins.js index d64ee9ae..022e49b9 100644 --- a/src/js/game/systems/wired_pins.js +++ b/src/js/game/systems/wired_pins.js @@ -14,14 +14,6 @@ export class WiredPinsSystem extends GameSystemWithFilter { super(root, [WiredPinsComponent]); this.pinSprites = { - [enumPinSlotType.positiveEnergyEjector]: Loader.getSprite("sprites/wires/pin_positive_eject.png"), - [enumPinSlotType.positiveEnergyAcceptor]: Loader.getSprite( - "sprites/wires/pin_positive_accept.png" - ), - [enumPinSlotType.negativeEnergyEjector]: Loader.getSprite("sprites/wires/pin_negative_eject.png"), - [enumPinSlotType.negativeEnergyAcceptor]: Loader.getSprite( - "sprites/wires/pin_negative_accept.png" - ), [enumPinSlotType.logicalEjector]: Loader.getSprite("sprites/wires/pin_negative_eject.png"), [enumPinSlotType.logicalAcceptor]: Loader.getSprite("sprites/wires/pin_negative_accept.png"), }; diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 2c916da2..76c4106a 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -448,11 +448,6 @@ buildings: name: &belt Conveyor Belt description: Transports items, hold and drag to place multiple. - wire: - default: - name: &wire Energy Wire - description: Allows you to transport energy. - # Internal name for the Extractor miner: default: @@ -495,11 +490,6 @@ buildings: name: Cutter (Quad) description: Cuts shapes into four parts. If you use only one part, be sure to destroy the other parts or it will stall! - advanced_processor: - default: - name: &advanced_processor Color Inverter - description: Accepts a color or shape and inverts it. - rotater: default: name: &rotater Rotate @@ -547,25 +537,6 @@ buildings: name: Storage description: Stores excess items, up to a given capacity. Can be used as an overflow gate. - energy_generator: - deliver: Deliver - - # This will be shown before the amount, so for example 'For 123 Energy' - toGenerateEnergy: For - - default: - name: &energy_generator Energy Generator - description: Generates energy by consuming shapes. - - wire_crossings: - default: - name: &wire_crossings Wire Splitter - description: Splits a energy wire into two. - - merger: - name: Wire Merger - description: Merges two energy wires into one. - storyRewards: # Those are the rewards gained from completing the store reward_cutter_and_trash: @@ -826,14 +797,11 @@ keybindings: underground_belt: *underground_belt miner: *miner cutter: *cutter - advanced_processor: *advanced_processor rotater: *rotater stacker: *stacker mixer: *mixer - energy_generator: *energy_generator painter: *painter trash: *trash - wire: *wire pipette: Pipette rotateWhilePlacing: Rotate