diff --git a/core/assets-raw/sprites/mechs/ships/trident-ship.png b/core/assets-raw/sprites/mechs/ships/trident-ship.png index f279921242..c9ead6ddb8 100644 Binary files a/core/assets-raw/sprites/mechs/ships/trident-ship.png and b/core/assets-raw/sprites/mechs/ships/trident-ship.png differ diff --git a/core/assets-raw/sprites/weapons/bomber-equip.png b/core/assets-raw/sprites/weapons/bomber-equip.png new file mode 100644 index 0000000000..1f3be67082 Binary files /dev/null and b/core/assets-raw/sprites/weapons/bomber-equip.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index e201e82d96..3b75685f5e 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,287 +13,287 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 873, 249 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 883, 259 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 893, 269 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 863, 199 + xy: 843, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 873, 209 + xy: 843, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 883, 219 + xy: 843, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 893, 229 + xy: 853, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 903, 239 + xy: 863, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 913, 249 + xy: 873, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 923, 259 + xy: 883, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 933, 269 + xy: 893, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 943, 275 + xy: 903, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 873, 199 + xy: 913, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 883, 209 + xy: 923, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 893, 219 + xy: 933, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 903, 229 + xy: 853, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 913, 239 + xy: 853, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 923, 249 + xy: 863, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 933, 259 + xy: 853, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 953, 275 + xy: 863, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 943, 265 + xy: 873, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 883, 199 + xy: 853, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 341, 31 + xy: 375, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 351, 31 + xy: 385, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 361, 31 + xy: 385, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 371, 31 + xy: 395, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 381, 31 + xy: 395, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 391, 31 + xy: 405, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 401, 31 + xy: 405, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 411, 31 + xy: 415, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 307, 21 + xy: 415, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 317, 21 + xy: 419, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 327, 21 + xy: 429, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 337, 21 + xy: 419, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 347, 21 + xy: 439, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 357, 21 + xy: 419, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 367, 21 + xy: 429, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 377, 21 + xy: 449, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 387, 21 + xy: 429, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 397, 21 + xy: 439, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 407, 21 + xy: 459, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,21 +307,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 439, 104 + xy: 225, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 449, 114 + xy: 235, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 439, 94 + xy: 235, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,14 +545,14 @@ block-icon-blackstone index: -1 blackstone2 rotate: false - xy: 654, 170 + xy: 560, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 664, 170 + xy: 406, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -566,553 +566,553 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 853, 226 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 863, 229 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 873, 239 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 893, 209 + xy: 863, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 903, 219 + xy: 873, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 913, 229 + xy: 883, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 893, 199 + xy: 853, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 903, 209 + xy: 863, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 373, 51 + xy: 345, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 903, 199 + xy: 883, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 903, 199 + xy: 883, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 913, 209 + xy: 893, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 913, 209 + xy: 893, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 923, 219 + xy: 903, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 923, 219 + xy: 903, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 933, 229 + xy: 913, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 933, 229 + xy: 913, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 953, 245 + xy: 873, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 963, 255 + xy: 883, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 973, 265 + xy: 893, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 913, 199 + xy: 903, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 983, 275 + xy: 853, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 943, 235 + xy: 863, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 1005, 325 + xy: 387, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 933, 219 + xy: 923, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 993, 275 + xy: 853, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 177, 3 + xy: 1003, 353 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 943, 225 + xy: 863, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 953, 235 + xy: 873, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 953, 235 + xy: 873, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 963, 245 + xy: 883, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 963, 245 + xy: 883, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 751, 186 + xy: 191, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 963, 205 + xy: 953, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 973, 215 + xy: 963, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 983, 225 + xy: 893, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 883, 189 + xy: 913, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 893, 189 + xy: 923, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 903, 189 + xy: 933, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 913, 189 + xy: 943, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 923, 189 + xy: 953, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 514, 195 + xy: 765, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 542, 195 + xy: 779, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 448, 74 + xy: 534, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 469, 114 + xy: 554, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 469, 104 + xy: 564, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 556, 192 + xy: 401, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 415, 54 + xy: 1013, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 425, 54 + xy: 1013, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 435, 54 + xy: 1013, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 498, 181 + xy: 486, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 512, 181 + xy: 500, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 421, 34 + xy: 325, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 431, 34 + xy: 335, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 441, 34 + xy: 335, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 451, 34 + xy: 345, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 475, 54 + xy: 315, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 481, 44 + xy: 325, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 526, 181 + xy: 514, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 461, 34 + xy: 345, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 471, 34 + xy: 355, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 481, 34 + xy: 355, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 311, 31 + xy: 365, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 321, 31 + xy: 365, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 331, 31 + xy: 375, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 315, 1 + xy: 449, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 325, 11 + xy: 449, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 325, 1 + xy: 459, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 335, 11 + xy: 459, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 537, 167 + xy: 512, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 704, 163 + xy: 541, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 813, 288 + xy: 553, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 813, 288 + xy: 553, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 853, 246 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 853, 246 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 863, 249 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 873, 259 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 863, 209 + xy: 833, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 923, 239 + xy: 853, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1140,7 +1140,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 963, 265 + xy: 873, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,21 +1154,21 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 449, 104 + xy: 245, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 459, 114 + xy: 245, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 702, 183 + xy: 315, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1217,7 +1217,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 563, 168 + xy: 327, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1259,14 +1259,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 575, 168 + xy: 339, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 587, 168 + xy: 351, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1294,154 +1294,154 @@ shadow-rounded-2 index: -1 bridge-conduit-arrow rotate: false - xy: 883, 269 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 853, 236 + xy: 813, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 863, 239 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 853, 216 + xy: 833, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 863, 219 + xy: 833, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 873, 229 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 883, 239 + xy: 833, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 893, 249 + xy: 833, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 903, 259 + xy: 833, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 913, 269 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 853, 206 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 873, 219 + xy: 841, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 883, 229 + xy: 843, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 893, 239 + xy: 843, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 903, 249 + xy: 843, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 913, 259 + xy: 843, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 923, 269 + xy: 843, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 853, 196 + xy: 843, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 993, 215 + xy: 953, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 993, 205 + xy: 963, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 863, 189 + xy: 973, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 873, 189 + xy: 903, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1469,70 +1469,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 429, 104 + xy: 215, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 439, 114 + xy: 215, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 429, 94 + xy: 225, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 449, 94 + xy: 255, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 459, 104 + xy: 255, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 459, 94 + xy: 265, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 419, 84 + xy: 265, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 429, 84 + xy: 275, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 439, 84 + xy: 275, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 449, 84 + xy: 285, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,7 +1623,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 458, 74 + xy: 544, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1812,14 +1812,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 993, 245 + xy: 943, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 1003, 257 + xy: 963, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1861,21 +1861,21 @@ poweralloysmelter-top index: -1 pulverizer rotate: false - xy: 459, 84 + xy: 285, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 418, 74 + xy: 409, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 458, 64 + xy: 1013, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1896,21 +1896,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 431, 44 + xy: 295, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 684, 163 + xy: 521, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 694, 163 + xy: 531, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1980,7 +1980,7 @@ cyclone index: -1 duo rotate: false - xy: 953, 255 + xy: 863, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,7 +2001,7 @@ spectre index: -1 hail rotate: false - xy: 923, 209 + xy: 913, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2078,21 +2078,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 428, 64 + xy: 1007, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 438, 64 + xy: 1013, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 448, 64 + xy: 1013, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2246,14 +2246,14 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 428, 74 + xy: 409, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 438, 74 + xy: 409, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2281,7 +2281,7 @@ door-large-open index: -1 door-open rotate: false - xy: 943, 245 + xy: 853, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2316,7 +2316,7 @@ bullet index: -1 bullet-back rotate: false - xy: 599, 169 + xy: 363, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2337,35 +2337,35 @@ clear index: -1 command-attack rotate: false - xy: 883, 249 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 893, 259 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 903, 269 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 853, 187 + xy: 550, 183 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 1003, 367 + xy: 359, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2407,14 +2407,14 @@ minelaser-end index: -1 missile rotate: false - xy: 610, 169 + xy: 374, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 621, 169 + xy: 385, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2456,21 +2456,21 @@ scorch5 index: -1 shell rotate: false - xy: 632, 169 + xy: 396, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 643, 169 + xy: 407, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 468, 64 + xy: 1013, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2484,7 +2484,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 315, 11 + xy: 439, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2498,28 +2498,28 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 674, 170 + xy: 481, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 684, 173 + xy: 491, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 694, 173 + xy: 501, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 704, 173 + xy: 511, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2547,28 +2547,28 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 823, 288 + xy: 563, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 823, 288 + xy: 563, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 811, 278 + xy: 474, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 811, 278 + xy: 474, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2589,14 +2589,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 833, 288 + xy: 474, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 833, 288 + xy: 474, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2617,14 +2617,14 @@ command-center index: -1 block-icon-composite-wall rotate: false - xy: 821, 278 + xy: 484, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 821, 278 + xy: 484, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2645,35 +2645,35 @@ composite-wall-large index: -1 block-icon-conduit rotate: false - xy: 813, 268 + xy: 474, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 831, 278 + xy: 484, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 831, 278 + xy: 484, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 813, 258 + xy: 494, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 813, 258 + xy: 494, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2750,28 +2750,28 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 823, 268 + xy: 484, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 823, 268 + xy: 484, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 813, 248 + xy: 494, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 813, 248 + xy: 494, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2806,14 +2806,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 823, 258 + xy: 504, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 823, 258 + xy: 504, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2834,14 +2834,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 813, 238 + xy: 494, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 813, 238 + xy: 494, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2869,21 +2869,21 @@ block-icon-drone-pad index: -1 block-icon-drop-point rotate: false - xy: 823, 248 + xy: 504, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 823, 248 + xy: 504, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 813, 228 + xy: 514, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2911,63 +2911,63 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 823, 238 + xy: 504, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 823, 238 + xy: 504, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 813, 218 + xy: 514, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 823, 228 + xy: 514, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 823, 228 + xy: 514, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 813, 208 + xy: 524, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 813, 208 + xy: 524, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 823, 218 + xy: 524, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 823, 218 + xy: 524, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2981,28 +2981,28 @@ block-icon-interceptor-pad index: -1 block-icon-itemsource rotate: false - xy: 813, 198 + xy: 524, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 813, 198 + xy: 524, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 823, 208 + xy: 534, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 823, 208 + xy: 534, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3023,14 +3023,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 813, 188 + xy: 534, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 813, 188 + xy: 534, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3051,35 +3051,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 823, 198 + xy: 534, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 823, 198 + xy: 534, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 823, 188 + xy: 544, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 823, 188 + xy: 544, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 833, 268 + xy: 544, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3093,14 +3093,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 833, 258 + xy: 544, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 833, 258 + xy: 544, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3128,14 +3128,14 @@ block-icon-mechanical-drill index: -1 block-icon-mechanical-pump rotate: false - xy: 833, 248 + xy: 474, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 833, 248 + xy: 474, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3149,28 +3149,28 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 833, 238 + xy: 484, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 833, 238 + xy: 484, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 833, 228 + xy: 494, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 833, 228 + xy: 494, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3184,14 +3184,14 @@ block-icon-monsoon-pad index: -1 block-icon-oil rotate: false - xy: 833, 218 + xy: 504, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 833, 218 + xy: 504, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3205,56 +3205,56 @@ block-icon-oil-extractor index: -1 block-icon-overflow-gate rotate: false - xy: 833, 208 + xy: 514, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 833, 208 + xy: 514, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 833, 198 + xy: 524, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 833, 198 + xy: 524, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 833, 188 + xy: 534, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 833, 188 + xy: 534, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 841, 278 + xy: 544, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 841, 278 + xy: 544, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3310,14 +3310,14 @@ block-icon-pneumatic-drill index: -1 block-icon-power-node rotate: false - xy: 843, 268 + xy: 551, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 843, 268 + xy: 551, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3338,42 +3338,42 @@ power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 843, 258 + xy: 561, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 843, 258 + xy: 561, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 843, 248 + xy: 554, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 843, 248 + xy: 554, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 843, 238 + xy: 554, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 843, 228 + xy: 554, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3436,14 +3436,14 @@ reconstructor index: -1 block-icon-repair-point rotate: false - xy: 843, 218 + xy: 554, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 843, 218 + xy: 554, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3457,14 +3457,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 843, 208 + xy: 564, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 843, 208 + xy: 564, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3485,28 +3485,28 @@ rotary-pump index: -1 block-icon-router rotate: false - xy: 843, 198 + xy: 564, 142 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 843, 198 + xy: 564, 142 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 843, 188 + xy: 564, 132 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 843, 188 + xy: 564, 132 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3520,49 +3520,49 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 853, 286 + xy: 564, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 853, 286 + xy: 564, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 863, 279 + xy: 571, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 873, 279 + xy: 574, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 873, 279 + xy: 574, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 883, 279 + xy: 574, 142 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 883, 279 + xy: 574, 142 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3583,42 +3583,42 @@ silicon-smelter index: -1 block-icon-smelter rotate: false - xy: 893, 279 + xy: 574, 132 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 893, 279 + xy: 574, 132 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 903, 279 + xy: 574, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 903, 279 + xy: 574, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 913, 279 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 913, 279 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3639,42 +3639,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 923, 279 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 923, 279 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 933, 279 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 933, 279 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 853, 276 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 853, 276 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,14 +3688,14 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 853, 266 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 853, 266 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3751,14 +3751,14 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 863, 269 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 863, 269 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3786,14 +3786,14 @@ block-icon-titan-pad index: -1 block-icon-titanium-conveyor rotate: false - xy: 853, 256 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 853, 256 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3814,14 +3814,14 @@ turbine-generator index: -1 block-icon-unloader rotate: false - xy: 863, 259 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 863, 259 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3856,14 +3856,14 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 873, 269 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 873, 269 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3884,147 +3884,140 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 933, 249 + xy: 863, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 963, 275 + xy: 873, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 943, 255 + xy: 883, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 953, 265 + xy: 893, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 913, 219 + xy: 873, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 923, 229 + xy: 883, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 933, 239 + xy: 893, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 973, 275 + xy: 903, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 953, 205 + xy: 903, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 963, 215 + xy: 913, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 973, 225 + xy: 923, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 983, 235 + xy: 933, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 973, 205 + xy: 913, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 983, 215 + xy: 923, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 993, 225 + xy: 933, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 983, 205 + xy: 943, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 765, 186 + xy: 177, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 779, 186 + xy: 191, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 401, 51 + xy: 723, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 486, 195 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -mech-icon-trident-ship - rotate: false - xy: 486, 195 + xy: 737, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4038,784 +4031,798 @@ mech-icon-omega-mech index: -1 mech-icon-tau-mech rotate: false - xy: 500, 195 + xy: 751, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 +mech-icon-trident-ship + rotate: false + xy: 255, 49 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +trident-ship + rotate: false + xy: 255, 49 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 metalfloor-cliff-edge rotate: false - xy: 933, 189 + xy: 963, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 943, 195 + xy: 973, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 953, 195 + xy: 983, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 963, 195 + xy: 913, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 973, 195 + xy: 923, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 983, 195 + xy: 933, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 993, 195 + xy: 943, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 1003, 267 + xy: 953, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 1003, 247 + xy: 973, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 1003, 237 + xy: 983, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 1003, 227 + xy: 993, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 1003, 217 + xy: 923, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 1003, 207 + xy: 933, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 1003, 197 + xy: 943, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 943, 185 + xy: 953, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 953, 185 + xy: 963, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 963, 185 + xy: 973, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 973, 185 + xy: 983, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 983, 185 + xy: 993, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 993, 185 + xy: 933, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 1003, 187 + xy: 943, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 1013, 267 + xy: 953, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 1013, 257 + xy: 963, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1013, 247 + xy: 973, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1013, 237 + xy: 983, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1013, 227 + xy: 993, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 1013, 217 + xy: 953, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 1013, 207 + xy: 963, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 1013, 197 + xy: 973, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 1013, 187 + xy: 983, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 207, 23 + xy: 993, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 217, 23 + xy: 963, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 227, 23 + xy: 973, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 237, 23 + xy: 983, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 247, 23 + xy: 993, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 257, 23 + xy: 973, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 267, 23 + xy: 983, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 277, 23 + xy: 993, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 287, 25 + xy: 983, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 205, 13 + xy: 993, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 205, 3 + xy: 993, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 215, 13 + xy: 853, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 215, 3 + xy: 863, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 225, 13 + xy: 873, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 225, 3 + xy: 883, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 235, 13 + xy: 893, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 235, 3 + xy: 903, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 245, 13 + xy: 913, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 245, 3 + xy: 923, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 255, 13 + xy: 933, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 255, 3 + xy: 943, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 265, 13 + xy: 953, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 265, 3 + xy: 963, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 275, 13 + xy: 973, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 275, 3 + xy: 983, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 297, 25 + xy: 993, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 409, 107 + xy: 943, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 409, 97 + xy: 953, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 409, 87 + xy: 963, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 863, 179 + xy: 973, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 873, 179 + xy: 983, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 883, 179 + xy: 993, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 893, 179 + xy: 1003, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 903, 179 + xy: 1003, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 913, 179 + xy: 1003, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 923, 179 + xy: 1003, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 933, 179 + xy: 1003, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 943, 175 + xy: 1003, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 953, 175 + xy: 1003, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 963, 175 + xy: 1003, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 973, 175 + xy: 1003, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 983, 175 + xy: 1003, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 993, 175 + xy: 863, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1003, 177 + xy: 873, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 1013, 177 + xy: 883, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 287, 15 + xy: 893, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 297, 15 + xy: 903, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 285, 5 + xy: 913, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 295, 5 + xy: 923, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 301, 39 + xy: 933, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 311, 41 + xy: 943, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 321, 41 + xy: 953, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 331, 41 + xy: 963, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 341, 41 + xy: 973, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 351, 41 + xy: 983, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 361, 41 + xy: 993, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 371, 41 + xy: 1003, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 381, 41 + xy: 207, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 391, 41 + xy: 217, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 401, 41 + xy: 227, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 411, 41 + xy: 237, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1003, 167 + xy: 247, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 1013, 167 + xy: 257, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 305, 5 + xy: 267, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 419, 114 + xy: 277, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 419, 104 + xy: 287, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 429, 114 + xy: 205, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 419, 94 + xy: 205, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 469, 94 + xy: 574, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 469, 84 + xy: 1007, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 468, 74 + xy: 1007, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 418, 64 + xy: 1007, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 445, 54 + xy: 1013, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 455, 54 + xy: 1013, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 465, 54 + xy: 1013, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 421, 44 + xy: 1013, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 441, 44 + xy: 295, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 451, 44 + xy: 305, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 461, 44 + xy: 305, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 471, 44 + xy: 315, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 523, 167 + xy: 498, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4829,112 +4836,112 @@ unit-icon-titan index: -1 item-biomatter rotate: false - xy: 923, 199 + xy: 913, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 933, 209 + xy: 923, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 943, 215 + xy: 933, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 953, 225 + xy: 943, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 963, 235 + xy: 873, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 973, 245 + xy: 883, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 983, 255 + xy: 893, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 993, 265 + xy: 903, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 933, 199 + xy: 913, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 943, 205 + xy: 923, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 953, 215 + xy: 933, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 963, 225 + xy: 943, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 973, 235 + xy: 953, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 983, 245 + xy: 883, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 993, 255 + xy: 893, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 993, 235 + xy: 903, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4962,63 +4969,63 @@ alpha-mech-leg index: -1 delta-mech rotate: false - xy: 345, 51 + xy: 331, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 359, 51 + xy: 345, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 255, 49 + xy: 255, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 255, 33 + xy: 271, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 271, 49 + xy: 271, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 271, 33 + xy: 287, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 481, 167 + xy: 542, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 495, 167 + xy: 556, 192 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 509, 167 + xy: 484, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5032,35 +5039,28 @@ dart-ship index: -1 halberd-ship rotate: false - xy: 177, 17 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -trident-ship - rotate: false - xy: 177, 17 + xy: 387, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 723, 186 + xy: 1005, 325 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 723, 186 + xy: 1005, 325 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 737, 186 + xy: 177, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5307,14 +5307,14 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 582, 192 + xy: 526, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 594, 192 + xy: 538, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5349,7 +5349,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 606, 192 + xy: 582, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5363,21 +5363,21 @@ icon-check index: -1 icon-crafting rotate: false - xy: 618, 192 + xy: 594, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 630, 192 + xy: 606, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 642, 192 + xy: 618, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5398,7 +5398,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 654, 192 + xy: 630, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5538,14 +5538,14 @@ icon-grid index: -1 icon-hold rotate: false - xy: 666, 192 + xy: 642, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 554, 180 + xy: 654, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5566,7 +5566,7 @@ icon-host index: -1 icon-info rotate: false - xy: 551, 168 + xy: 666, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5580,14 +5580,14 @@ icon-itch.io index: -1 icon-item rotate: false - xy: 1007, 313 + xy: 481, 169 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 973, 255 + xy: 893, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5608,7 +5608,7 @@ icon-link index: -1 icon-liquid rotate: false - xy: 1007, 301 + xy: 493, 169 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5650,7 +5650,7 @@ icon-locked index: -1 icon-logic rotate: false - xy: 1007, 289 + xy: 505, 169 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5664,7 +5664,7 @@ icon-map index: -1 icon-menu rotate: false - xy: 570, 182 + xy: 517, 169 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5678,28 +5678,28 @@ icon-menu-large index: -1 icon-missing rotate: false - xy: 582, 180 + xy: 529, 171 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 594, 180 + xy: 541, 171 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 983, 265 + xy: 903, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 606, 180 + xy: 570, 182 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5727,7 +5727,7 @@ icon-pick index: -1 icon-play rotate: false - xy: 618, 180 + xy: 582, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5741,21 +5741,21 @@ icon-play-2 index: -1 icon-players rotate: false - xy: 630, 180 + xy: 594, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 642, 180 + xy: 606, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 654, 180 + xy: 618, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5846,7 +5846,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 666, 180 + xy: 630, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5867,14 +5867,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 1007, 277 + xy: 642, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 406, 69 + xy: 654, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5916,7 +5916,7 @@ icon-undo index: -1 icon-units rotate: false - xy: 678, 183 + xy: 666, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5930,7 +5930,7 @@ icon-unlocks index: -1 icon-weapon rotate: false - xy: 690, 183 + xy: 303, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6153,42 +6153,42 @@ unit-icon-alpha-drone index: -1 dagger rotate: false - xy: 287, 35 + xy: 303, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 303, 51 + xy: 317, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 303, 51 + xy: 317, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 317, 51 + xy: 317, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 drone rotate: false - xy: 387, 51 + xy: 359, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 387, 51 + xy: 359, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6209,14 +6209,14 @@ unit-icon-fabricator index: -1 interceptor rotate: false - xy: 191, 3 + xy: 1005, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 191, 3 + xy: 1005, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6237,7 +6237,7 @@ unit-icon-monsoon index: -1 power-cell rotate: false - xy: 287, 49 + xy: 287, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6270,51 +6270,58 @@ blaster-equip orig: 12, 12 offset: 0, 0 index: -1 -chain-blaster-equip +bomber-equip rotate: false xy: 849, 296 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 +missiles-equip + rotate: false + xy: 849, 296 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +chain-blaster-equip + rotate: false + xy: 303, 51 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 flakgun-equip rotate: false - xy: 1003, 353 + xy: 373, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 1005, 339 + xy: 373, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 191, 17 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -missiles-equip - rotate: false - xy: 528, 195 + xy: 1003, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 484, 181 + xy: 401, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 540, 181 + xy: 528, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index aad5d7f0fc..ffc2ba5665 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 131ac36474..c646c610ad 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -250,6 +250,7 @@ public class Mechs implements ContentList{ speed = 0.4f; maxSpeed = 3f; drag = 0.1f; + armor = 10f; weaponOffsetX = -1; weaponOffsetY = -1; trailColor = Palette.lightTrail; @@ -264,6 +265,7 @@ public class Mechs implements ContentList{ speed = 0.11f; maxSpeed = 3.4f; drag = 0.01f; + armor = 5f; weapon = Weapons.missiles; trailColor = Color.valueOf("d3ddff"); } @@ -310,12 +312,18 @@ public class Mechs implements ContentList{ } }; - trident = new Mech("trident-ship", true){{ - drillPower = 1; - speed = 0.4f; - maxSpeed = 3f; - drag = 0.1f; - }}; + trident = new Mech("trident-ship", true){ + { + drillPower = 4; + speed = 0.12f; + maxSpeed = 3.4f; + drag = 0.035f; + turnCursor = false; + armor = 30f; + trailColor = Color.valueOf("84f491"); + weapon = Weapons.bomberTrident; + } + }; halberd = new Mech("halberd-ship", true){{ drillPower = 2; diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 5964b999d4..2e3fea27db 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -127,6 +127,9 @@ public class Recipes implements ContentList{ //bodies new Recipe(units, UpgradeBlocks.dartFactory, new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setDesktop(); //dart is desktop only, because it's the starter mobile ship new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); + new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); + new Recipe(units, UpgradeBlocks.halberdFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); + new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.densealloy, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop(); new Recipe(units, UpgradeBlocks.omegaFactory, new ItemStack(Items.densealloy, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop(); new Recipe(units, UpgradeBlocks.tauFactory, new ItemStack(Items.densealloy, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop(); diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index e8d6562ffc..0a176453d4 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.type.ContentList; import io.anuke.mindustry.type.Weapon; public class Weapons implements ContentList{ - public static Weapon blaster, droneBlaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, flakgun, flamethrower, missiles; + public static Weapon blaster, droneBlaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles; @Override public void load(){ @@ -124,6 +124,18 @@ public class Weapons implements ContentList{ inaccuracy = 40f; ammo = AmmoTypes.bombExplosive; }}; + + bomberTrident = new Weapon("bomber"){{ + length = 0f; + width = 2f; + reload = 9f; + shots = 2; + roundrobin = true; + ejectEffect = Fx.none; + velocityRnd = 1f; + inaccuracy = 40f; + ammo = AmmoTypes.bombExplosive; + }}; } @Override diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 1c39ce97b8..591b3d0115 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -585,7 +585,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra if(!ui.chatfrag.chatOpen()){ float baseLerp = mech.getRotationAlpha(this); - if(!isShooting()){ + if(!isShooting() || !mech.turnCursor){ if(!movement.isZero()){ rotation = Mathf.slerpDelta(rotation, mech.flying ? velocity.angle() : movement.angle(), 0.13f * baseLerp); } @@ -661,7 +661,9 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra target = Units.getClosestTarget(team, x, y, getWeapon().getAmmo().getRange()); }else if(target.isValid()){ //rotate toward and shoot the target - rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.2f); + if(mech.turnCursor){ + rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.2f); + } Vector2 intercept = Predict.intercept(x, y, target.getX(), target.getY(), target.getVelocity().x - velocity.x, target.getVelocity().y - velocity.y, getWeapon().getAmmo().bullet.speed); diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java index 191d8ac782..668946b304 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/io/anuke/mindustry/type/Mech.java @@ -41,6 +41,7 @@ public class Mech implements UnlockableContent{ public Color trailColor = Palette.boostFrom; public Color trailColorTo = Palette.boostTo; public int itemCapacity = 30; + public boolean turnCursor = true; public float weaponOffsetX, weaponOffsetY; public Weapon weapon = Weapons.blaster; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index 84a36d5be8..63a4125c29 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -77,6 +77,7 @@ public class MassDriver extends Block{ MassDriverEntity other = target.entity(); entity.reload = 1f; + entity.power.amount = 0f; DriverBulletData data = Pooling.obtain(DriverBulletData.class); data.from = entity;