diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png b/core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png new file mode 100644 index 0000000000..38a9950c25 Binary files /dev/null and b/core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index e787fde68b..e201e82d96 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: 843, 238 + xy: 873, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 843, 228 + xy: 883, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 843, 218 + xy: 893, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 853, 236 + xy: 863, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 863, 239 + xy: 873, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 873, 249 + xy: 883, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 883, 259 + xy: 893, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 893, 269 + xy: 903, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 853, 226 + xy: 913, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 863, 229 + xy: 923, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 873, 239 + xy: 933, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 883, 249 + xy: 943, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 893, 259 + xy: 873, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 903, 269 + xy: 883, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 853, 216 + xy: 893, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 863, 219 + xy: 903, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 873, 229 + xy: 913, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 883, 239 + xy: 923, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 893, 249 + xy: 933, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 903, 259 + xy: 953, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 913, 269 + xy: 943, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 853, 206 + xy: 883, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 881, 149 + xy: 341, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 891, 159 + xy: 351, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 901, 169 + xy: 361, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 891, 149 + xy: 371, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 901, 159 + xy: 381, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 911, 169 + xy: 391, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 901, 149 + xy: 401, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 911, 159 + xy: 411, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 921, 169 + xy: 307, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 911, 149 + xy: 317, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 921, 159 + xy: 327, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 931, 169 + xy: 337, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 921, 149 + xy: 347, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 931, 159 + xy: 357, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 931, 149 + xy: 367, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 943, 175 + xy: 377, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 953, 175 + xy: 387, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 963, 175 + xy: 397, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 973, 175 + xy: 407, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,21 +307,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 409, 87 + xy: 439, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 721, 146 + xy: 449, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 731, 146 + xy: 439, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,14 +545,14 @@ block-icon-blackstone index: -1 blackstone2 rotate: false - xy: 1007, 304 + xy: 654, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 1007, 294 + xy: 664, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -566,56 +566,56 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 843, 208 + xy: 853, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 843, 198 + xy: 863, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 843, 188 + xy: 873, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 863, 209 + xy: 893, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 873, 219 + xy: 903, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 883, 229 + xy: 913, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 863, 199 + xy: 893, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 873, 209 + xy: 903, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -629,98 +629,98 @@ dirtedge index: -1 generic-cliff-edge rotate: false - xy: 873, 199 + xy: 903, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 873, 199 + xy: 903, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 883, 209 + xy: 913, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 883, 209 + xy: 913, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 893, 219 + xy: 923, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 893, 219 + xy: 923, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 903, 229 + xy: 933, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 903, 229 + xy: 933, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 933, 259 + xy: 953, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 943, 265 + xy: 963, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 953, 275 + xy: 973, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 883, 199 + xy: 913, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 913, 239 + xy: 983, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 923, 249 + xy: 943, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -734,14 +734,14 @@ grassedge index: -1 ice2 rotate: false - xy: 903, 219 + xy: 933, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 913, 229 + xy: 993, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -755,364 +755,364 @@ iceedge index: -1 icerock2 rotate: false - xy: 923, 239 + xy: 943, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 933, 249 + xy: 953, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 933, 249 + xy: 953, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 943, 255 + xy: 963, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 943, 255 + xy: 963, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 737, 186 + xy: 751, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 933, 219 + xy: 963, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 943, 225 + xy: 973, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 953, 235 + xy: 983, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 973, 245 + xy: 883, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 983, 255 + xy: 893, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 993, 265 + xy: 903, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 933, 199 + xy: 913, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 943, 205 + xy: 923, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 500, 195 + xy: 514, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 528, 195 + xy: 542, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 801, 158 + xy: 448, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 831, 178 + xy: 469, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 801, 148 + xy: 469, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 542, 195 + xy: 556, 192 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 831, 148 + xy: 415, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 841, 158 + xy: 425, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 841, 148 + xy: 435, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 484, 181 + xy: 498, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 498, 181 + xy: 512, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 933, 179 + xy: 421, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 861, 169 + xy: 431, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 861, 159 + xy: 441, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 871, 169 + xy: 451, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 913, 179 + xy: 475, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 923, 179 + xy: 481, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 512, 181 + xy: 526, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 861, 149 + xy: 461, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 871, 159 + xy: 471, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 881, 169 + xy: 481, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 871, 149 + xy: 311, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 881, 159 + xy: 321, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 891, 169 + xy: 331, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 993, 175 + xy: 315, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 1003, 174 + xy: 325, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 1013, 174 + xy: 325, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 941, 165 + xy: 335, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 523, 167 + xy: 537, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 721, 176 + xy: 704, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 731, 176 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 731, 176 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 833, 198 + xy: 853, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 833, 198 + xy: 853, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 833, 188 + xy: 863, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 841, 278 + xy: 873, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 863, 269 + xy: 863, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 893, 239 + xy: 923, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1140,7 +1140,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 943, 275 + xy: 963, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,21 +1154,21 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 741, 146 + xy: 449, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 751, 146 + xy: 459, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 645, 168 + xy: 702, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1217,7 +1217,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 662, 180 + xy: 563, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1259,14 +1259,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 657, 168 + xy: 575, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 669, 168 + xy: 587, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1294,154 +1294,154 @@ shadow-rounded-2 index: -1 bridge-conduit-arrow rotate: false - xy: 843, 268 + xy: 883, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 843, 258 + xy: 853, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 843, 248 + xy: 863, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 883, 279 + xy: 853, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 893, 279 + xy: 863, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 903, 279 + xy: 873, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 913, 279 + xy: 883, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 923, 279 + xy: 893, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 933, 279 + xy: 903, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 853, 276 + xy: 913, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 853, 266 + xy: 853, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 853, 256 + xy: 873, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 863, 259 + xy: 883, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 873, 269 + xy: 893, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 853, 246 + xy: 903, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 863, 249 + xy: 913, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 873, 259 + xy: 923, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 883, 269 + xy: 853, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 933, 209 + xy: 993, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 943, 215 + xy: 993, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 953, 225 + xy: 863, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 963, 235 + xy: 873, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1469,70 +1469,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 667, 158 + xy: 429, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 409, 107 + xy: 439, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 409, 97 + xy: 429, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 761, 146 + xy: 449, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 771, 146 + xy: 459, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 781, 146 + xy: 459, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 791, 176 + xy: 419, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 791, 166 + xy: 429, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 791, 156 + xy: 439, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 791, 146 + xy: 449, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,7 +1623,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 811, 168 + xy: 458, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1812,14 +1812,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 923, 209 + xy: 993, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 983, 235 + xy: 1003, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1861,21 +1861,21 @@ poweralloysmelter-top index: -1 pulverizer rotate: false - xy: 801, 178 + xy: 459, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 811, 178 + xy: 418, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 831, 158 + xy: 458, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1896,21 +1896,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 863, 179 + xy: 431, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 701, 174 + xy: 684, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 711, 174 + xy: 694, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1980,7 +1980,7 @@ cyclone index: -1 duo rotate: false - xy: 933, 269 + xy: 953, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,7 +2001,7 @@ spectre index: -1 hail rotate: false - xy: 893, 209 + xy: 923, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2078,21 +2078,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 821, 158 + xy: 428, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 831, 168 + xy: 438, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 821, 148 + xy: 448, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2246,14 +2246,14 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 801, 168 + xy: 428, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 821, 178 + xy: 438, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2281,7 +2281,7 @@ door-large-open index: -1 door-open rotate: false - xy: 923, 259 + xy: 943, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2316,7 +2316,7 @@ bullet index: -1 bullet-back rotate: false - xy: 674, 181 + xy: 599, 169 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2337,21 +2337,21 @@ clear index: -1 command-attack rotate: false - xy: 853, 286 + xy: 883, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 863, 279 + xy: 893, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 873, 279 + xy: 903, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2407,14 +2407,14 @@ minelaser-end index: -1 missile rotate: false - xy: 685, 184 + xy: 610, 169 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 696, 184 + xy: 621, 169 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2456,21 +2456,21 @@ scorch5 index: -1 shell rotate: false - xy: 707, 184 + xy: 632, 169 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1007, 314 + xy: 643, 169 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 841, 168 + xy: 468, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2484,7 +2484,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 983, 175 + xy: 315, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2498,28 +2498,28 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 1007, 284 + xy: 674, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 406, 71 + xy: 684, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 681, 171 + xy: 694, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 691, 174 + xy: 704, 173 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: 741, 176 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 741, 176 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 751, 176 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 751, 176 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2589,14 +2589,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 761, 176 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 761, 176 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2617,14 +2617,14 @@ command-center index: -1 block-icon-composite-wall rotate: false - xy: 771, 176 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 771, 176 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2645,35 +2645,35 @@ composite-wall-large index: -1 block-icon-conduit rotate: false - xy: 781, 176 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 681, 161 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 681, 161 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 691, 164 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 691, 164 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2750,28 +2750,28 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 701, 164 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 701, 164 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 711, 164 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 711, 164 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2806,14 +2806,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 721, 166 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 721, 166 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2834,14 +2834,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 731, 166 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 731, 166 + xy: 813, 238 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: 741, 166 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 741, 166 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 751, 166 + xy: 813, 228 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: 761, 166 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 761, 166 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 771, 166 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 781, 166 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 781, 166 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 691, 154 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 691, 154 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 701, 154 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 701, 154 + xy: 823, 218 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: 711, 154 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 711, 154 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 721, 156 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 721, 156 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3023,14 +3023,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 731, 156 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 731, 156 + xy: 813, 188 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: 741, 156 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 741, 156 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 751, 156 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 751, 156 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 761, 156 + xy: 833, 268 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: 771, 156 + xy: 833, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 771, 156 + xy: 833, 258 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: 781, 156 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 781, 156 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3149,28 +3149,28 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 813, 288 + xy: 833, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 813, 288 + xy: 833, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 823, 288 + xy: 833, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 823, 288 + xy: 833, 228 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: 811, 278 + xy: 833, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 811, 278 + xy: 833, 218 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, 288 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 833, 288 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 821, 278 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 821, 278 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 813, 268 + xy: 833, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 813, 268 + xy: 833, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 831, 278 + xy: 841, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 831, 278 + xy: 841, 278 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: 813, 258 + xy: 843, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 813, 258 + xy: 843, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3338,42 +3338,42 @@ power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 823, 268 + xy: 843, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 823, 268 + xy: 843, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 813, 248 + xy: 843, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 813, 248 + xy: 843, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 823, 258 + xy: 843, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 813, 238 + xy: 843, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3436,14 +3436,14 @@ reconstructor index: -1 block-icon-repair-point rotate: false - xy: 823, 248 + xy: 843, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 823, 248 + xy: 843, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3457,14 +3457,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 813, 228 + xy: 843, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 813, 228 + xy: 843, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3485,28 +3485,28 @@ rotary-pump index: -1 block-icon-router rotate: false - xy: 823, 238 + xy: 843, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 823, 238 + xy: 843, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 813, 218 + xy: 843, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 813, 218 + xy: 843, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3520,49 +3520,49 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 823, 228 + xy: 853, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 823, 228 + xy: 853, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 813, 208 + xy: 863, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 823, 218 + xy: 873, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 823, 218 + xy: 873, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 813, 198 + xy: 883, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 813, 198 + xy: 883, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3583,42 +3583,42 @@ silicon-smelter index: -1 block-icon-smelter rotate: false - xy: 823, 208 + xy: 893, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 823, 208 + xy: 893, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 813, 188 + xy: 903, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 813, 188 + xy: 903, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 823, 198 + xy: 913, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 823, 198 + xy: 913, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3639,42 +3639,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 823, 188 + xy: 923, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 823, 188 + xy: 923, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 833, 268 + xy: 933, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 833, 268 + xy: 933, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 833, 258 + xy: 853, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 833, 258 + xy: 853, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,14 +3688,14 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 833, 248 + xy: 853, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 833, 248 + xy: 853, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3751,14 +3751,14 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 833, 238 + xy: 863, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 833, 238 + xy: 863, 269 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: 833, 228 + xy: 853, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 833, 228 + xy: 853, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3814,14 +3814,14 @@ turbine-generator index: -1 block-icon-unloader rotate: false - xy: 833, 218 + xy: 863, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 833, 218 + xy: 863, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3856,14 +3856,14 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 833, 208 + xy: 873, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 833, 208 + xy: 873, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3884,147 +3884,147 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 903, 249 + xy: 933, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 913, 259 + xy: 963, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 923, 269 + xy: 943, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 853, 196 + xy: 953, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 883, 219 + xy: 913, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 893, 229 + xy: 923, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 903, 239 + xy: 933, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 913, 249 + xy: 973, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 963, 255 + xy: 953, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 973, 265 + xy: 963, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 983, 275 + xy: 973, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 913, 199 + xy: 983, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 973, 255 + xy: 973, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 983, 265 + xy: 983, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 993, 275 + xy: 993, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 923, 199 + xy: 983, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 751, 186 + xy: 765, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 765, 186 + xy: 779, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 779, 186 + xy: 401, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 401, 51 + xy: 486, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 401, 51 + xy: 486, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4038,784 +4038,784 @@ mech-icon-omega-mech index: -1 mech-icon-tau-mech rotate: false - xy: 486, 195 + xy: 500, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 953, 215 + xy: 933, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 963, 225 + xy: 943, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 973, 235 + xy: 953, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 983, 245 + xy: 963, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 993, 255 + xy: 973, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 953, 205 + xy: 983, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 963, 215 + xy: 993, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 973, 225 + xy: 1003, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 993, 245 + xy: 1003, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 963, 205 + xy: 1003, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 973, 215 + xy: 1003, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 983, 225 + xy: 1003, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 993, 235 + xy: 1003, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 973, 205 + xy: 1003, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 983, 215 + xy: 943, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 993, 225 + xy: 953, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 983, 205 + xy: 963, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 993, 215 + xy: 973, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 993, 205 + xy: 983, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 863, 189 + xy: 993, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 873, 189 + xy: 1003, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 883, 189 + xy: 1013, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 893, 189 + xy: 1013, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 903, 189 + xy: 1013, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 913, 189 + xy: 1013, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 923, 189 + xy: 1013, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 933, 189 + xy: 1013, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 943, 195 + xy: 1013, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 953, 195 + xy: 1013, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 963, 195 + xy: 1013, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 973, 195 + xy: 207, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 983, 195 + xy: 217, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 993, 195 + xy: 227, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 1003, 274 + xy: 237, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 1003, 264 + xy: 247, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1003, 254 + xy: 257, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1003, 244 + xy: 267, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1003, 234 + xy: 277, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 1003, 224 + xy: 287, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 1003, 214 + xy: 205, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 1003, 204 + xy: 205, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1003, 194 + xy: 215, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 943, 185 + xy: 215, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 953, 185 + xy: 225, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 963, 185 + xy: 225, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 973, 185 + xy: 235, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 983, 185 + xy: 235, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 993, 185 + xy: 245, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 1003, 184 + xy: 245, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 1013, 274 + xy: 255, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 1013, 264 + xy: 255, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 1013, 254 + xy: 265, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 1013, 244 + xy: 265, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1013, 234 + xy: 275, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1013, 224 + xy: 275, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1013, 214 + xy: 297, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 1013, 204 + xy: 409, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 1013, 194 + xy: 409, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 1013, 184 + xy: 409, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 207, 23 + xy: 863, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 217, 23 + xy: 873, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 227, 23 + xy: 883, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 237, 23 + xy: 893, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 247, 23 + xy: 903, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 257, 23 + xy: 913, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 267, 23 + xy: 923, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 277, 23 + xy: 933, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 287, 25 + xy: 943, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 205, 13 + xy: 953, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 205, 3 + xy: 963, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 215, 13 + xy: 973, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 215, 3 + xy: 983, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 225, 13 + xy: 993, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 225, 3 + xy: 1003, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 235, 13 + xy: 1013, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 235, 3 + xy: 287, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 245, 13 + xy: 297, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 245, 3 + xy: 285, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 255, 13 + xy: 295, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 255, 3 + xy: 301, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 265, 13 + xy: 311, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 265, 3 + xy: 321, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 275, 13 + xy: 331, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 275, 3 + xy: 341, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 297, 25 + xy: 351, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 537, 159 + xy: 361, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 547, 158 + xy: 371, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 557, 158 + xy: 381, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 567, 158 + xy: 391, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 577, 158 + xy: 401, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 587, 158 + xy: 411, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 597, 158 + xy: 1003, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 607, 158 + xy: 1013, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 617, 158 + xy: 305, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 627, 158 + xy: 419, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 637, 158 + xy: 419, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 647, 158 + xy: 429, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 657, 158 + xy: 419, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 811, 158 + xy: 469, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 821, 168 + xy: 469, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 841, 178 + xy: 468, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 811, 148 + xy: 418, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 851, 177 + xy: 445, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 851, 167 + xy: 455, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 851, 157 + xy: 465, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 851, 147 + xy: 421, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 873, 179 + xy: 441, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 883, 179 + xy: 451, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 893, 179 + xy: 461, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 903, 179 + xy: 471, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 509, 167 + xy: 523, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4829,112 +4829,112 @@ unit-icon-titan index: -1 item-biomatter rotate: false - xy: 893, 199 + xy: 923, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 903, 209 + xy: 933, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 913, 219 + xy: 943, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 923, 229 + xy: 953, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 933, 239 + xy: 963, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 943, 245 + xy: 973, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 953, 255 + xy: 983, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 963, 265 + xy: 993, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 973, 275 + xy: 933, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 903, 199 + xy: 943, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 913, 209 + xy: 953, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 923, 219 + xy: 963, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 933, 229 + xy: 973, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 943, 235 + xy: 983, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 953, 245 + xy: 993, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 963, 245 + xy: 993, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5004,21 +5004,21 @@ omega-mech-leg index: -1 tau-mech rotate: false - xy: 540, 181 + xy: 481, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 481, 167 + xy: 495, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 495, 167 + xy: 509, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5058,6 +5058,13 @@ mech-icon-javelin-ship orig: 12, 12 offset: 0, 0 index: -1 +javelin-ship-shield + rotate: false + xy: 737, 186 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 circle rotate: false xy: 424, 310 @@ -5300,14 +5307,14 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 537, 169 + xy: 582, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 582, 192 + xy: 594, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5342,7 +5349,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 594, 192 + xy: 606, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5356,21 +5363,21 @@ icon-check index: -1 icon-crafting rotate: false - xy: 606, 192 + xy: 618, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 618, 192 + xy: 630, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 630, 192 + xy: 642, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5391,7 +5398,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 642, 192 + xy: 654, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5531,14 +5538,14 @@ icon-grid index: -1 icon-hold rotate: false - xy: 654, 192 + xy: 666, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 666, 192 + xy: 554, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5559,7 +5566,7 @@ icon-host index: -1 icon-info rotate: false - xy: 554, 180 + xy: 551, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5573,14 +5580,14 @@ icon-itch.io index: -1 icon-item rotate: false - xy: 549, 168 + xy: 1007, 313 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 953, 265 + xy: 973, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5601,7 +5608,7 @@ icon-link index: -1 icon-liquid rotate: false - xy: 561, 168 + xy: 1007, 301 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5643,7 +5650,7 @@ icon-locked index: -1 icon-logic rotate: false - xy: 566, 180 + xy: 1007, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5657,7 +5664,7 @@ icon-map index: -1 icon-menu rotate: false - xy: 578, 180 + xy: 570, 182 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5671,28 +5678,28 @@ icon-menu-large index: -1 icon-missing rotate: false - xy: 573, 168 + xy: 582, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 590, 180 + xy: 594, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 963, 275 + xy: 983, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 585, 168 + xy: 606, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5720,7 +5727,7 @@ icon-pick index: -1 icon-play rotate: false - xy: 602, 180 + xy: 618, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5734,21 +5741,21 @@ icon-play-2 index: -1 icon-players rotate: false - xy: 597, 168 + xy: 630, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 614, 180 + xy: 642, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 609, 168 + xy: 654, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5839,7 +5846,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 626, 180 + xy: 666, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5860,14 +5867,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 621, 168 + xy: 1007, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 638, 180 + xy: 406, 69 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5909,7 +5916,7 @@ icon-undo index: -1 icon-units rotate: false - xy: 633, 168 + xy: 678, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5923,7 +5930,7 @@ icon-unlocks index: -1 icon-weapon rotate: false - xy: 650, 180 + xy: 690, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6293,21 +6300,21 @@ heal-blaster-equip index: -1 missiles-equip rotate: false - xy: 514, 195 + xy: 528, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 556, 192 + xy: 484, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 526, 181 + xy: 540, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index ee22111639..aad5d7f0fc 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 77972acdd6..131ac36474 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -255,14 +255,60 @@ public class Mechs implements ContentList{ trailColor = Palette.lightTrail; }}; - javelin = new Mech("javelin-ship", true){{ - drillPower = -1; - speed = 0.4f; - maxSpeed = 3.6f; - drag = 0.09f; - weapon = Weapons.missiles; - trailColor = Color.valueOf("d3ddff"); - }}; + javelin = new Mech("javelin-ship", true){ + float minV = 3.6f; + float maxV = 6f; + TextureRegion shield; + { + drillPower = -1; + speed = 0.11f; + maxSpeed = 3.4f; + drag = 0.01f; + weapon = Weapons.missiles; + trailColor = Color.valueOf("d3ddff"); + } + + @Override + public void load(){ + super.load(); + shield = Draw.region(name + "-shield"); + } + + @Override + public float getRotationAlpha(Player player){ + return 0.5f; + } + + @Override + public void updateAlt(Player player){ + float scl = scld(player); + if(Mathf.chance(Timers.delta() * (0.15*scl))){ + Effects.effect(BulletFx.hitLancer, Palette.lancerLaser, player.x, player.y); + Lightning.create(player.getTeam(), BulletFx.hitLancer, Palette.lancerLaser, 10f, + player.x + player.getVelocity().x, player.y + player.getVelocity().y, player.rotation, 14); + } + } + + @Override + public void draw(Player player){ + float scl = scld(player); + if(scl < 0.01f) return; + float alpha = Core.batch.getColor().a; + Graphics.shader(); + Graphics.setAdditiveBlending(); + Draw.color(Palette.lancerLaser); + Draw.alpha(scl/2f); + Draw.rect(shield, player.snappedX() + Mathf.range(scl/2f), player.snappedY() + Mathf.range(scl/2f), player.rotation - 90); + Graphics.setNormalBlending(); + Graphics.shader(Shaders.mix); + Draw.color(); + Draw.alpha(alpha); + } + + float scld(Player player){ + return Mathf.clamp((player.getVelocity().len() - minV) / (maxV - minV)); + } + }; trident = new Mech("trident-ship", true){{ drillPower = 1; diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index da2df2f64b..e8d6562ffc 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -32,7 +32,7 @@ public class Weapons implements ContentList{ healBlaster = new Weapon("heal-blaster"){{ length = 1.5f; - reload = 30f; + reload = 24f; roundrobin = false; ejectEffect = Fx.none; recoil = 2f; @@ -41,12 +41,14 @@ public class Weapons implements ContentList{ missiles = new Weapon("missiles"){{ length = 1.5f; - reload = 40f; - shots = 2; - inaccuracy = 10f; + reload = 60f; + shots = 4; + inaccuracy = 2f; roundrobin = false; roundrobin = true; ejectEffect = Fx.none; + velocityRnd = 0.2f; + spacing = 1f; ammo = AmmoTypes.weaponMissile; }}; @@ -55,6 +57,7 @@ public class Weapons implements ContentList{ recoil = 4f; reload = 60f; shots = 4; + spacing = 8f; inaccuracy = 8f; roundrobin = false; roundrobin = true; diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java index c280e858d7..79ad77d372 100644 --- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java @@ -2,10 +2,13 @@ package io.anuke.mindustry.content.bullets; import com.badlogic.gdx.graphics.Color; import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.bullet.MissileBulletType; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.ContentList; +import io.anuke.ucore.core.Timers; +import io.anuke.ucore.util.Mathf; public class MissileBullets extends BulletList implements ContentList{ public static BulletType explosive, incindiary, surge, javelin, swarm; @@ -52,18 +55,27 @@ public class MissileBullets extends BulletList implements ContentList{ } }; - javelin = new MissileBulletType(2.5f, 14, "missile"){ + javelin = new MissileBulletType(5f, 10.5f, "missile"){ { bulletWidth = 8f; bulletHeight = 8f; bulletShrink = 0f; - drag = -0.02f; + drag = -0.003f; keepVelocity = false; - splashDamageRadius = 25f; - splashDamage = 11f; + splashDamageRadius = 20f; + splashDamage = 3f; lifetime = 90f; + trailColor = Color.valueOf("b6c6fd"); hiteffect = BulletFx.blastExplosion; despawneffect = BulletFx.blastExplosion; + backColor = Palette.bulletYellowBack; + frontColor = Palette.bulletYellow; + } + + @Override + public void update(Bullet b){ + super.update(b); + b.getVelocity().rotate(Mathf.sin(Timers.time() + b.id * 4422, 8f, 2f)); } }; @@ -84,6 +96,12 @@ public class MissileBullets extends BulletList implements ContentList{ hiteffect = BulletFx.blastExplosion; despawneffect = BulletFx.blastExplosion; } + + @Override + public void update(Bullet b){ + super.update(b); + b.getVelocity().rotate(Mathf.sin(Timers.time() + b.id * 4422, 8f, 2f)); + } }; } } diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 35f1f53cb0..8ca36b398d 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -36,7 +36,7 @@ public class TurretBullets extends BulletList implements ContentList{ public void load(){ healBullet = new BulletType(5.2f, 19){ - float healAmount = 20f; + float healAmount = 21f; { hiteffect = BulletFx.hitLaser; diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index a249dd9e57..1c39ce97b8 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -360,9 +360,9 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra if(mech.flying || boostHeat > 0.001f){ float wobblyness = 0.6f; - trail.update(x + Angles.trnsx(rotation + 180f, 5f) + Mathf.range(wobblyness), + if(!state.isPaused()) trail.update(x + Angles.trnsx(rotation + 180f, 5f) + Mathf.range(wobblyness), y + Angles.trnsy(rotation + 180f, 5f) + Mathf.range(wobblyness)); - trail.draw(Hue.mix(mech.trailColor, mech.trailColorTo, boostHeat, Tmp.c1), 5f * (isFlying() ? 1f : boostHeat)); + trail.draw(Hue.mix(mech.trailColor, mech.trailColorTo, mech.flying ? 0f : boostHeat, Tmp.c1), 5f * (isFlying() ? 1f : boostHeat)); }else{ trail.clear(); } @@ -587,7 +587,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra float baseLerp = mech.getRotationAlpha(this); if(!isShooting()){ if(!movement.isZero()){ - rotation = Mathf.slerpDelta(rotation, movement.angle(), 0.13f * baseLerp); + rotation = Mathf.slerpDelta(rotation, mech.flying ? velocity.angle() : movement.angle(), 0.13f * baseLerp); } }else{ float angle = control.input(playerIndex).mouseAngle(x, y); diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java index ceab38c635..8713f394b5 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java @@ -36,7 +36,7 @@ public class BasicBulletType extends BulletType{ public float incendChance = 1f; public float homingPower = 0f; - public float homingRange = 40f; + public float homingRange = 50f; public TextureRegion backRegion; public TextureRegion frontRegion; diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java index 5313e432ab..7e75370183 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java @@ -14,7 +14,7 @@ public class MissileBulletType extends BasicBulletType{ super(speed, damage, bulletSprite); backColor = Palette.missileYellowBack; frontColor = Palette.missileYellow; - homingPower = 6f; + homingPower = 7f; } @Override diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index 32e40d0b79..fe8fcb5999 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java @@ -149,7 +149,7 @@ public class Lightning extends TimedEntity implements Poolable, DrawTrait{ Draw.color(color, Color.WHITE, fin()); for(int i = 0; i < lines.size; i++){ Vector2 v = lines.get(i); - Lines.stroke(fout() * 3f + 1f - (float) i / lines.size); + Lines.stroke(fout() * 3f * (1.5f - (float) i / lines.size)); Lines.line(lx, ly, v.x, v.y); lx = v.x; ly = v.y;