diff --git a/build.gradle b/build.gradle index c840690ca3..3d0a3aa05e 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = 'd30ec505beb78da25fea3a5aa78f79260f2fb65b' + uCoreVersion = '7053ba9c265d9743593063080c1bf8ce243c3827' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png index 277d848d8f..3470f40257 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png index d25325c6bc..8d435294c1 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png index 277d848d8f..440fe9fd0c 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png index d25325c6bc..8c9187a00c 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech.png b/core/assets-raw/sprites/mechs/mechs/omega-mech.png index 039c8834b8..e391b596fd 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech.png differ diff --git a/core/assets-raw/sprites/weapons/swarmer-equip.png b/core/assets-raw/sprites/weapons/swarmer-equip.png new file mode 100644 index 0000000000..9dfe8c4583 Binary files /dev/null and b/core/assets-raw/sprites/weapons/swarmer-equip.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 8cc5d9813f..00903ea248 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: 863, 279 + xy: 833, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 873, 279 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 883, 279 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 873, 239 + xy: 863, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 883, 249 + xy: 853, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 893, 259 + xy: 863, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 903, 269 + xy: 873, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 853, 216 + xy: 853, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 863, 219 + xy: 863, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 873, 229 + xy: 873, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 883, 239 + xy: 883, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 893, 249 + xy: 853, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 903, 259 + xy: 863, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 913, 269 + xy: 873, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 853, 206 + xy: 883, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 863, 209 + xy: 893, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 873, 219 + xy: 853, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 883, 229 + xy: 863, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 893, 239 + xy: 873, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 903, 249 + xy: 883, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 913, 259 + xy: 893, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 923, 269 + xy: 903, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 841, 168 + xy: 1013, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 851, 176 + xy: 1013, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 851, 166 + xy: 1013, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 861, 169 + xy: 415, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 871, 169 + xy: 419, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 881, 169 + xy: 429, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 891, 169 + xy: 419, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 901, 169 + xy: 439, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 911, 169 + xy: 419, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 921, 169 + xy: 429, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 931, 169 + xy: 449, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 941, 165 + xy: 429, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 951, 165 + xy: 439, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 961, 165 + xy: 459, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 971, 165 + xy: 439, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 981, 165 + xy: 449, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 991, 165 + xy: 469, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1001, 165 + xy: 449, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1011, 165 + xy: 459, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,21 +307,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 631, 182 + xy: 327, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 621, 172 + xy: 337, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 641, 182 + xy: 347, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,14 +545,14 @@ block-icon-blackstone index: -1 blackstone2 rotate: false - xy: 677, 194 + xy: 510, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 359, 27 + xy: 287, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -566,553 +566,553 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 893, 279 + xy: 833, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 903, 279 + xy: 841, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 913, 279 + xy: 843, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 853, 196 + xy: 853, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 863, 199 + xy: 863, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 873, 209 + xy: 873, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 933, 269 + xy: 863, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 943, 275 + xy: 873, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 269, 37 + xy: 315, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 943, 265 + xy: 873, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 943, 265 + xy: 873, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 953, 275 + xy: 883, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 953, 275 + xy: 883, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 883, 199 + xy: 893, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 883, 199 + xy: 893, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 893, 209 + xy: 903, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 893, 209 + xy: 903, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 923, 239 + xy: 933, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 933, 249 + xy: 943, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 943, 255 + xy: 873, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 953, 265 + xy: 883, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 903, 219 + xy: 913, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 913, 229 + xy: 923, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 311, 51 + xy: 357, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 893, 199 + xy: 903, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 903, 209 + xy: 913, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 325, 51 + xy: 371, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 913, 219 + xy: 923, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 923, 229 + xy: 933, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 923, 229 + xy: 933, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 933, 239 + xy: 943, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 933, 239 + xy: 943, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 339, 37 + xy: 385, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 923, 199 + xy: 933, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 933, 209 + xy: 943, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 943, 215 + xy: 953, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 973, 235 + xy: 973, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 983, 245 + xy: 983, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 993, 255 + xy: 993, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 953, 205 + xy: 923, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 963, 215 + xy: 933, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 381, 37 + xy: 399, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 395, 37 + xy: 191, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 651, 162 + xy: 355, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 671, 174 + xy: 375, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 671, 164 + xy: 385, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 1003, 353 + xy: 177, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 731, 178 + xy: 531, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 721, 168 + xy: 541, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 741, 178 + xy: 520, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 1005, 325 + xy: 723, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 177, 17 + xy: 737, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 801, 178 + xy: 1007, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 791, 168 + xy: 1007, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 811, 178 + xy: 1013, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 801, 168 + xy: 1013, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 791, 178 + xy: 1007, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 781, 168 + xy: 1007, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 191, 17 + xy: 751, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 821, 178 + xy: 1013, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 811, 168 + xy: 1013, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 831, 178 + xy: 1013, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 821, 168 + xy: 1013, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 841, 178 + xy: 1013, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 831, 168 + xy: 1013, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 731, 158 + xy: 459, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 741, 158 + xy: 469, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 751, 158 + xy: 489, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 761, 158 + xy: 469, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 191, 3 + xy: 500, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 501, 175 + xy: 357, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 511, 175 + xy: 367, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 511, 175 + xy: 367, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 843, 228 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 843, 228 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 843, 218 + xy: 833, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 843, 208 + xy: 833, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 883, 269 + xy: 883, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 883, 219 + xy: 883, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1140,7 +1140,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 933, 259 + xy: 863, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,21 +1154,21 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 631, 172 + xy: 357, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 651, 182 + xy: 367, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 267, 25 + xy: 486, 147 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1217,7 +1217,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 279, 25 + xy: 486, 135 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1259,14 +1259,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 291, 25 + xy: 498, 147 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 303, 25 + xy: 498, 135 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, 198 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 843, 188 + xy: 833, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 853, 286 + xy: 833, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 853, 266 + xy: 843, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 863, 269 + xy: 843, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 853, 256 + xy: 843, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 863, 259 + xy: 843, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 873, 269 + xy: 843, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 853, 246 + xy: 853, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 863, 249 + xy: 863, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 873, 259 + xy: 873, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 853, 236 + xy: 893, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 863, 239 + xy: 903, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 873, 249 + xy: 913, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 883, 259 + xy: 923, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 893, 269 + xy: 933, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 853, 226 + xy: 853, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 863, 229 + xy: 853, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 933, 199 + xy: 933, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 943, 205 + xy: 943, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 953, 215 + xy: 953, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 963, 225 + xy: 963, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1469,70 +1469,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 601, 172 + xy: 297, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 621, 182 + xy: 307, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 611, 172 + xy: 317, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 641, 172 + xy: 377, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 661, 182 + xy: 387, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 651, 172 + xy: 397, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 661, 172 + xy: 407, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 581, 162 + xy: 285, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 591, 162 + xy: 295, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 601, 162 + xy: 305, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,7 +1623,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 661, 162 + xy: 365, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1812,14 +1812,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 993, 275 + xy: 923, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 983, 215 + xy: 953, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1861,21 +1861,21 @@ poweralloysmelter-top index: -1 pulverizer rotate: false - xy: 611, 162 + xy: 315, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 621, 162 + xy: 325, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 711, 165 + xy: 541, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1896,21 +1896,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 751, 168 + xy: 527, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 481, 174 + xy: 337, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 491, 175 + xy: 347, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1980,7 +1980,7 @@ cyclone index: -1 duo rotate: false - xy: 923, 249 + xy: 853, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,7 +2001,7 @@ spectre index: -1 hail rotate: false - xy: 963, 275 + xy: 893, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2078,21 +2078,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 701, 175 + xy: 409, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 701, 165 + xy: 521, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 711, 175 + xy: 531, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2246,14 +2246,14 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 631, 162 + xy: 335, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 641, 162 + xy: 345, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2281,7 +2281,7 @@ door-large-open index: -1 door-open rotate: false - xy: 913, 239 + xy: 923, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2316,7 +2316,7 @@ bullet index: -1 bullet-back rotate: false - xy: 546, 198 + xy: 572, 195 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2337,35 +2337,35 @@ clear index: -1 command-attack rotate: false - xy: 923, 279 + xy: 843, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 933, 279 + xy: 843, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 853, 276 + xy: 843, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 544, 185 + xy: 550, 197 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 283, 37 + xy: 329, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2407,14 +2407,14 @@ minelaser-end index: -1 missile rotate: false - xy: 315, 26 + xy: 474, 124 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 326, 26 + xy: 485, 124 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2456,21 +2456,21 @@ scorch5 index: -1 shell rotate: false - xy: 337, 26 + xy: 496, 124 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 348, 26 + xy: 510, 148 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 721, 178 + xy: 521, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2484,7 +2484,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 721, 158 + xy: 479, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2498,28 +2498,28 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 369, 27 + xy: 297, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 379, 27 + xy: 307, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 389, 27 + xy: 317, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 399, 27 + xy: 327, 27 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: 521, 175 + xy: 377, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 521, 175 + xy: 377, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 531, 175 + xy: 387, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 531, 175 + xy: 387, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2589,14 +2589,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 481, 164 + xy: 397, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 481, 164 + xy: 397, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2617,14 +2617,14 @@ command-center index: -1 block-icon-composite-wall rotate: false - xy: 491, 165 + xy: 407, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 491, 165 + xy: 407, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2645,35 +2645,35 @@ composite-wall-large index: -1 block-icon-conduit rotate: false - xy: 501, 165 + xy: 568, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 511, 165 + xy: 406, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 511, 165 + xy: 406, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 521, 165 + xy: 507, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 521, 165 + xy: 507, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2750,28 +2750,28 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 531, 165 + xy: 517, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 531, 165 + xy: 517, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 406, 71 + xy: 517, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 406, 71 + xy: 517, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2806,14 +2806,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 541, 175 + xy: 527, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 541, 175 + xy: 527, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2834,14 +2834,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 541, 165 + xy: 527, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 541, 165 + xy: 527, 165 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: 554, 184 + xy: 537, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 554, 184 + xy: 537, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 564, 184 + xy: 537, 165 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: 551, 174 + xy: 578, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 551, 174 + xy: 578, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 561, 174 + xy: 588, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 551, 164 + xy: 598, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 551, 164 + xy: 598, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 561, 164 + xy: 608, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 561, 164 + xy: 608, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 571, 174 + xy: 618, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 571, 174 + xy: 618, 182 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: 571, 164 + xy: 628, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 571, 164 + xy: 628, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 813, 288 + xy: 638, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 813, 288 + xy: 638, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3023,14 +3023,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 823, 288 + xy: 648, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 823, 288 + xy: 648, 182 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: 811, 278 + xy: 658, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 811, 278 + xy: 658, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 833, 288 + xy: 668, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 833, 288 + xy: 668, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 821, 278 + xy: 568, 174 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: 813, 268 + xy: 578, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 813, 268 + xy: 578, 172 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: 831, 278 + xy: 588, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 831, 278 + xy: 588, 172 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, 258 + xy: 598, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 813, 258 + xy: 598, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 823, 268 + xy: 608, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 823, 268 + xy: 608, 172 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: 813, 248 + xy: 618, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 813, 248 + xy: 618, 172 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: 823, 258 + xy: 628, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 823, 258 + xy: 628, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 813, 238 + xy: 638, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 813, 238 + xy: 638, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 823, 248 + xy: 648, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 823, 248 + xy: 648, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 813, 228 + xy: 658, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 813, 228 + xy: 658, 172 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: 823, 238 + xy: 668, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 823, 238 + xy: 668, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3338,42 +3338,42 @@ power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 813, 218 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 813, 218 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 823, 228 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 823, 228 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 813, 208 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 823, 218 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3436,14 +3436,14 @@ reconstructor index: -1 block-icon-repair-point rotate: false - xy: 813, 198 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 813, 198 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3457,14 +3457,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 823, 208 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 823, 208 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3485,28 +3485,28 @@ rotary-pump index: -1 block-icon-router rotate: false - xy: 813, 188 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 813, 188 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 823, 198 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 823, 198 + xy: 813, 258 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, 188 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 823, 188 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 833, 268 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 833, 258 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 833, 258 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 833, 248 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 833, 248 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3583,42 +3583,42 @@ silicon-smelter index: -1 block-icon-smelter rotate: false - xy: 833, 238 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 833, 238 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 833, 228 + xy: 813, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 833, 228 + xy: 813, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 833, 218 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 833, 218 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3639,42 +3639,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 833, 208 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 833, 208 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 833, 198 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 833, 198 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 833, 188 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 833, 188 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,14 +3688,14 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 841, 278 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 841, 278 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3751,14 +3751,14 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 843, 268 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 843, 268 + xy: 813, 198 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: 843, 258 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 843, 258 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3814,14 +3814,14 @@ turbine-generator index: -1 block-icon-unloader rotate: false - xy: 843, 248 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 843, 248 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3856,14 +3856,14 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 843, 238 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 843, 238 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3884,938 +3884,938 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 893, 229 + xy: 893, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 903, 239 + xy: 903, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 913, 249 + xy: 913, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 923, 259 + xy: 853, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 873, 199 + xy: 883, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 883, 209 + xy: 893, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 893, 219 + xy: 903, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 903, 229 + xy: 913, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 953, 235 + xy: 963, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 963, 245 + xy: 973, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 973, 255 + xy: 903, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 983, 265 + xy: 913, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 963, 235 + xy: 973, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 973, 245 + xy: 983, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 983, 255 + xy: 913, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 993, 265 + xy: 923, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 353, 51 + xy: 1003, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 353, 37 + xy: 1003, 353 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 367, 51 + xy: 1005, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 367, 37 + xy: 1005, 325 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 367, 37 + xy: 1005, 325 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 381, 51 - size: 12, 12 - orig: 12, 12 + xy: 239, 33 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 381, 51 + xy: 399, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 973, 225 + xy: 943, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 983, 235 + xy: 953, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 993, 245 + xy: 963, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 963, 205 + xy: 973, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 973, 215 + xy: 983, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 983, 225 + xy: 993, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 993, 235 + xy: 933, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 973, 205 + xy: 943, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 993, 225 + xy: 963, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 983, 205 + xy: 973, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 993, 215 + xy: 983, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 993, 205 + xy: 993, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 853, 186 + xy: 953, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 863, 189 + xy: 963, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 873, 189 + xy: 973, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 883, 189 + xy: 983, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 893, 189 + xy: 993, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 903, 189 + xy: 963, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 913, 189 + xy: 973, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 923, 189 + xy: 983, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 933, 189 + xy: 993, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 943, 195 + xy: 973, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 953, 195 + xy: 983, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 963, 195 + xy: 993, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 973, 195 + xy: 983, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 983, 195 + xy: 993, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 993, 195 + xy: 993, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 943, 185 + xy: 853, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 953, 185 + xy: 863, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 963, 185 + xy: 873, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 973, 185 + xy: 883, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 983, 185 + xy: 893, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 993, 185 + xy: 903, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 1003, 275 + xy: 913, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 1003, 265 + xy: 923, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1003, 255 + xy: 933, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1003, 245 + xy: 943, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1003, 235 + xy: 953, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 1003, 225 + xy: 963, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 1003, 215 + xy: 973, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 1003, 205 + xy: 983, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1003, 195 + xy: 993, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1003, 185 + xy: 943, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 863, 179 + xy: 953, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 873, 179 + xy: 963, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 883, 179 + xy: 973, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 893, 179 + xy: 983, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 903, 179 + xy: 993, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 913, 179 + xy: 1003, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 923, 179 + xy: 1003, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 933, 179 + xy: 1003, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 943, 175 + xy: 1003, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 953, 175 + xy: 1003, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 963, 175 + xy: 1003, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 973, 175 + xy: 1003, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 983, 175 + xy: 1003, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 993, 175 + xy: 1003, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 1003, 175 + xy: 1003, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 677, 184 + xy: 863, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 687, 185 + xy: 873, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 697, 185 + xy: 883, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 707, 185 + xy: 893, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 207, 23 + xy: 903, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 217, 23 + xy: 913, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 227, 23 + xy: 923, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 237, 23 + xy: 933, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 205, 13 + xy: 943, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 205, 3 + xy: 953, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 215, 13 + xy: 963, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 215, 3 + xy: 973, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 225, 13 + xy: 983, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 225, 3 + xy: 993, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 235, 13 + xy: 1003, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 235, 3 + xy: 207, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 409, 107 + xy: 217, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 409, 97 + xy: 227, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 409, 87 + xy: 237, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1007, 315 + xy: 247, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1007, 305 + xy: 257, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1007, 295 + xy: 267, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 1007, 285 + xy: 277, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 1013, 275 + xy: 205, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 1013, 265 + xy: 205, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 1013, 255 + xy: 215, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 1013, 245 + xy: 215, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 1013, 235 + xy: 225, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 1013, 225 + xy: 225, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 1013, 215 + xy: 235, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 1013, 205 + xy: 235, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1013, 195 + xy: 245, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1013, 185 + xy: 245, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1013, 175 + xy: 255, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 581, 182 + xy: 255, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 591, 182 + xy: 265, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 581, 172 + xy: 265, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 601, 182 + xy: 275, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 591, 172 + xy: 275, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 611, 182 + xy: 287, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 681, 174 + xy: 395, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 681, 164 + xy: 405, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 691, 175 + xy: 409, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 691, 165 + xy: 409, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 731, 168 + xy: 517, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 751, 178 + xy: 507, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 741, 168 + xy: 517, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 761, 178 + xy: 527, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 771, 178 + xy: 530, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 761, 168 + xy: 540, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 781, 178 + xy: 537, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 771, 168 + xy: 537, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 177, 3 + xy: 486, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4829,112 +4829,112 @@ unit-icon-titan index: -1 item-biomatter rotate: false - xy: 963, 265 + xy: 893, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 973, 275 + xy: 903, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 903, 199 + xy: 913, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 913, 209 + xy: 923, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 923, 219 + xy: 933, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 933, 229 + xy: 943, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 943, 235 + xy: 953, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 953, 245 + xy: 963, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 963, 255 + xy: 893, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 973, 265 + xy: 903, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 983, 275 + xy: 913, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 913, 199 + xy: 923, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 923, 209 + xy: 933, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 933, 219 + xy: 943, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 943, 225 + xy: 953, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 953, 225 + xy: 963, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4953,34 +4953,6 @@ alpha-mech-base orig: 12, 12 offset: 0, 0 index: -1 -delta-mech-base - rotate: false - xy: 85, 1 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -omega-mech-base - rotate: false - xy: 85, 1 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -tau-mech-base - rotate: false - xy: 85, 1 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -dagger-base - rotate: false - xy: 85, 1 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 alpha-mech-leg rotate: false xy: 99, 1 @@ -4988,86 +4960,79 @@ alpha-mech-leg orig: 12, 12 offset: 0, 0 index: -1 -omega-mech-leg - rotate: false - xy: 99, 1 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -tau-mech-leg - rotate: false - xy: 99, 1 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -dagger-leg - rotate: false - xy: 99, 1 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 delta-mech rotate: false - xy: 255, 37 + xy: 301, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 269, 51 + xy: 315, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 1003, 367 - size: 12, 12 - orig: 12, 12 + xy: 255, 49 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +omega-mech-base + rotate: false + xy: 255, 33 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +omega-mech-leg + rotate: false + xy: 271, 49 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 1003, 367 + xy: 779, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 255, 51 + xy: 301, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 311, 37 + xy: 357, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 311, 37 + xy: 357, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 339, 51 + xy: 385, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 339, 51 + xy: 385, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5307,21 +5272,21 @@ icon-arrow-down index: -1 icon-arrow-left rotate: false - xy: 723, 188 + xy: 514, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 735, 188 + xy: 526, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 747, 188 + xy: 538, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5356,7 +5321,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 759, 188 + xy: 484, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5370,21 +5335,21 @@ icon-check index: -1 icon-crafting rotate: false - xy: 771, 188 + xy: 496, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 783, 188 + xy: 481, 171 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 486, 197 + xy: 493, 171 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5405,7 +5370,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 498, 197 + xy: 508, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5545,14 +5510,14 @@ icon-grid index: -1 icon-hold rotate: false - xy: 510, 197 + xy: 505, 171 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 522, 197 + xy: 520, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5573,7 +5538,7 @@ icon-host index: -1 icon-info rotate: false - xy: 534, 197 + xy: 532, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5587,14 +5552,14 @@ icon-itch.io index: -1 icon-item rotate: false - xy: 484, 185 + xy: 544, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 943, 245 + xy: 953, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5615,7 +5580,7 @@ icon-link index: -1 icon-liquid rotate: false - xy: 496, 185 + xy: 560, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5657,7 +5622,7 @@ icon-locked index: -1 icon-logic rotate: false - xy: 508, 185 + xy: 583, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5671,7 +5636,7 @@ icon-map index: -1 icon-menu rotate: false - xy: 520, 185 + xy: 595, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5685,28 +5650,28 @@ icon-menu-large index: -1 icon-missing rotate: false - xy: 532, 185 + xy: 607, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 557, 194 + xy: 619, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 953, 255 + xy: 883, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 569, 194 + xy: 631, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5734,7 +5699,7 @@ icon-pick index: -1 icon-play rotate: false - xy: 581, 192 + xy: 643, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5748,21 +5713,21 @@ icon-play-2 index: -1 icon-players rotate: false - xy: 593, 192 + xy: 655, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 605, 192 + xy: 667, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 617, 192 + xy: 481, 159 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5853,7 +5818,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 629, 192 + xy: 493, 159 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5874,14 +5839,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 641, 192 + xy: 505, 159 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 653, 192 + xy: 556, 182 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5923,7 +5888,7 @@ icon-undo index: -1 icon-units rotate: false - xy: 665, 192 + xy: 474, 147 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5937,7 +5902,7 @@ icon-unlocks index: -1 icon-weapon rotate: false - xy: 255, 25 + xy: 474, 135 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6151,16 +6116,51 @@ dagger orig: 12, 12 offset: 0, 0 index: -1 +dagger-base + rotate: false + xy: 287, 51 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +delta-mech-base + rotate: false + xy: 287, 51 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +tau-mech-base + rotate: false + xy: 287, 51 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +dagger-leg + rotate: false + xy: 287, 37 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +tau-mech-leg + rotate: false + xy: 287, 37 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 drone rotate: false - xy: 283, 51 + xy: 329, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 283, 51 + xy: 329, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6181,14 +6181,14 @@ unit-icon-fabricator index: -1 interceptor rotate: false - xy: 325, 37 + xy: 371, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 325, 37 + xy: 371, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6209,7 +6209,7 @@ unit-icon-monsoon index: -1 power-cell rotate: false - xy: 239, 33 + xy: 271, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6251,28 +6251,35 @@ chain-blaster-equip index: -1 flakgun-equip rotate: false - xy: 297, 51 + xy: 343, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 297, 37 + xy: 343, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 395, 51 + xy: 177, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1005, 339 + xy: 191, 3 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +swarmer-equip + rotate: false + xy: 765, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 54fba77265..7992acae42 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/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index d256df29dd..0e22367dff 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -11,7 +11,7 @@ import io.anuke.mindustry.type.ContentList; public class AmmoTypes implements ContentList{ public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite, - shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, bulletMech, + shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech, flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid; @@ -64,6 +64,12 @@ public class AmmoTypes implements ContentList{ reloadMultiplier = 1.2f; }}; + weaponMissileSwarm = new AmmoType(MissileBullets.swarm){{ + shootEffect = BulletFx.hitBulletSmall; + smokeEffect = ShootFx.shootSmallSmoke; + reloadMultiplier = 1.2f; + }}; + //bullets bulletCopper = new AmmoType(Items.copper, StandardBullets.copper, 5){{ diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index cc295b9ed7..f16ba68260 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -11,9 +11,7 @@ import io.anuke.mindustry.type.Upgrade; public class Mechs implements ContentList{ public static Mech alpha, delta, tau, omega, dart, javelin, trident, halberd; - /** - * These are not new mechs, just re-assignments for convenience. - */ + /**These are not new mechs, just re-assignments for convenience.*/ public static Mech starterDesktop, starterMobile; @Override @@ -25,7 +23,6 @@ public class Mechs implements ContentList{ speed = 0.5f; boostSpeed = 0.85f; weapon = Weapons.blaster; - trailColor = Palette.lightTrail; maxSpeed = 4f; }}; @@ -36,23 +33,37 @@ public class Mechs implements ContentList{ itemCapacity = 15; armor = 30f; weaponOffsetX = -1; + itemCapacity = 15; weaponOffsetY = -1; weapon = Weapons.shockgun; - ammoCapacity = 50; - trailColor = Color.valueOf("d3ddff"); + trailColorTo = Color.valueOf("d3ddff"); maxSpeed = 5f; }}; tau = new Mech("tau-mech", false){{ - drillPower = 2; - speed = 0.5f; + drillPower = 3; + mineSpeed = 3f; + itemCapacity = 70; + speed = 0.44f; + drag = 0.35f; + boostSpeed = 0.8f; + weapon = Weapons.blaster; maxSpeed = 5f; + armor = 30f; }}; omega = new Mech("omega-mech", false){{ - drillPower = 1; - speed = 0.4f; - maxSpeed = 3f; + drillPower = 2; + mineSpeed = 1.5f; + itemCapacity = 50; + speed = 0.36f; + boostSpeed = 0.6f; + shake = 4f; + weaponOffsetX = 1; + weaponOffsetY = 0; + weapon = Weapons.swarmer; + maxSpeed = 3.5f; + armor = 70f; }}; dart = new Mech("dart-ship", true){{ diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 8f07cc1bd6..d260e3c49b 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -128,6 +128,7 @@ public class Recipes implements ContentList{ 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.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.deltaFactory, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 30)); diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 794ca6c149..c8e63657a1 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -33,6 +33,19 @@ public class Weapons implements ContentList{ ammo = AmmoTypes.weaponMissile; }}; + swarmer = new Weapon("swarmer"){{ + length = 1.5f; + recoil = 4f; + reload = 60f; + shots = 4; + inaccuracy = 8f; + roundrobin = false; + roundrobin = true; + ejectEffect = Fx.none; + shake = 3f; + ammo = AmmoTypes.weaponMissileSwarm; + }}; + chainBlaster = new Weapon("chain-blaster"){{ length = 1.5f; reload = 28f; @@ -82,14 +95,6 @@ public class Weapons implements ContentList{ ammo = AmmoTypes.bulletDense; }}; - swarmer = new Weapon("swarmer"){{ - length = 1.5f; - reload = 10f; - roundrobin = true; - ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletPyratite; - }}; - bomber = new Weapon("bomber"){{ length = 0f; width = 2f; diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java index ceea3423f2..c9a220cced 100644 --- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java @@ -1,5 +1,6 @@ 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.BulletType; import io.anuke.mindustry.entities.bullet.MissileBulletType; @@ -7,7 +8,7 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.ContentList; public class MissileBullets extends BulletList implements ContentList{ - public static BulletType explosive, incindiary, surge, javelin; + public static BulletType explosive, incindiary, surge, javelin, swarm; @Override public void load(){ @@ -65,5 +66,23 @@ public class MissileBullets extends BulletList implements ContentList{ despawneffect = BulletFx.blastExplosion; } }; + + swarm = new MissileBulletType(2.7f, 10, "missile"){ + { + bulletWidth = 8f; + bulletHeight = 8f; + bulletShrink = 0f; + drag = -0.003f; + keepVelocity = false; + splashDamageRadius = 25f; + splashDamage = 15f; + lifetime = 120f; + trailColor = Color.GRAY; + backColor = Palette.bulletYellowBack; + frontColor = Palette.bulletYellow; + hiteffect = BulletFx.blastExplosion; + despawneffect = BulletFx.blastExplosion; + } + }; } } diff --git a/core/src/io/anuke/mindustry/content/fx/BulletFx.java b/core/src/io/anuke/mindustry/content/fx/BulletFx.java index 8c612c857c..7c45efac74 100644 --- a/core/src/io/anuke/mindustry/content/fx/BulletFx.java +++ b/core/src/io/anuke/mindustry/content/fx/BulletFx.java @@ -179,7 +179,7 @@ public class BulletFx extends FxList implements ContentList{ }); missileTrail = new Effect(50, e -> { - Draw.color(Palette.missileYellowBack); + Draw.color(e.color); Fill.circle(e.x, e.y, e.rotation * e.fout()); Draw.reset(); }); diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 407b07c207..7fa674dd12 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -50,12 +50,12 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra private static final float liftoffBoost = 0.2f; //region instance variables, constructor - public float baseRotation; + public float baseRotation; public float pointerX, pointerY; public String name = "name"; public String uuid, usid; - public boolean isAdmin, isTransferring, isShooting, isBoosting, isMobile; + public boolean isAdmin, isTransferring, isShooting, isBoosting, isAlt, isMobile; public float boostHeat; public boolean achievedFlight; public Color color = new Color(); @@ -300,7 +300,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra Draw.rect(mech.legRegion, x + Angles.trnsx(baseRotation, ft * i + boostTrnsY, -boostTrnsX * i), y + Angles.trnsy(baseRotation, ft * i + boostTrnsY, -boostTrnsX * i), - 12f * i, 12f - Mathf.clamp(ft * i, 0, 2), baseRotation - 90 + boostAng * i); + mech.legRegion.getRegionWidth() * i, mech.legRegion.getRegionHeight() - Mathf.clamp(ft * i, 0, 2), baseRotation - 90 + boostAng * i); } Draw.rect(mech.baseRegion, x, y, baseRotation - 90); @@ -316,10 +316,10 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra for(int i : Mathf.signs){ float tra = rotation - 90, trY = -mech.weapon.getRecoil(this, i > 0) + mech.weaponOffsetY; - float w = i > 0 ? -12 : 12; + float w = i > 0 ? -mech.weapon.equipRegion.getRegionWidth() : mech.weapon.equipRegion.getRegionWidth(); Draw.rect(mech.weapon.equipRegion, x + Angles.trnsx(tra, mech.weaponOffsetX * i, trY), - y + Angles.trnsy(tra, mech.weaponOffsetX * i, trY), w, 12, rotation - 90); + y + Angles.trnsy(tra, mech.weaponOffsetX * i, trY), w, mech.weapon.equipRegion.getRegionHeight(), rotation - 90); } float backTrns = 4f, itemSize = 5f; @@ -496,11 +496,17 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } if(boostHeat <= liftoffBoost + 0.05f && achievedFlight){ - if(tile != null) Effects.effect(UnitFx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); + if(tile != null){ + if(mech.shake > 1f){ + Effects.shake(mech.shake, mech.shake, this); + } + Effects.effect(UnitFx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); + } achievedFlight = false; } isBoosting = Inputs.keyDown("dash") && !mech.flying; + isAlt = Inputs.keyDown("ability") && !mech.flying; //if player is in solid block if(tile != null && tile.solid()){ diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java index f87d017812..ceab38c635 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java @@ -3,8 +3,8 @@ package io.anuke.mindustry.entities.bullet; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.entities.Damage; -import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Units; +import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.graphics.Palette; import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Timers; @@ -70,7 +70,7 @@ public class BasicBulletType extends BulletType{ super.update(b); if(homingPower > 0.0001f){ - Unit target = Units.getClosestEnemy(b.getTeam(), b.x, b.y, homingRange, unit -> true); + TargetTrait target = Units.getClosestTarget(b.getTeam(), b.x, b.y, homingRange); if(target != null){ b.getVelocity().setAngle(Angles.moveToward(b.getVelocity().angle(), b.angleTo(target), homingPower * Timers.delta())); } diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java index 6179d2e6a3..5313e432ab 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java @@ -1,10 +1,14 @@ package io.anuke.mindustry.entities.bullet; +import com.badlogic.gdx.graphics.Color; import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.graphics.Palette; import io.anuke.ucore.core.Effects; +import io.anuke.ucore.core.Timers; +import io.anuke.ucore.util.Mathf; public class MissileBulletType extends BasicBulletType{ + protected Color trailColor = Palette.missileYellowBack; public MissileBulletType(float speed, float damage, String bulletSprite){ super(speed, damage, bulletSprite); @@ -17,8 +21,8 @@ public class MissileBulletType extends BasicBulletType{ public void update(Bullet b){ super.update(b); - if(b.timer.get(0, 4f)){ - Effects.effect(BulletFx.missileTrail, b.x, b.y, 2f); + if(Mathf.chance(Timers.delta() * 0.2)){ + Effects.effect(BulletFx.missileTrail, trailColor, b.x, b.y, 2f); } } } diff --git a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java index 7df23aeff6..cef9551c16 100644 --- a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java +++ b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java @@ -24,6 +24,7 @@ public class DefaultKeybinds{ //"shoot", Input.MOUSE_LEFT, "rotate", new Axis(Input.SCROLL), "dash", Input.SHIFT_LEFT, + "ability", Input.SPACE, "drop_unit", Input.SHIFT_LEFT, new Category("view"), "zoom_hold", Input.CONTROL_LEFT, diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java index 5c295d61fe..504b2f21f0 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/io/anuke/mindustry/type/Mech.java @@ -18,6 +18,7 @@ public class Mech extends Upgrade implements UnlockableContent{ public float boostSpeed = 0.75f; public float drag = 0.4f; public float mass = 1f; + public float shake = 0f; public float armor = 1f; public float mineSpeed = 1f; @@ -26,14 +27,12 @@ public class Mech extends Upgrade implements UnlockableContent{ public float buildPower = 1f; public Color trailColor = Palette.boostFrom; public Color trailColorTo = Palette.boostTo; + public int itemCapacity = 30; public float weaponOffsetX, weaponOffsetY; public Weapon weapon = Weapons.blaster; - public int itemCapacity = 30; - public int ammoCapacity = 100; - public TextureRegion baseRegion, legRegion, region, iconRegion; public Mech(String name, boolean flying){ diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 40fe497844..9bbefb481e 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -257,7 +257,7 @@ public class Tile implements PosTrait, TargetTrait{ if(link == 0){ return (block.destructible || block.breakable || block.update); }else{ - return getLinked().breakable(); + return getLinked() != this && getLinked().breakable(); } }