diff --git a/annotations/src/main/resources/revisions/TrailUnitEntity/0.json b/annotations/src/main/resources/revisions/TrailUnitEntity/0.json new file mode 100644 index 0000000000..ea9b0f0abe --- /dev/null +++ b/annotations/src/main/resources/revisions/TrailUnitEntity/0.json @@ -0,0 +1 @@ +{fields:[{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Array,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/core/assets-raw/sprites/blocks/power/solar-panel-large.png b/core/assets-raw/sprites/blocks/power/solar-panel-large.png index a5e37542f1..d520d3cbf5 100644 Binary files a/core/assets-raw/sprites/blocks/power/solar-panel-large.png and b/core/assets-raw/sprites/blocks/power/solar-panel-large.png differ diff --git a/core/assets-raw/sprites/blocks/power/solar-panel.png b/core/assets-raw/sprites/blocks/power/solar-panel.png index 9b2dfab795..9b960682a0 100644 Binary files a/core/assets-raw/sprites/blocks/power/solar-panel.png and b/core/assets-raw/sprites/blocks/power/solar-panel.png differ diff --git a/core/assets-raw/sprites/units/revenant-cell.png b/core/assets-raw/sprites/units/revenant-cell.png index 2bf4ee9866..852af58904 100644 Binary files a/core/assets-raw/sprites/units/revenant-cell.png and b/core/assets-raw/sprites/units/revenant-cell.png differ diff --git a/core/assets-raw/sprites/units/revenant.png b/core/assets-raw/sprites/units/revenant.png index 0355715192..469d949c41 100644 Binary files a/core/assets-raw/sprites/units/revenant.png and b/core/assets-raw/sprites/units/revenant.png differ diff --git a/core/assets-raw/sprites/weapons/revenant-missiles.png b/core/assets-raw/sprites/weapons/revenant-missiles.png index 6aaac4c6d7..bc7dd1f0a5 100644 Binary files a/core/assets-raw/sprites/weapons/revenant-missiles.png and b/core/assets-raw/sprites/weapons/revenant-missiles.png differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 32e579d0db..50792d9314 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 46c804012d..ffff50224c 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -6,679 +6,679 @@ filter: Nearest,Nearest repeat: none force-projector rotate: false - xy: 489, 484 + xy: 489, 188 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 489, 386 + xy: 293, 124 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 1799, 1073 + xy: 1141, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 1865, 1073 + xy: 1207, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1197, 433 + xy: 1691, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1231, 467 + xy: 1725, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 1733, 1007 + xy: 823, 1064 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 1799, 1007 + xy: 823, 998 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1435, 501 + xy: 1895, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-loader rotate: false - xy: 884, 1278 + xy: 1199, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-unloader rotate: false - xy: 1493, 1399 + xy: 419, 790 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 917, 137 + xy: 1017, 70 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1027, 621 + xy: 1039, 415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1027, 587 + xy: 1039, 381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1027, 553 + xy: 1039, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1027, 519 + xy: 1039, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 951, 1104 + xy: 1843, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 951, 1104 + xy: 1843, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 925, 613 + xy: 257, 848 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 967, 655 + xy: 1563, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1009, 697 + xy: 1678, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 1051, 739 + xy: 616, 1203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 257, 848 + xy: 1893, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 925, 579 + xy: 1927, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 1085, 739 + xy: 1961, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 925, 545 + xy: 1995, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 1119, 739 + xy: 1203, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 925, 511 + xy: 1237, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 1153, 739 + xy: 1271, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 925, 477 + xy: 1203, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1187, 739 + xy: 1237, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 925, 443 + xy: 1271, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1221, 739 + xy: 1305, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 925, 409 + xy: 1305, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1255, 739 + xy: 1339, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 925, 375 + xy: 1339, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1289, 739 + xy: 1373, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1019, 179 + xy: 1073, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 985, 111 + xy: 1073, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1019, 145 + xy: 1073, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1019, 111 + xy: 1073, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1069, 663 + xy: 1073, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1061, 629 + xy: 1085, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1061, 595 + xy: 1085, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1061, 561 + xy: 1085, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1061, 527 + xy: 1107, 431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1061, 493 + xy: 1107, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1061, 459 + xy: 1141, 431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1061, 425 + xy: 1107, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1061, 391 + xy: 1141, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1061, 357 + xy: 1107, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1061, 323 + xy: 1141, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1103, 671 + xy: 1107, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1137, 671 + xy: 1141, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1171, 671 + xy: 1107, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1205, 671 + xy: 1141, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1333, 535 + xy: 1475, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1367, 569 + xy: 1509, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1401, 603 + xy: 1543, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1435, 637 + xy: 1577, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1163, 331 + xy: 1509, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1197, 365 + xy: 1543, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1503, 501 + xy: 1815, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1537, 535 + xy: 1849, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1367, 331 + xy: 1883, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1401, 365 + xy: 1917, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1435, 399 + xy: 1917, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1469, 433 + xy: 1917, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1503, 467 + xy: 1951, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1537, 501 + xy: 1951, 587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1401, 331 + xy: 1985, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1435, 365 + xy: 1951, 553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1469, 399 + xy: 1985, 587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1503, 433 + xy: 1985, 553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1537, 467 + xy: 1679, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1435, 331 + xy: 1713, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1469, 365 + xy: 1747, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1503, 399 + xy: 1781, 505 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1537, 433 + xy: 1815, 505 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1469, 331 + xy: 1849, 505 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1503, 365 + xy: 1883, 513 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1545, 671 + xy: 1119, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 1535, 1103 + xy: 1794, 1237 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 1095, 629 + xy: 1175, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1231, 569 + xy: 1487, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-conveyor rotate: false - xy: 587, 288 + xy: 615, 774 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-edge rotate: false - xy: 587, 190 + xy: 623, 872 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-top rotate: false - xy: 587, 92 + xy: 721, 888 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 685, 680 + xy: 685, 578 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1299, 535 + xy: 1441, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1163, 365 + xy: 1509, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1197, 399 + xy: 1441, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1231, 433 + xy: 1475, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1265, 467 + xy: 1509, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1367, 467 + xy: 1725, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1503, 569 + xy: 1963, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1537, 365 + xy: 1985, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -713,651 +713,651 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 819, 1064 + xy: 1728, 1171 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 819, 1064 + xy: 1728, 1171 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 293, 124 + xy: 285, 26 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 391, 106 + xy: 383, 6 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 489, 92 + xy: 587, 676 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 285, 26 + xy: 587, 578 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 1799, 1139 + xy: 943, 1080 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 1865, 1139 + xy: 1009, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1733, 1073 + xy: 1075, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 685, 386 + xy: 685, 284 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 685, 288 + xy: 685, 186 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 685, 190 + xy: 685, 88 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 685, 92 + xy: 713, 774 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 1017, 971 + xy: 955, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 1149, 1037 + xy: 955, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 1017, 905 + xy: 1021, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 1215, 773 + xy: 1013, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 1281, 773 + xy: 1079, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 1347, 773 + xy: 947, 509 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1413, 773 + xy: 1013, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1459, 739 + xy: 1661, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 993, 519 + xy: 1237, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1485, 705 + xy: 1373, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 985, 281 + xy: 1051, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1265, 501 + xy: 1759, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 1003, 1301 + xy: 783, 676 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 951, 171 + xy: 1017, 36 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 951, 137 + xy: 1017, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 951, 137 + xy: 1017, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 917, 103 + xy: 1689, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 951, 103 + xy: 1401, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1027, 417 + xy: 1039, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1027, 383 + xy: 1039, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1027, 349 + xy: 1039, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 993, 315 + xy: 1039, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 993, 315 + xy: 1039, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 993, 315 + xy: 1039, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 993, 315 + xy: 1039, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1027, 315 + xy: 1046, 449 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 985, 247 + xy: 1051, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1019, 281 + xy: 1051, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 985, 213 + xy: 1073, 415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1019, 247 + xy: 1073, 381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1019, 247 + xy: 1073, 381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 985, 179 + xy: 1073, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1019, 213 + xy: 1073, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 985, 145 + xy: 1073, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1129, 433 + xy: 1589, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1231, 535 + xy: 1453, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1265, 569 + xy: 1487, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1299, 603 + xy: 1521, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1333, 637 + xy: 1555, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1129, 399 + xy: 1589, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 587, 582 + xy: 587, 284 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 587, 484 + xy: 587, 186 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 587, 386 + xy: 587, 88 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 1367, 637 + xy: 1589, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1129, 365 + xy: 1623, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1129, 365 + xy: 1623, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1129, 365 + xy: 1623, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1333, 569 + xy: 1441, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1367, 603 + xy: 1475, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1401, 637 + xy: 1441, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1129, 331 + xy: 1475, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1265, 433 + xy: 1611, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1299, 467 + xy: 1543, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1333, 501 + xy: 1577, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1367, 535 + xy: 1611, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1401, 569 + xy: 1577, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1435, 603 + xy: 1611, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-5 rotate: false - xy: 1469, 637 + xy: 1611, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-6 rotate: false - xy: 1197, 331 + xy: 1691, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1333, 467 + xy: 1827, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1367, 501 + xy: 1657, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1401, 535 + xy: 1645, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1435, 569 + xy: 1645, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1469, 603 + xy: 1645, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1503, 637 + xy: 1793, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1149, 971 + xy: 1153, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 1591, 1301 + xy: 783, 88 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery rotate: false - xy: 1323, 739 + xy: 1407, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large rotate: false - xy: 721, 998 + xy: 1815, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-large-top rotate: false - xy: 721, 900 + xy: 1913, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-top rotate: false - xy: 1357, 739 + xy: 1013, 483 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1027, 485 + xy: 1039, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1027, 451 + xy: 1039, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 391, 692 + xy: 391, 398 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-liquid rotate: false - xy: 391, 594 + xy: 391, 300 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 391, 496 + xy: 391, 202 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 diode rotate: false - xy: 1053, 281 + xy: 1119, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1053, 247 + xy: 1119, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 985, 77 + xy: 1175, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1019, 77 + xy: 1175, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1413,462 +1413,462 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1231, 365 + xy: 1725, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1083, 971 + xy: 1021, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1265, 399 + xy: 1759, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1299, 433 + xy: 1793, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1281, 1037 + xy: 1153, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1401, 501 + xy: 1759, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1469, 535 + xy: 1929, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 1493, 1301 + xy: 783, 186 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 1083, 839 + xy: 881, 222 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 1281, 839 + xy: 951, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 1689, 1337 + xy: 1003, 1301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 1787, 1337 + xy: 1101, 1301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 1885, 1337 + xy: 1199, 1301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 1017, 773 + xy: 947, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1083, 773 + xy: 1013, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 525, 876 + xy: 725, 986 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 623, 986 + xy: 525, 872 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 1983, 1369 + xy: 1002, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-launcher rotate: false - xy: 786, 1278 + xy: 1003, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 coal-centrifuge rotate: false - xy: 1586, 1235 + xy: 811, 1130 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 1007, 1103 + xy: 1797, 1369 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 1073, 1103 + xy: 1863, 1369 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 1139, 1103 + xy: 1929, 1369 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1205, 1103 + xy: 1731, 1303 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 1271, 1103 + xy: 1797, 1303 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1337, 1103 + xy: 1863, 1303 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 885, 1006 + xy: 1009, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1053, 77 + xy: 1175, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1197, 603 + xy: 2013, 859 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1197, 535 + xy: 1453, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 885, 940 + xy: 1075, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 819, 866 + xy: 1141, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 819, 866 + xy: 1141, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1231, 501 + xy: 1453, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1265, 535 + xy: 1487, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1163, 399 + xy: 1657, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press rotate: false - xy: 685, 582 + xy: 685, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 721, 834 + xy: 823, 932 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 951, 1037 + xy: 819, 866 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 1017, 1037 + xy: 811, 800 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 951, 971 + xy: 889, 1014 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1083, 1037 + xy: 889, 948 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1231, 331 + xy: 1827, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1265, 365 + xy: 1861, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1215, 1037 + xy: 1087, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1347, 905 + xy: 1285, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1413, 971 + xy: 885, 816 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 1545, 1037 + xy: 881, 750 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1413, 905 + xy: 881, 684 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1479, 971 + xy: 881, 618 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1479, 905 + xy: 881, 552 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1545, 971 + xy: 881, 486 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1545, 905 + xy: 881, 420 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 951, 839 + xy: 881, 354 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1017, 839 + xy: 881, 288 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1977, 699 + xy: 1797, 1121 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1977, 649 + xy: 1797, 1071 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1435, 535 + xy: 1679, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1469, 569 + xy: 1679, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1367, 433 + xy: 1827, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1401, 467 + xy: 1861, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 1943, 955 + xy: 1897, 1121 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 1993, 1005 + xy: 1897, 1071 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 925, 647 + xy: 1113, 499 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 967, 689 + xy: 1843, 929 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1009, 731 + xy: 1843, 887 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -1889,7 +1889,7 @@ white-tree-dead index: -1 container rotate: false - xy: 1073, 1169 + xy: 943, 1146 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1910,14 +1910,14 @@ core-nucleus index: -1 core-shard rotate: false - xy: 1591, 1399 + xy: 517, 774 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad rotate: false - xy: 383, 8 + xy: 587, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1931,63 +1931,63 @@ launch-pad-large index: -1 launch-pad-light rotate: false - xy: 587, 680 + xy: 587, 382 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launchpod rotate: false - xy: 873, 1138 + xy: 934, 1212 size: 66, 64 orig: 66, 64 offset: 0, 0 index: -1 unloader rotate: false - xy: 1537, 331 + xy: 1441, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1579, 671 + xy: 1475, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault rotate: false - xy: 1689, 1239 + xy: 1297, 1301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 1652, 1267 + xy: 1661, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1391, 739 + xy: 1012, 449 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 941, 1138 + xy: 1068, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-3 rotate: false - xy: 1717, 1435 + xy: 807, 1376 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2001,14 +2001,14 @@ block-4 index: -1 hail-heat rotate: false - xy: 833, 197 + xy: 1851, 979 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 1733, 1139 + xy: 1273, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2022,133 +2022,133 @@ meltdown-heat index: -1 ripple-heat rotate: false - xy: 1199, 1301 + xy: 783, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 1215, 971 + xy: 1219, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1347, 1037 + xy: 1285, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1215, 905 + xy: 1285, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1537, 637 + xy: 1713, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 1545, 773 + xy: 1145, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 air-factory rotate: false - xy: 525, 974 + xy: 627, 986 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 basic-reconstructor rotate: false - xy: 623, 888 + xy: 1717, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-forge rotate: false - xy: 623, 888 + xy: 1717, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 command-center rotate: false - xy: 1007, 1169 + xy: 877, 1130 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 1403, 1103 + xy: 1929, 1303 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 1469, 1103 + xy: 1728, 1237 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 factory-in rotate: false - xy: 391, 204 + xy: 489, 482 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-out rotate: false - xy: 489, 680 + xy: 489, 384 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-top rotate: false - xy: 489, 582 + xy: 489, 286 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ground-factory rotate: false - xy: 489, 190 + xy: 489, 90 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 naval-factory rotate: false - xy: 685, 484 + xy: 685, 382 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rally-point rotate: false - xy: 1083, 905 + xy: 1087, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1333, 433 + xy: 1691, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2169,70 +2169,70 @@ revenant-factory-top index: -1 copper-wall rotate: false - xy: 1239, 671 + xy: 1107, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 1139, 1169 + xy: 1009, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1053, 213 + xy: 1153, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1601, 1103 + xy: 1860, 1237 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 1667, 1107 + xy: 1926, 1237 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1053, 179 + xy: 1153, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1299, 501 + xy: 1543, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 1865, 1007 + xy: 867, 22 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1231, 399 + xy: 1577, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 951, 905 + xy: 889, 882 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2246,98 +2246,98 @@ scrap-wall-gigantic index: -1 scrap-wall-huge2 rotate: false - xy: 1297, 1301 + xy: 783, 382 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 1395, 1301 + xy: 783, 284 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 1413, 1037 + xy: 1021, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1281, 905 + xy: 1087, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1347, 971 + xy: 1153, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1479, 1037 + xy: 1219, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1265, 331 + xy: 1747, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1299, 365 + xy: 1747, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1333, 399 + xy: 1793, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1333, 399 + xy: 1793, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1435, 433 + xy: 1645, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 1149, 839 + xy: 881, 156 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1469, 467 + xy: 1781, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 1347, 839 + xy: 1017, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2351,35 +2351,35 @@ thruster index: -1 titanium-wall rotate: false - xy: 1537, 399 + xy: 1917, 513 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 951, 773 + xy: 947, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 1611, 1049 + xy: 1995, 1381 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 1727, 837 + xy: 1995, 1327 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 409, 792 + xy: 2039, 1445 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2393,7 +2393,7 @@ circle-end index: -1 circle-mid rotate: false - xy: 1121, 122 + xy: 1209, 304 size: 1, 199 orig: 1, 199 offset: 0, 0 @@ -2407,7 +2407,7 @@ circle-shadow index: -1 error rotate: false - xy: 783, 284 + xy: 1351, 989 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2421,7 +2421,7 @@ laser index: -1 laser-end rotate: false - xy: 844, 1204 + xy: 645, 14 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -2435,7 +2435,7 @@ minelaser index: -1 minelaser-end rotate: false - xy: 799, 1130 + xy: 719, 14 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -2456,14 +2456,14 @@ missile-back index: -1 particle rotate: false - xy: 967, 731 + xy: 1113, 541 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 770, 1198 + xy: 947, 90 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -2484,35 +2484,35 @@ shell-back index: -1 transfer rotate: false - xy: 285, 141 + xy: 877, 816 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1503, 331 + xy: 1951, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 1712, 1658 + xy: 1992, 1172 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 arc rotate: false - xy: 1733, 1205 + xy: 251, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-arc-full rotate: false - xy: 1425, 739 + xy: 1113, 465 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2526,154 +2526,154 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 1493, 739 + xy: 1695, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 1527, 739 + xy: 1729, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1561, 739 + xy: 1763, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 925, 341 + xy: 1797, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 925, 341 + xy: 1797, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 1563, 1759 + xy: 1797, 777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 1977, 1597 + xy: 1134, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 743, 26 + xy: 1200, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cyclone-full rotate: false - xy: 1815, 1435 + xy: 786, 1278 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-dark-metal-full rotate: false - xy: 1678, 1629 + xy: 1831, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 616, 1203 + xy: 1831, 777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 959, 613 + xy: 1695, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 959, 579 + xy: 1729, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-fuse-full rotate: false - xy: 1913, 1435 + xy: 905, 1376 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-grass-full rotate: false - xy: 959, 545 + xy: 1763, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hail-full rotate: false - xy: 959, 511 + xy: 1797, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 959, 477 + xy: 1831, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 959, 443 + xy: 1877, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 959, 409 + xy: 1865, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 959, 375 + xy: 1865, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 959, 341 + xy: 1865, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1001, 655 + xy: 1899, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2687,63 +2687,63 @@ block-impact-reactor-full index: -1 block-lancer-full rotate: false - xy: 1787, 1205 + xy: 1266, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-laser-drill-full rotate: false - xy: 807, 1376 + xy: 884, 1278 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-liquid-router-full rotate: false - xy: 993, 621 + xy: 1899, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-full rotate: false - xy: 905, 1376 + xy: 1101, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-magmarock-full rotate: false - xy: 993, 587 + xy: 1899, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-conveyor-full rotate: false - xy: 1003, 1399 + xy: 1297, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-icon rotate: false - xy: 1003, 1399 + xy: 1297, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-mass-driver-full rotate: false - xy: 1101, 1399 + xy: 1395, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-mechanical-drill-full rotate: false - xy: 1853, 1205 + xy: 1332, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2757,266 +2757,266 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 993, 553 + xy: 1137, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 993, 485 + xy: 1271, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-oil-extractor-full rotate: false - xy: 1199, 1399 + xy: 1493, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-ore-coal-full rotate: false - xy: 993, 451 + xy: 1305, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 993, 417 + xy: 1339, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 993, 383 + xy: 1373, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 993, 349 + xy: 1407, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1043, 697 + xy: 1147, 465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1035, 663 + xy: 1893, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pebbles-full rotate: false - xy: 1077, 705 + xy: 1927, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 992, 1235 + xy: 1977, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 1111, 705 + xy: 1961, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 1058, 1235 + xy: 1398, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 1145, 705 + xy: 1995, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1179, 705 + xy: 1885, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1213, 705 + xy: 1865, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ripple-full rotate: false - xy: 1297, 1399 + xy: 1591, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-rock-full rotate: false - xy: 1835, 899 + xy: 1397, 1043 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 1247, 705 + xy: 1899, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1281, 705 + xy: 1339, 587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 1124, 1235 + xy: 1464, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 1315, 705 + xy: 1373, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1349, 705 + xy: 1407, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 1383, 705 + xy: 1927, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 1190, 1235 + xy: 1530, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 1417, 705 + xy: 1961, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1451, 705 + xy: 1995, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1451, 705 + xy: 1995, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-huge-full rotate: false - xy: 1395, 1399 + xy: 321, 810 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 1395, 1399 + xy: 321, 810 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-scrap-wall-large-full rotate: false - xy: 1256, 1235 + xy: 1596, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 1519, 705 + xy: 1407, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1553, 705 + xy: 1005, 410 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 917, 307 + xy: 1005, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 917, 273 + xy: 1005, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 951, 307 + xy: 1005, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 1727, 737 + xy: 1447, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 917, 239 + xy: 1005, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3030,245 +3030,245 @@ block-spectre-full index: -1 block-spore-cluster-full rotate: false - xy: 833, 281 + xy: 955, 1038 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 951, 273 + xy: 1005, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 1322, 1235 + xy: 1398, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sporerocks-full rotate: false - xy: 917, 205 + xy: 1005, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 951, 239 + xy: 1005, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 1388, 1235 + xy: 1464, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 917, 171 + xy: 1005, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 951, 205 + xy: 1005, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 951, 205 + xy: 1005, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 1454, 1235 + xy: 1530, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 1520, 1235 + xy: 1596, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1273, 671 + xy: 1141, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1307, 671 + xy: 1107, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1341, 671 + xy: 1141, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1375, 671 + xy: 1107, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1409, 671 + xy: 1141, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1443, 671 + xy: 1107, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1477, 671 + xy: 1141, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1511, 671 + xy: 1141, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 1205, 1169 + xy: 1075, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 1271, 1169 + xy: 1141, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 1337, 1169 + xy: 1207, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 1403, 1169 + xy: 1273, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 1469, 1169 + xy: 1665, 1333 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1535, 1169 + xy: 1662, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 1601, 1169 + xy: 1662, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 1667, 1173 + xy: 1731, 1369 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 321, 810 + xy: 293, 712 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 419, 790 + xy: 293, 614 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 517, 778 + xy: 293, 516 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 293, 712 + xy: 293, 418 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 293, 614 + xy: 293, 320 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 293, 516 + xy: 293, 222 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 293, 418 + xy: 391, 692 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 293, 320 + xy: 391, 594 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -3387,742 +3387,742 @@ cracks-5-7 index: -1 cyclone rotate: false - xy: 293, 222 + xy: 391, 496 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 duo rotate: false - xy: 1053, 145 + xy: 1153, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse rotate: false - xy: 489, 288 + xy: 391, 104 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hail rotate: false - xy: 1053, 111 + xy: 1175, 431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 833, 155 + xy: 1901, 1029 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1095, 561 + xy: 1175, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 783, 92 + xy: 811, 774 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-tiny rotate: false - xy: 267, 43 + xy: 770, 1198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 1931, 1155 + xy: 1351, 831 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 833, 113 + xy: 1801, 887 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1095, 493 + xy: 1175, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 925, 782 + xy: 837, 774 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 267, 25 + xy: 788, 1198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1931, 1105 + xy: 1401, 835 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 875, 281 + xy: 1943, 1029 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1095, 425 + xy: 1187, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1983, 1343 + xy: 251, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 2031, 837 + xy: 863, 782 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1931, 1055 + xy: 1347, 781 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 875, 239 + xy: 1701, 829 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1095, 357 + xy: 1187, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 2019, 1229 + xy: 1697, 1175 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 2031, 819 + xy: 806, 1198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1981, 1155 + xy: 1451, 1001 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 875, 197 + xy: 1743, 829 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1087, 289 + xy: 1171, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 787, 874 + xy: 291, 856 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 2031, 801 + xy: 2031, 671 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1981, 1105 + xy: 1451, 951 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 875, 155 + xy: 1801, 845 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1087, 221 + xy: 1967, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 787, 848 + xy: 1597, 1767 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 848, 1609 + xy: 2031, 653 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1981, 1055 + xy: 1501, 1001 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 875, 113 + xy: 1451, 809 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1087, 153 + xy: 1911, 859 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 813, 790 + xy: 1689, 1471 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 786, 1424 + xy: 848, 1609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 813, 816 + xy: 1451, 901 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 883, 766 + xy: 1493, 809 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1087, 85 + xy: 1979, 859 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 2011, 1437 + xy: 1205, 613 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 937, 1479 + xy: 786, 1424 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1785, 849 + xy: 1501, 951 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 883, 724 + xy: 1535, 809 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1129, 603 + xy: 1933, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1652, 1241 + xy: 1885, 893 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 391, 792 + xy: 937, 1479 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1835, 849 + xy: 1551, 1001 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 883, 682 + xy: 1577, 809 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1129, 569 + xy: 1933, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 291, 856 + xy: 1155, 501 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 481, 8 + xy: 391, 792 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1885, 899 + xy: 1451, 851 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 883, 640 + xy: 1619, 809 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1197, 637 + xy: 1933, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1597, 1767 + xy: 1509, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 982, 1358 + xy: 481, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1885, 849 + xy: 1501, 901 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 883, 598 + xy: 933, 48 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1163, 569 + xy: 1967, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1571, 645 + xy: 1689, 1445 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 799, 1112 + xy: 982, 1358 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1781, 799 + xy: 1551, 951 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 883, 556 + xy: 933, 6 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1129, 501 + xy: 2001, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1689, 1443 + xy: 1535, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 809, 100 + xy: 1047, 499 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1831, 799 + xy: 1601, 1001 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 883, 514 + xy: 975, 54 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1197, 569 + xy: 2001, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 2009, 1343 + xy: 1561, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 863, 848 + xy: 1419, 709 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1881, 799 + xy: 1501, 851 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 883, 472 + xy: 975, 12 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1265, 637 + xy: 1967, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1571, 619 + xy: 1587, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 1767, 1221 + xy: 1137, 589 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1777, 749 + xy: 1551, 901 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 883, 430 + xy: 1377, 739 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1163, 501 + xy: 1155, 527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1571, 593 + xy: 1613, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 985, 1120 + xy: 2018, 1723 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1777, 699 + xy: 1601, 951 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 885, 874 + xy: 1207, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 883, 388 + xy: 1377, 697 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1299, 637 + xy: 1555, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 1571, 567 + xy: 1155, 561 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 883, 328 + xy: 824, 1198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 1827, 649 + xy: 1651, 901 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 883, 346 + xy: 1985, 1029 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1197, 501 + xy: 1419, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 1571, 541 + xy: 1080, 465 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 2019, 1211 + xy: 866, 1609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 1877, 649 + xy: 1651, 851 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 925, 731 + xy: 1071, 533 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1197, 467 + xy: 1657, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 1571, 515 + xy: 2018, 1767 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 839, 798 + xy: 786, 1406 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 1727, 637 + xy: 151, 11 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 925, 689 + xy: 1071, 491 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1333, 603 + xy: 1555, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 1571, 489 + xy: 2018, 1741 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 1571, 471 + xy: 955, 1479 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 1777, 599 + xy: 201, 11 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 615, 778 + xy: 685, 676 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -4136,35 +4136,35 @@ meltdown index: -1 repair-point rotate: false - xy: 1299, 399 + xy: 1895, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple rotate: false - xy: 1101, 1301 + xy: 783, 578 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo rotate: false - xy: 1149, 905 + xy: 1219, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1281, 971 + xy: 955, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1503, 603 + xy: 1713, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4178,133 +4178,133 @@ spectre index: -1 splash-0 rotate: false - xy: 1537, 603 + xy: 1997, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1299, 331 + xy: 1781, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1367, 365 + xy: 1713, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1401, 399 + xy: 1747, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1333, 365 + xy: 1815, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1367, 399 + xy: 1781, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1401, 433 + xy: 1815, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1435, 467 + xy: 1849, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1469, 501 + xy: 1849, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1503, 535 + xy: 1883, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1537, 569 + xy: 1883, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1333, 331 + xy: 1679, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 1215, 839 + xy: 881, 90 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 1985, 855 + xy: 1701, 1021 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-cix-full rotate: false - xy: 481, 26 + xy: 1575, 1333 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-crawler-full rotate: false - xy: 1981, 805 + xy: 1701, 971 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 833, 723 + xy: 1751, 1021 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-draug-full rotate: false - xy: 833, 673 + xy: 1701, 921 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-eruptor-full rotate: false - xy: 571, 26 + xy: 481, 24 size: 88, 64 orig: 88, 64 offset: 0, 0 @@ -4318,7 +4318,7 @@ unit-fortress-full index: -1 unit-ghoul-full rotate: false - xy: 918, 1204 + xy: 793, 14 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -4332,7 +4332,7 @@ unit-oculon-full index: -1 unit-phantom-full rotate: false - xy: 1727, 891 + xy: 947, 154 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4344,198 +4344,205 @@ unit-reaper-full orig: 320, 320 offset: 0, 0 index: -1 +unit-revenant-full + rotate: false + xy: 697, 1084 + size: 112, 112 + orig: 112, 112 + offset: 0, 0 + index: -1 unit-spirit-full rotate: false - xy: 833, 623 + xy: 1751, 971 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-tau-full rotate: false - xy: 1785, 949 + xy: 947, 96 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-titan-full rotate: false - xy: 1149, 773 + xy: 947, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-trident-full rotate: false - xy: 697, 1096 + xy: 525, 970 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 unit-vanguard-full rotate: false - xy: 833, 573 + xy: 1801, 1021 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-wraith-full rotate: false - xy: 833, 523 + xy: 1701, 871 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave rotate: false - xy: 1479, 773 + xy: 1079, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1095, 595 + xy: 1175, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1095, 527 + xy: 1175, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1095, 459 + xy: 1175, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1095, 391 + xy: 1187, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1095, 323 + xy: 1419, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1087, 255 + xy: 1933, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1087, 187 + xy: 2001, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1087, 119 + xy: 1945, 859 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1129, 637 + xy: 1933, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1163, 637 + xy: 1967, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1163, 603 + xy: 1967, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1129, 535 + xy: 1967, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1231, 637 + xy: 2001, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1163, 535 + xy: 2001, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1231, 603 + xy: 1933, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1129, 467 + xy: 2001, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1265, 603 + xy: 1521, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1163, 467 + xy: 1623, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1163, 433 + xy: 1623, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1299, 569 + xy: 1521, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 219, 841 + xy: 1395, 1330 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -4549,21 +4556,21 @@ circle index: -1 shape-3 rotate: false - xy: 1611, 976 + xy: 947, 444 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 1676, 991 + xy: 889, 1080 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 1785, 899 + xy: 1397, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4612,14 +4619,14 @@ cix-cell index: -1 cix-foot rotate: false - xy: 833, 239 + xy: 1801, 929 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 cix-joint rotate: false - xy: 1689, 1469 + xy: 2011, 1435 size: 26, 26 orig: 26, 26 offset: 0, 0 @@ -4640,91 +4647,91 @@ cix-leg-base index: -1 crawler rotate: false - xy: 1727, 687 + xy: 1497, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 713, 784 + xy: 1447, 1051 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 1893, 957 + xy: 1497, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 763, 784 + xy: 1547, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 783, 734 + xy: 1497, 1051 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 783, 684 + xy: 1547, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 783, 634 + xy: 1597, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta rotate: false - xy: 783, 584 + xy: 1547, 1051 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-base rotate: false - xy: 783, 534 + xy: 1597, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-cell rotate: false - xy: 783, 484 + xy: 1647, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-leg rotate: false - xy: 783, 434 + xy: 1597, 1051 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug rotate: false - xy: 783, 384 + xy: 1647, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug-cell rotate: false - xy: 783, 334 + xy: 1647, 1051 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4759,28 +4766,28 @@ eradicator-leg index: -1 eruptor rotate: false - xy: 1787, 1271 + xy: 1395, 1333 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 819, 998 + xy: 1794, 1171 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-cell rotate: false - xy: 1877, 1271 + xy: 1485, 1333 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 819, 932 + xy: 1860, 1171 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4794,7 +4801,7 @@ fortress index: -1 fortress-base rotate: false - xy: 885, 1072 + xy: 1926, 1171 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4808,7 +4815,7 @@ fortress-cell index: -1 fortress-leg rotate: false - xy: 661, 30 + xy: 770, 1216 size: 80, 60 orig: 80, 60 offset: 0, 0 @@ -4822,7 +4829,7 @@ ghoul index: -1 ghoul-cell rotate: false - xy: 770, 1204 + xy: 571, 14 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -4836,28 +4843,28 @@ glaive index: -1 glaive-cell rotate: false - xy: 1611, 780 + xy: 1013, 517 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 javelin rotate: false - xy: 1827, 749 + xy: 1551, 851 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-cell rotate: false - xy: 1827, 699 + xy: 1601, 901 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-shield rotate: false - xy: 1877, 749 + xy: 1601, 851 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4885,77 +4892,77 @@ oculon index: -1 oculon-base rotate: false - xy: 1927, 749 + xy: 1327, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oculon-cell rotate: false - xy: 1927, 699 + xy: 1697, 1121 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oculon-leg rotate: false - xy: 1927, 649 + xy: 1697, 1071 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega rotate: false - xy: 1967, 1255 + xy: 852, 1196 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 omega-armor rotate: false - xy: 1667, 1041 + xy: 1273, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-base rotate: false - xy: 151, 3 + xy: 1079, 583 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-cell rotate: false - xy: 209, 3 + xy: 1145, 649 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-leg rotate: false - xy: 1669, 918 + xy: 1211, 715 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom rotate: false - xy: 1669, 860 + xy: 947, 386 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom-cell rotate: false - xy: 1669, 802 + xy: 1339, 1039 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1669, 744 + xy: 1269, 715 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4990,70 +4997,70 @@ revenant-cell index: -1 spirit rotate: false - xy: 1993, 955 + xy: 1947, 1121 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-cell rotate: false - xy: 1935, 905 + xy: 1947, 1071 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau rotate: false - xy: 1611, 722 + xy: 947, 328 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-base rotate: false - xy: 1935, 855 + xy: 1997, 1127 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-cell rotate: false - xy: 1669, 686 + xy: 947, 270 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-leg rotate: false - xy: 1985, 905 + xy: 1997, 1077 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 1413, 839 + xy: 1083, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 1479, 839 + xy: 1149, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-cell rotate: false - xy: 1545, 839 + xy: 1215, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 885, 808 + xy: 1281, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5067,161 +5074,161 @@ trident index: -1 trident-cell rotate: false - xy: 1727, 949 + xy: 947, 212 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 vanguard rotate: false - xy: 833, 473 + xy: 1751, 921 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 833, 423 + xy: 1801, 971 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 833, 323 + xy: 1751, 871 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 1843, 949 + xy: 1397, 1093 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 1727, 787 + xy: 1447, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos rotate: false - xy: 1611, 838 + xy: 1339, 1097 size: 56, 136 orig: 56, 136 offset: 0, 0 index: -1 eradication rotate: false - xy: 391, 302 + xy: 489, 580 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 eruption rotate: false - xy: 783, 226 + xy: 1351, 931 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 783, 176 + xy: 1351, 881 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 783, 118 + xy: 1401, 985 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 1919, 1205 + xy: 1401, 935 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 1969, 1205 + xy: 1401, 885 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 1877, 699 + xy: 1651, 1001 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles rotate: false - xy: 1777, 649 + xy: 1651, 951 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 1827, 599 + xy: 1995, 1277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 1877, 599 + xy: 1992, 1227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 1931, 799 + xy: 1992, 1177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-weapon rotate: false - xy: 1927, 599 + xy: 1747, 1121 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles rotate: false - xy: 1977, 749 + xy: 1747, 1071 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 1977, 599 + xy: 1847, 1121 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 1943, 1005 + xy: 1847, 1071 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 833, 373 + xy: 1851, 1021 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index e5e469d684..67a9cf23d7 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index f530d80d91..eb5cfd0115 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index 5965272be8..e049f5df73 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index 124f3c4695..c13bc726a3 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index 798312578b..1560263ee8 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -175,7 +175,6 @@ public class BlockIndexer{ int ty = world.toTile(wy); int tileRange = (int)(range / tilesize + 1); - intSet.clear(); boolean any = false; for(int x = -tileRange + tx; x <= tileRange + tx; x++){ @@ -186,10 +185,9 @@ public class BlockIndexer{ if(other == null) continue; - if(other.team() == team && !intSet.contains(other.pos()) && pred.get(other)){ + if(other.team() == team && pred.get(other) && intSet.add(other.pos())){ cons.get(other); any = true; - intSet.add(other.pos()); } } } diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index b9e5d62f08..1d39a5c871 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -23,7 +23,7 @@ public class Bullets implements ContentList{ flakScrap, flakLead, flakPlastic, flakExplosive, flakSurge, flakGlass, glassFrag, //missiles - missileExplosive, missileIncendiary, missileSurge, missileJavelin, missileSwarm, missileRevenant, + missileExplosive, missileIncendiary, missileSurge, missileJavelin, missileSwarm, //standard standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary, standardMechSmall, @@ -291,25 +291,6 @@ public class Bullets implements ContentList{ weaveMag = 2f; }}; - missileRevenant = new MissileBulletType(2.7f, 12, "missile"){{ - bulletWidth = 8f; - bulletHeight = 8f; - bulletShrink = 0f; - drag = -0.003f; - homingRange = 60f; - keepVelocity = false; - splashDamageRadius = 25f; - splashDamage = 10f; - lifetime = 60f; - trailColor = Pal.unitBack; - backColor = Pal.unitBack; - frontColor = Pal.unitFront; - hitEffect = Fx.blastExplosion; - despawnEffect = Fx.blastExplosion; - weaveScale = 6f; - weaveMag = 1f; - }}; - standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{ bulletWidth = 7f; bulletHeight = 9f; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 481e7b07d9..36aa2ba3e1 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -285,6 +285,55 @@ public class UnitTypes implements ContentList{ }}); }}; + revenant = new UnitType("revenant"){{ + ghoul.upgrade = this; + tier = 3; + + health = 220; + speed = 1.9f; + accel = 0.04f; + drag = 0.016f; + flying = true; + range = 140f; + //rotateShooting = false; + hitsize = 18f; + lowAltitude = true; + + engineOffset = 12f; + engineSize = 3f; + + for(boolean b : Mathf.booleans){ + weapons.add( + new Weapon("revenant-missiles"){{ + reload = 70f; + x = 7f * Mathf.sign(b); + rotate = true; + mirror = false; + flipSprite = !b; + shake = 1f; + + bullet = new MissileBulletType(2.7f, 12, "missile"){{ + bulletWidth = 8f; + bulletHeight = 8f; + bulletShrink = 0f; + drag = -0.003f; + homingRange = 60f; + keepVelocity = false; + splashDamageRadius = 25f; + splashDamage = 10f; + lifetime = 60f; + trailColor = Pal.unitBack; + backColor = Pal.unitBack; + frontColor = Pal.unitFront; + hitEffect = Fx.blastExplosion; + despawnEffect = Fx.blastExplosion; + weaveScale = 6f; + weaveMag = 1f; + }}; + }}); + } + }}; + reaper = new UnitType("reaper"){{ speed = 1.1f; accel = 0.02f; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index bf6fc3e21d..c69469d708 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -87,7 +87,6 @@ public abstract class BulletType extends Content{ public float weaveScale = 1f; public float weaveMag = -1f; - public float hitShake = 0f; public BulletType(float speed, float damage){ diff --git a/core/src/mindustry/entities/comp/TrailComp.java b/core/src/mindustry/entities/comp/TrailComp.java index 7ef07d03a2..0109661a7c 100644 --- a/core/src/mindustry/entities/comp/TrailComp.java +++ b/core/src/mindustry/entities/comp/TrailComp.java @@ -1,9 +1,24 @@ package mindustry.entities.comp; +import arc.math.*; import mindustry.annotations.Annotations.*; +import mindustry.gen.*; import mindustry.graphics.*; +import mindustry.type.*; @Component -abstract class TrailComp{ +abstract class TrailComp implements Unitc{ + @Import UnitType type; + @Import float x, y, rotation; + transient Trail trail = new Trail(); + + @Override + public void update(){ + float scale = elevation(); + float offset = type.engineOffset/2f + type.engineOffset/2f*scale; + + float cx = x + Angles.trnsx(rotation + 180, offset), cy = y + Angles.trnsy(rotation + 180, offset); + trail.update(cx, cy); + } } diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index cdef409df6..b0bc0573f6 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -264,10 +264,6 @@ public class UnitType extends UnlockableContent{ if(unit instanceof Trailc){ Trail trail = ((Trailc)unit).trail(); - - float cx = unit.x() + Angles.trnsx(unit.rotation() + 180, offset), - cy = unit.y() + Angles.trnsy(unit.rotation() + 180, offset); - trail.update(cx, cy); trail.draw(unit.team().color, (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f) * scale)); }