Archives
/
tobspr_shapez.io
mirror of https://github.com/tobspr/shapez.io
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix energy generator being not rotateable

Browse Source
pull/406/head
tobspr 4 years ago
parent 0bba6a9d79
commit 54be64c0e2
17 changed files with 781 additions and 717 deletions
Show Stats Download Patch File Download Diff File

344
res_built/atlas/atlas0_10.json
View File

File diff suppressed because it is too large Load Diff

BIN
res_built/atlas/atlas0_10.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 68 KiB

300
res_built/atlas/atlas0_100.json
View File

File diff suppressed because it is too large Load Diff

BIN
res_built/atlas/atlas0_100.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

264
res_built/atlas/atlas0_25.json
View File

File diff suppressed because it is too large Load Diff

BIN
res_built/atlas/atlas0_25.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 KiB

After

Width:  |  Height:  |  Size: 216 KiB

326
res_built/atlas/atlas0_50.json
View File

File diff suppressed because it is too large Load Diff

BIN
res_built/atlas/atlas0_50.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 508 KiB

After

Width:  |  Height:  |  Size: 506 KiB

228
res_built/atlas/atlas0_75.json
Unescape View File

@ -2,7 +2,7 @@
"sprites/belt/forward_0.png":
{
"frame": {"x":1955,"y":251,"w":77,"h":95},
"frame": {"x":1956,"y":251,"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":1312,"y":580,"w":77,"h":95},
"frame": {"x":1956,"y":350,"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":1683,"y":936,"w":77,"h":95},
"frame": {"x":1416,"y":1055,"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":1929,"y":619,"w":77,"h":95},
"frame": {"x":1863,"y":990,"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":1938,"y":718,"w":77,"h":95},
"frame": {"x":1139,"y":1328,"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":1935,"y":817,"w":77,"h":95},
"frame": {"x":1400,"y":1386,"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":1139,"y":1328,"w":77,"h":95},
"frame": {"x":1481,"y":1377,"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":1944,"y":916,"w":77,"h":95},
"frame": {"x":1562,"y":1395,"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":1947,"y":1105,"w":77,"h":95},
"frame": {"x":1643,"y":1395,"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":1940,"y":1404,"w":77,"h":95},
"frame": {"x":1724,"y":1404,"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":1245,"y":684,"w":77,"h":95},
"frame": {"x":1956,"y":449,"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":1326,"y":679,"w":77,"h":95},
"frame": {"x":1312,"y":580,"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":1407,"y":659,"w":77,"h":95},
"frame": {"x":1245,"y":684,"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":1335,"y":778,"w":77,"h":95},
"frame": {"x":1326,"y":679,"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":1416,"y":758,"w":77,"h":95},
"frame": {"x":1407,"y":659,"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":1422,"y":857,"w":77,"h":95},
"frame": {"x":1335,"y":778,"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":1245,"y":1029,"w":77,"h":95},
"frame": {"x":1416,"y":758,"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":1422,"y":956,"w":77,"h":95},
"frame": {"x":1422,"y":857,"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":1416,"y":1055,"w":77,"h":95},
"frame": {"x":1245,"y":1027,"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":1683,"y":837,"w":77,"h":95},
"frame": {"x":1422,"y":956,"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":1731,"y":1215,"w":77,"h":95},
"frame": {"x":1683,"y":837,"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":1812,"y":1215,"w":77,"h":95},
"frame": {"x":1683,"y":936,"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":1764,"y":837,"w":77,"h":95},
"frame": {"x":1731,"y":1215,"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":1764,"y":936,"w":77,"h":95},
"frame": {"x":1812,"y":1215,"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":1893,"y":1215,"w":77,"h":95},
"frame": {"x":1764,"y":837,"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":1767,"y":711,"w":77,"h":95},
"frame": {"x":1764,"y":936,"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":1848,"y":621,"w":77,"h":95},
"frame": {"x":1767,"y":711,"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":1863,"y":990,"w":77,"h":95},
"frame": {"x":1848,"y":621,"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":322,"y":1416,"w":86,"h":86},
"frame": {"x":442,"y":1416,"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":412,"y":1416,"w":86,"h":86},
"frame": {"x":1393,"y":569,"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":1503,"y":927,"w":86,"h":86},
"frame": {"x":1593,"y":927,"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":1677,"y":747,"w":86,"h":86},
"frame": {"x":1683,"y":1035,"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":1683,"y":1035,"w":86,"h":86},
"frame": {"x":1677,"y":1125,"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":1677,"y":1125,"w":86,"h":86},
"frame": {"x":1281,"y":1147,"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":1281,"y":1147,"w":86,"h":86},
"frame": {"x":1281,"y":1237,"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":1281,"y":1237,"w":86,"h":86},
"frame": {"x":1371,"y":1154,"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":1371,"y":1154,"w":86,"h":86},
"frame": {"x":1371,"y":1244,"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":1371,"y":1244,"w":86,"h":86},
"frame": {"x":1461,"y":1197,"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":1393,"y":569,"w":86,"h":86},
"frame": {"x":1245,"y":783,"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":1245,"y":783,"w":86,"h":86},
"frame": {"x":1242,"y":873,"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":1242,"y":873,"w":86,"h":86},
"frame": {"x":1332,"y":877,"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":1332,"y":877,"w":86,"h":86},
"frame": {"x":1488,"y":657,"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":1488,"y":657,"w":86,"h":86},
"frame": {"x":1578,"y":657,"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":1578,"y":657,"w":86,"h":86},
"frame": {"x":1497,"y":747,"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":1497,"y":747,"w":86,"h":86},
"frame": {"x":1587,"y":747,"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":1587,"y":747,"w":86,"h":86},
"frame": {"x":1503,"y":837,"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":1503,"y":837,"w":86,"h":86},
"frame": {"x":1593,"y":837,"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":1593,"y":837,"w":86,"h":86},
"frame": {"x":1503,"y":927,"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":1593,"y":927,"w":86,"h":86},
"frame": {"x":1503,"y":1017,"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":1503,"y":1017,"w":86,"h":86},
"frame": {"x":1593,"y":1017,"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":1593,"y":1017,"w":86,"h":86},
"frame": {"x":1326,"y":967,"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":1326,"y":967,"w":86,"h":86},
"frame": {"x":1326,"y":1057,"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":1326,"y":1057,"w":86,"h":86},
"frame": {"x":1497,"y":1107,"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":1497,"y":1107,"w":86,"h":86},
"frame": {"x":1587,"y":1107,"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":1587,"y":1107,"w":86,"h":86},
"frame": {"x":1668,"y":657,"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":1668,"y":657,"w":86,"h":86},
"frame": {"x":1677,"y":747,"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":1461,"y":1197,"w":86,"h":86},
"frame": {"x":1551,"y":1197,"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":1551,"y":1197,"w":86,"h":86},
"frame": {"x":1461,"y":1287,"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":1673,"y":531,"w":86,"h":86},
"frame": {"x":1947,"y":728,"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":1220,"y":1417,"w":86,"h":86},
"frame": {"x":1758,"y":621,"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":1310,"y":1334,"w":86,"h":86},
"frame": {"x":1848,"y":720,"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":1944,"y":1015,"w":86,"h":86},
"frame": {"x":1845,"y":810,"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":1400,"y":1386,"w":86,"h":86},
"frame": {"x":1845,"y":900,"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":1490,"y":1377,"w":86,"h":86},
"frame": {"x":1220,"y":1327,"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":1580,"y":1395,"w":86,"h":86},
"frame": {"x":1310,"y":1334,"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":1670,"y":1404,"w":86,"h":86},
"frame": {"x":1220,"y":1417,"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":1461,"y":1287,"w":86,"h":86},
"frame": {"x":1551,"y":1287,"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":1551,"y":1287,"w":86,"h":86},
"frame": {"x":1641,"y":1215,"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":1641,"y":1215,"w":86,"h":86},
"frame": {"x":1641,"y":1305,"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":1641,"y":1305,"w":86,"h":86},
"frame": {"x":1731,"y":1314,"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":1731,"y":1314,"w":86,"h":86},
"frame": {"x":1767,"y":1125,"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":1767,"y":1125,"w":86,"h":86},
"frame": {"x":1821,"y":1314,"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":1821,"y":1314,"w":86,"h":86},
"frame": {"x":1773,"y":1035,"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":1773,"y":1035,"w":86,"h":86},
"frame": {"x":1857,"y":1125,"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":1857,"y":1125,"w":86,"h":86},
"frame": {"x":1947,"y":548,"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":1911,"y":1314,"w":86,"h":86},
"frame": {"x":1947,"y":638,"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":1763,"y":531,"w":86,"h":86},
"frame": {"x":1947,"y":818,"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":1853,"y":529,"w":86,"h":86},
"frame": {"x":1947,"y":908,"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":1758,"y":621,"w":86,"h":86},
"frame": {"x":1947,"y":998,"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":1848,"y":720,"w":86,"h":86},
"frame": {"x":1947,"y":1088,"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":1845,"y":810,"w":86,"h":86},
"frame": {"x":1947,"y":1178,"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":1845,"y":900,"w":86,"h":86},
"frame": {"x":1673,"y":531,"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":1943,"y":529,"w":86,"h":86},
"frame": {"x":1763,"y":531,"w":86,"h":86},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":86,"h":86},
@ -666,7 +666,7 @@
},
"sprites/belt/right_27.png":
{
"frame": {"x":1220,"y":1327,"w":86,"h":86},
"frame": {"x":1853,"y":529,"w":86,"h":86},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":86,"h":86},
@ -682,7 +682,7 @@
},
"sprites/blueprints/belt_left.png":
{
"frame": {"x":3,"y":1416,"w":87,"h":87},
"frame": {"x":260,"y":1416,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":8,"w":87,"h":87},
@ -690,7 +690,7 @@
},
"sprites/blueprints/belt_right.png":
{
"frame": {"x":94,"y":1416,"w":87,"h":87},
"frame": {"x":351,"y":1416,"w":87,"h":87},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":8,"y":8,"w":87,"h":87},
@ -882,7 +882,7 @@
},
"sprites/blueprints/wire_left.png":
{
"frame": {"x":1955,"y":350,"w":60,"h":60},
"frame": {"x":1242,"y":963,"w":60,"h":60},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":35,"w":60,"h":60},
@ -914,7 +914,7 @@
},
"sprites/buildings/belt_left.png":
{
"frame": {"x":1760,"y":1404,"w":86,"h":86},
"frame": {"x":1911,"y":1268,"w":86,"h":86},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":9,"w":86,"h":86},
@ -922,7 +922,7 @@
},
"sprites/buildings/belt_right.png":
{
"frame": {"x":1850,"y":1404,"w":86,"h":86},
"frame": {"x":1911,"y":1358,"w":86,"h":86},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":9,"w":86,"h":86},
@ -930,7 +930,7 @@
},
"sprites/buildings/belt_top.png":
{
"frame": {"x":1955,"y":251,"w":77,"h":95},
"frame": {"x":1956,"y":251,"w":77,"h":95},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":0,"w":77,"h":95},
@ -1122,7 +1122,7 @@
},
"sprites/buildings/wire_left.png":
{
"frame": {"x":562,"y":1426,"w":60,"h":60},
"frame": {"x":1139,"y":1427,"w":60,"h":60},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":35,"w":60,"h":60},
@ -1130,7 +1130,7 @@
},
"sprites/buildings/wire_right.png":
{
"frame": {"x":626,"y":1426,"w":60,"h":60},
"frame": {"x":1310,"y":1424,"w":60,"h":60},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":35,"y":35,"w":60,"h":60},
@ -1146,7 +1146,7 @@
},
"sprites/debug/acceptor_slot.png":
{
"frame": {"x":796,"y":1426,"w":38,"h":48},
"frame": {"x":1400,"y":1334,"w":38,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":38,"h":48},
@ -1154,7 +1154,7 @@
},
"sprites/debug/ejector_slot.png":
{
"frame": {"x":1400,"y":1334,"w":38,"h":48},
"frame": {"x":1893,"y":1215,"w":38,"h":48},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":38,"h":48},
@ -1170,7 +1170,7 @@
},
"sprites/map_overview/belt_left.png":
{
"frame": {"x":2010,"y":619,"w":22,"h":22},
"frame": {"x":1374,"y":1424,"w":22,"h":22},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":2,"w":22,"h":22},
@ -1178,7 +1178,7 @@
},
"sprites/map_overview/belt_right.png":
{
"frame": {"x":2010,"y":645,"w":22,"h":22},
"frame": {"x":1374,"y":1450,"w":22,"h":22},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":2,"w":22,"h":22},
@ -1186,12 +1186,20 @@
},
"sprites/misc/deletion_marker.png":
{
"frame": {"x":1242,"y":963,"w":62,"h":62},
"frame": {"x":764,"y":1426,"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":140,"y":1416,"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":1216,"y":837,"w":24,"h":24},
@ -1202,7 +1210,7 @@
},
"sprites/misc/lock_direction_indicator.png":
{
"frame": {"x":1139,"y":1427,"w":36,"h":24},
"frame": {"x":1708,"y":621,"w":36,"h":24},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":6,"w":36,"h":24},
@ -1210,7 +1218,7 @@
},
"sprites/misc/slot_bad_arrow.png":
{
"frame": {"x":1242,"y":963,"w":62,"h":62},
"frame": {"x":764,"y":1426,"w":62,"h":62},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":5,"w":62,"h":62},
@ -1218,7 +1226,7 @@
},
"sprites/misc/slot_good_arrow.png":
{
"frame": {"x":1956,"y":414,"w":62,"h":72},
"frame": {"x":585,"y":1426,"w":62,"h":72},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":5,"y":0,"w":62,"h":72},
@ -1226,7 +1234,7 @@
},
"sprites/misc/storage_overlay.png":
{
"frame": {"x":185,"y":1416,"w":133,"h":66},
"frame": {"x":3,"y":1416,"w":133,"h":66},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":2,"w":133,"h":66},
@ -1234,7 +1242,7 @@
},
"sprites/misc/waypoint.png":
{
"frame": {"x":796,"y":1478,"w":20,"h":24},
"frame": {"x":2001,"y":1268,"w":20,"h":24},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":0,"w":20,"h":24},
@ -1250,7 +1258,7 @@
},
"sprites/wires/battery_empty.png":
{
"frame": {"x":1245,"y":1128,"w":29,"h":46},
"frame": {"x":1245,"y":1126,"w":29,"h":46},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":9,"y":1,"w":29,"h":46},
@ -1266,7 +1274,7 @@
},
"sprites/wires/battery_low.png":
{
"frame": {"x":1708,"y":621,"w":44,"h":30},
"frame": {"x":830,"y":1476,"w":44,"h":30},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":10,"w":44,"h":30},
@ -1274,7 +1282,7 @@
},
"sprites/wires/battery_medium.png":
{
"frame": {"x":1956,"y":490,"w":44,"h":30},
"frame": {"x":878,"y":1476,"w":44,"h":30},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":2,"y":10,"w":44,"h":30},
@ -1298,7 +1306,7 @@
},
"sprites/wires/pin_negative_eject.png":
{
"frame": {"x":690,"y":1426,"w":49,"h":76},
"frame": {"x":532,"y":1416,"w":49,"h":76},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":23,"y":0,"w":49,"h":76},
@ -1306,7 +1314,7 @@
},
"sprites/wires/pin_positive_accept.png":
{
"frame": {"x":743,"y":1426,"w":49,"h":76},
"frame": {"x":711,"y":1426,"w":49,"h":76},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":23,"y":0,"w":49,"h":76},
@ -1314,7 +1322,7 @@
},
"sprites/wires/pin_positive_eject.png":
{
"frame": {"x":502,"y":1416,"w":56,"h":79},
"frame": {"x":651,"y":1426,"w":56,"h":79},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":20,"y":0,"w":56,"h":79},
@ -1341,8 +1349,8 @@
"version": "1.0",
"image": "atlas0_75.png",
"format": "RGBA8888",
"size": {"w":2035,"h":1506},
"size": {"w":2036,"h":1509},
"scale": "0.75",
"smartupdate": "$TexturePacker:SmartUpdate:1caa58cc124d4a31029319d973957f35:dac5f0c449de47bf040f30c87841ea79:f159918d23e5952766c6d23ab52278c6$"
"smartupdate": "$TexturePacker:SmartUpdate:1c0b8a517b70144c17acfe0069e4358f:04faec680cd1781a38e2e75bcef822b9:f159918d23e5952766c6d23ab52278c6$"
}
}

BIN
res_built/atlas/atlas0_75.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1016 KiB

After

Width:  |  Height:  |  Size: 1.0 MiB

BIN
res_raw/sprites/blueprints/advanced_processor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
res_raw/sprites/blueprints/energy_generator.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
res_raw/sprites/buildings/energy_generator.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
res_raw/sprites/misc/energy_generator_overlay.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

4
src/js/game/buildings/energy_generator.js
Unescape View File

@ -14,10 +14,6 @@ export class MetaEnergyGenerator extends MetaBuilding {
super("energy_generator");
}
isRotateable(variant) {
return false;
}
getSilhouetteColor() {
return "#c425d7";
}

18
src/js/game/components/energy_generator.js
Unescape View File

@ -1,5 +1,5 @@
import { types } from "../../savegame/serialization";
import { BaseItem } from "../base_item";
import { BaseItem, enumItemType } from "../base_item";
import { Component } from "../component";
import { ShapeItem } from "../items/shape_item";
@ -59,6 +59,22 @@ export class EnergyGeneratorComponent extends Component {
// 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;

14
src/js/game/systems/energy_generator.js
Unescape View File

@ -6,10 +6,14 @@ 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) {
@ -64,10 +68,18 @@ export class EnergyGeneratorSystem extends GameSystemWithFilter {
const pos = staticComp.getTileSpaceBounds().getCenter().toWorldSpace();
// TESTING
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

Write Preview
Loading…
Cancel
Save