diff --git a/build.gradle b/build.gradle index e65143e951..ce10eab1d8 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ allprojects { generateLocales = { def output = '["en",' - def bundles = new File('core/assets/bundles/') + def bundles = new File(project(':core').projectDir, 'assets/bundles/') bundles.listFiles().each { other -> if(other.name == "bundle.properties") return; output += '"' + other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + '",' @@ -54,7 +54,7 @@ allprojects { } writeVersion = { - def pfile = new File('core/assets/version.properties') + def pfile = new File(project(':core').projectDir, 'assets/version.properties') def props = new Properties() try{ diff --git a/core/assets-raw/sprites/units/alpha-drone.png b/core/assets-raw/sprites/units/alpha-drone.png new file mode 100644 index 0000000000..d43982ca8c Binary files /dev/null and b/core/assets-raw/sprites/units/alpha-drone.png differ diff --git a/core/assets-raw/sprites/weapons/blaster-equip.png b/core/assets-raw/sprites/weapons/blaster-equip.png index c246dc41de..de5767f46a 100644 Binary files a/core/assets-raw/sprites/weapons/blaster-equip.png and b/core/assets-raw/sprites/weapons/blaster-equip.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 8a2ee82cf2..e787fde68b 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,287 +13,287 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 873, 259 + xy: 843, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 883, 269 + xy: 843, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 853, 236 + xy: 843, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 903, 249 + xy: 853, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 913, 259 + xy: 863, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 923, 269 + xy: 873, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 853, 196 + xy: 883, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 863, 199 + xy: 893, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 873, 209 + xy: 853, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 883, 219 + xy: 863, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 893, 229 + xy: 873, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 903, 239 + xy: 883, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 913, 249 + xy: 893, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 923, 259 + xy: 903, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 933, 269 + xy: 853, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 943, 275 + xy: 863, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 873, 199 + xy: 873, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 883, 209 + xy: 883, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 893, 219 + xy: 893, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 903, 229 + xy: 903, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 913, 239 + xy: 913, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 923, 249 + xy: 853, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 431, 34 + xy: 881, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 441, 34 + xy: 891, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 451, 34 + xy: 901, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 461, 34 + xy: 891, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 471, 34 + xy: 901, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 481, 34 + xy: 911, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 476, 74 + xy: 901, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 476, 64 + xy: 911, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 485, 54 + xy: 921, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 491, 44 + xy: 911, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 491, 34 + xy: 921, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 311, 31 + xy: 931, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 321, 31 + xy: 921, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 331, 31 + xy: 931, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 341, 31 + xy: 931, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 351, 31 + xy: 943, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 361, 31 + xy: 953, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 371, 31 + xy: 963, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 381, 31 + xy: 973, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,21 +307,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 411, 41 + xy: 409, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 305, 5 + xy: 721, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 419, 114 + xy: 731, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,574 +545,574 @@ block-icon-blackstone index: -1 blackstone2 rotate: false - xy: 582, 158 + xy: 1007, 304 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 592, 158 + xy: 1007, 294 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 937, 337 + xy: 166, 66 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 863, 239 + xy: 843, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 873, 249 + xy: 843, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 883, 259 + xy: 843, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 933, 259 + xy: 863, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 953, 275 + xy: 873, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 943, 265 + xy: 883, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 933, 249 + xy: 863, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 963, 275 + xy: 873, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 359, 51 + xy: 373, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 973, 275 + xy: 873, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 973, 275 + xy: 873, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 943, 245 + xy: 883, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 943, 245 + xy: 883, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 953, 255 + xy: 893, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 953, 255 + xy: 893, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 963, 265 + xy: 903, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 963, 265 + xy: 903, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 923, 219 + xy: 933, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 933, 229 + xy: 943, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 983, 275 + xy: 953, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 943, 235 + xy: 883, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 903, 199 + xy: 913, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 913, 209 + xy: 923, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 1005, 339 + xy: 1005, 325 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 963, 255 + xy: 903, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 973, 265 + xy: 913, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 191, 17 + xy: 177, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 913, 199 + xy: 923, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 923, 209 + xy: 933, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 923, 209 + xy: 933, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 933, 219 + xy: 943, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 933, 219 + xy: 943, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 723, 186 + xy: 737, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 963, 215 + xy: 933, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 973, 225 + xy: 943, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 983, 235 + xy: 953, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 993, 215 + xy: 973, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 993, 205 + xy: 983, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 863, 189 + xy: 993, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 873, 189 + xy: 933, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 883, 189 + xy: 943, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 486, 195 + xy: 500, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 514, 195 + xy: 528, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 459, 94 + xy: 801, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 429, 84 + xy: 831, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 439, 84 + xy: 801, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 528, 195 + xy: 542, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 446, 74 + xy: 831, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 456, 74 + xy: 841, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 466, 74 + xy: 841, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 556, 192 + xy: 484, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 484, 181 + xy: 498, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 465, 54 + xy: 933, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 421, 44 + xy: 861, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 431, 44 + xy: 861, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 441, 44 + xy: 871, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 445, 54 + xy: 913, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 455, 54 + xy: 923, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 498, 181 + xy: 512, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 451, 44 + xy: 861, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 461, 44 + xy: 871, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 471, 44 + xy: 881, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 475, 54 + xy: 871, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 481, 44 + xy: 881, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 421, 34 + xy: 891, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 401, 31 + xy: 993, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 411, 31 + xy: 1003, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 307, 21 + xy: 1013, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 317, 21 + xy: 941, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 509, 167 + xy: 523, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 662, 159 + xy: 721, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 1007, 279 + xy: 731, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1007, 279 + xy: 731, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 863, 269 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 863, 269 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 853, 256 + xy: 833, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 863, 259 + xy: 841, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 893, 249 + xy: 863, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 883, 199 + xy: 893, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1140,7 +1140,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 933, 239 + xy: 943, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,21 +1154,21 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 419, 104 + xy: 741, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 429, 114 + xy: 751, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 594, 168 + xy: 645, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1217,7 +1217,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 606, 168 + xy: 662, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1259,14 +1259,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 618, 168 + xy: 657, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 630, 168 + xy: 669, 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: 873, 269 + xy: 843, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 853, 246 + xy: 843, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 863, 249 + xy: 843, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 873, 239 + xy: 883, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 883, 249 + xy: 893, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 893, 259 + xy: 903, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 903, 269 + xy: 913, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 853, 216 + xy: 923, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 863, 219 + xy: 933, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 873, 229 + xy: 853, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 883, 239 + xy: 853, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 903, 259 + xy: 853, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 913, 269 + xy: 863, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 853, 206 + xy: 873, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 863, 209 + xy: 853, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 873, 219 + xy: 863, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 883, 229 + xy: 873, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 893, 239 + xy: 883, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 973, 205 + xy: 933, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 983, 215 + xy: 943, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 993, 225 + xy: 953, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 983, 205 + xy: 963, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1469,70 +1469,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 381, 41 + xy: 667, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 391, 41 + xy: 409, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 401, 41 + xy: 409, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 419, 94 + xy: 761, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 429, 104 + xy: 771, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 439, 114 + xy: 781, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 429, 94 + xy: 791, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 439, 104 + xy: 791, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 449, 114 + xy: 791, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 439, 94 + xy: 791, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,7 +1623,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 419, 84 + xy: 811, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1812,14 +1812,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 953, 205 + xy: 923, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 973, 195 + xy: 983, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1861,21 +1861,21 @@ poweralloysmelter-top index: -1 pulverizer rotate: false - xy: 449, 104 + xy: 801, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 459, 114 + xy: 811, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 426, 74 + xy: 831, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1896,21 +1896,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 456, 64 + xy: 863, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 642, 159 + xy: 701, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 652, 159 + xy: 711, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1980,7 +1980,7 @@ cyclone index: -1 duo rotate: false - xy: 923, 229 + xy: 933, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,7 +2001,7 @@ spectre index: -1 hail rotate: false - xy: 953, 245 + xy: 893, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2078,21 +2078,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 469, 94 + xy: 821, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 469, 84 + xy: 831, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 416, 74 + xy: 821, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2246,14 +2246,14 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 449, 94 + xy: 801, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 459, 104 + xy: 821, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2281,7 +2281,7 @@ door-large-open index: -1 door-open rotate: false - xy: 913, 219 + xy: 923, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2316,7 +2316,7 @@ bullet index: -1 bullet-back rotate: false - xy: 571, 171 + xy: 674, 181 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2337,21 +2337,21 @@ clear index: -1 command-attack rotate: false - xy: 893, 269 + xy: 853, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 853, 226 + xy: 863, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 863, 229 + xy: 873, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2365,7 +2365,7 @@ enemyarrow index: -1 error rotate: false - xy: 387, 51 + xy: 1003, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2407,14 +2407,14 @@ minelaser-end index: -1 missile rotate: false - xy: 642, 169 + xy: 685, 184 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 653, 169 + xy: 696, 184 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2456,21 +2456,21 @@ scorch5 index: -1 shell rotate: false - xy: 664, 169 + xy: 707, 184 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 571, 160 + xy: 1007, 314 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 436, 74 + xy: 841, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2484,7 +2484,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 391, 31 + xy: 983, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2498,28 +2498,28 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 602, 158 + xy: 1007, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 612, 158 + xy: 406, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 622, 158 + xy: 681, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 632, 158 + xy: 691, 174 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: 406, 71 + xy: 741, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 406, 71 + xy: 741, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 675, 170 + xy: 751, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 675, 170 + xy: 751, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2589,14 +2589,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 672, 159 + xy: 761, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 672, 159 + xy: 761, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2617,14 +2617,14 @@ command-center index: -1 block-icon-composite-wall rotate: false - xy: 813, 288 + xy: 771, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 813, 288 + xy: 771, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2645,35 +2645,35 @@ composite-wall-large index: -1 block-icon-conduit rotate: false - xy: 823, 288 + xy: 781, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 811, 278 + xy: 681, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 811, 278 + xy: 681, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 833, 288 + xy: 691, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 833, 288 + xy: 691, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2750,28 +2750,28 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 821, 278 + xy: 701, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 821, 278 + xy: 701, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 813, 268 + xy: 711, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 813, 268 + xy: 711, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2806,14 +2806,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 831, 278 + xy: 721, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 831, 278 + xy: 721, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2834,14 +2834,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 813, 258 + xy: 731, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 813, 258 + xy: 731, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2869,21 +2869,21 @@ block-icon-drone-pad index: -1 block-icon-drop-point rotate: false - xy: 823, 268 + xy: 741, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 823, 268 + xy: 741, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 813, 248 + xy: 751, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2911,63 +2911,63 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 823, 258 + xy: 761, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 823, 258 + xy: 761, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 813, 238 + xy: 771, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 823, 248 + xy: 781, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 823, 248 + xy: 781, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 813, 228 + xy: 691, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 813, 228 + xy: 691, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 823, 238 + xy: 701, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 823, 238 + xy: 701, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2981,28 +2981,28 @@ block-icon-interceptor-pad index: -1 block-icon-itemsource rotate: false - xy: 813, 218 + xy: 711, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 813, 218 + xy: 711, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 823, 228 + xy: 721, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 823, 228 + xy: 721, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3023,14 +3023,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 813, 208 + xy: 731, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 813, 208 + xy: 731, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3051,35 +3051,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 823, 218 + xy: 741, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 823, 218 + xy: 741, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 813, 198 + xy: 751, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 813, 198 + xy: 751, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 823, 208 + xy: 761, 156 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, 188 + xy: 771, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 813, 188 + xy: 771, 156 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: 823, 198 + xy: 781, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 823, 198 + xy: 781, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3149,28 +3149,28 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 823, 188 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 823, 188 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 833, 268 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 833, 268 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3184,14 +3184,14 @@ block-icon-monsoon-pad index: -1 block-icon-oil rotate: false - xy: 833, 258 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 833, 258 + xy: 811, 278 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, 248 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 833, 248 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 833, 238 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 833, 238 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 833, 228 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 833, 228 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 833, 218 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 833, 218 + xy: 831, 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: 833, 208 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 833, 208 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3338,42 +3338,42 @@ power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 833, 198 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 833, 198 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 833, 188 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 833, 188 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 841, 278 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 843, 268 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3436,14 +3436,14 @@ reconstructor index: -1 block-icon-repair-point rotate: false - xy: 843, 258 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 843, 258 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3457,14 +3457,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 843, 248 + xy: 813, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 843, 248 + xy: 813, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3485,28 +3485,28 @@ rotary-pump index: -1 block-icon-router rotate: false - xy: 843, 238 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 843, 238 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 843, 228 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 843, 228 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3520,49 +3520,49 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 843, 218 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 843, 218 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 843, 208 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 843, 198 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 843, 198 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 843, 188 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 843, 188 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3583,42 +3583,42 @@ silicon-smelter index: -1 block-icon-smelter rotate: false - xy: 853, 286 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 853, 286 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 863, 279 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 863, 279 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 873, 279 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 873, 279 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3639,42 +3639,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 883, 279 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 883, 279 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 893, 279 + xy: 833, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 893, 279 + xy: 833, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 903, 279 + xy: 833, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 903, 279 + xy: 833, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,14 +3688,14 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 913, 279 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 913, 279 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3751,14 +3751,14 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 923, 279 + xy: 833, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 923, 279 + xy: 833, 238 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: 933, 279 + xy: 833, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 933, 279 + xy: 833, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3814,14 +3814,14 @@ turbine-generator index: -1 block-icon-unloader rotate: false - xy: 853, 276 + xy: 833, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 853, 276 + xy: 833, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3856,14 +3856,14 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 853, 266 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 853, 266 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3884,147 +3884,147 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 893, 209 + xy: 903, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 903, 219 + xy: 913, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 913, 229 + xy: 923, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 923, 239 + xy: 853, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 943, 255 + xy: 883, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 953, 265 + xy: 893, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 893, 199 + xy: 903, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 903, 209 + xy: 913, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 963, 225 + xy: 963, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 973, 235 + xy: 973, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 983, 245 + xy: 983, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 993, 255 + xy: 913, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 963, 205 + xy: 973, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 973, 215 + xy: 983, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 983, 225 + xy: 993, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 993, 235 + xy: 923, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 737, 186 + xy: 751, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 751, 186 + xy: 765, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 765, 186 + xy: 779, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 779, 186 + xy: 401, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 779, 186 + xy: 401, 51 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: 401, 51 + xy: 486, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 893, 189 + xy: 953, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 903, 189 + xy: 963, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 913, 189 + xy: 973, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 923, 189 + xy: 983, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 933, 189 + xy: 993, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 943, 195 + xy: 953, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 953, 195 + xy: 963, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 963, 195 + xy: 973, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 983, 195 + xy: 993, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 993, 195 + xy: 963, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 1003, 269 + xy: 973, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 1003, 259 + xy: 983, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 1003, 249 + xy: 993, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 1003, 239 + xy: 973, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 1003, 229 + xy: 983, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 1003, 219 + xy: 993, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 1003, 209 + xy: 983, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1003, 199 + xy: 993, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 943, 185 + xy: 993, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 953, 185 + xy: 863, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 963, 185 + xy: 873, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 973, 185 + xy: 883, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 983, 185 + xy: 893, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 993, 185 + xy: 903, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1003, 189 + xy: 913, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1013, 269 + xy: 923, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 1013, 259 + xy: 933, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 1013, 249 + xy: 943, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 1013, 239 + xy: 953, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 1013, 229 + xy: 963, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 1013, 219 + xy: 973, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 1013, 209 + xy: 983, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 1013, 199 + xy: 993, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 1013, 189 + xy: 1003, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 1003, 179 + xy: 1003, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1013, 179 + xy: 1003, 254 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 207, 23 + xy: 1003, 244 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 217, 23 + xy: 1003, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 227, 23 + xy: 1003, 224 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 237, 23 + xy: 1003, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 247, 23 + xy: 1003, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 257, 23 + xy: 1003, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 267, 23 + xy: 943, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 277, 23 + xy: 953, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 287, 25 + xy: 963, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 205, 13 + xy: 973, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 205, 3 + xy: 983, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 215, 13 + xy: 993, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 215, 3 + xy: 1003, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 225, 13 + xy: 1013, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 225, 3 + xy: 1013, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 235, 13 + xy: 1013, 254 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 235, 3 + xy: 1013, 244 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 245, 13 + xy: 1013, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 245, 3 + xy: 1013, 224 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 255, 13 + xy: 1013, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 255, 3 + xy: 1013, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 265, 13 + xy: 1013, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 265, 3 + xy: 1013, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 275, 13 + xy: 207, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 275, 3 + xy: 217, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 297, 25 + xy: 227, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 523, 159 + xy: 237, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 533, 159 + xy: 247, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 543, 158 + xy: 257, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 553, 158 + xy: 267, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 409, 107 + xy: 277, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 409, 97 + xy: 287, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 409, 87 + xy: 205, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 682, 160 + xy: 205, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 863, 179 + xy: 215, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 873, 179 + xy: 215, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 883, 179 + xy: 225, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 893, 179 + xy: 225, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 903, 179 + xy: 235, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 913, 179 + xy: 235, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 923, 179 + xy: 245, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 933, 179 + xy: 245, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 943, 175 + xy: 255, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 953, 175 + xy: 255, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 963, 175 + xy: 265, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 973, 175 + xy: 265, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 983, 175 + xy: 275, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 993, 175 + xy: 275, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 1003, 169 + xy: 297, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 1013, 169 + xy: 537, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 287, 15 + xy: 547, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 297, 15 + xy: 557, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 285, 5 + xy: 567, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 295, 5 + xy: 577, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 301, 39 + xy: 587, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 311, 41 + xy: 597, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 321, 41 + xy: 607, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 331, 41 + xy: 617, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 341, 41 + xy: 627, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 351, 41 + xy: 637, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 361, 41 + xy: 647, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 371, 41 + xy: 657, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 449, 84 + xy: 811, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 459, 84 + xy: 821, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 469, 114 + xy: 841, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 469, 104 + xy: 811, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 416, 64 + xy: 851, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 426, 64 + xy: 851, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 436, 64 + xy: 851, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 446, 64 + xy: 851, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 466, 64 + xy: 873, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 415, 54 + xy: 883, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 425, 54 + xy: 893, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 435, 54 + xy: 903, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 495, 167 + xy: 509, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4829,147 +4829,147 @@ unit-icon-titan index: -1 item-biomatter rotate: false - xy: 953, 235 + xy: 893, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 963, 245 + xy: 903, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 973, 255 + xy: 913, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 983, 265 + xy: 923, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 923, 199 + xy: 933, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 933, 209 + xy: 943, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 943, 215 + xy: 953, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 953, 225 + xy: 963, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 963, 235 + xy: 973, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 973, 245 + xy: 903, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 983, 255 + xy: 913, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 993, 265 + xy: 923, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 933, 199 + xy: 933, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 943, 205 + xy: 943, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 953, 215 + xy: 953, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 993, 245 + xy: 963, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 71, 1 + xy: 85, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 85, 1 + xy: 99, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 99, 1 + xy: 937, 337 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 331, 51 + xy: 345, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 345, 51 + xy: 359, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5004,56 +5004,56 @@ omega-mech-leg index: -1 tau-mech rotate: false - xy: 526, 181 + xy: 540, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 540, 181 + xy: 481, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 481, 167 + xy: 495, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 317, 51 + xy: 331, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 1005, 325 + xy: 177, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 1005, 325 + xy: 177, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 191, 3 + xy: 723, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 191, 3 + xy: 723, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5300,14 +5300,14 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 523, 169 + xy: 537, 169 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 535, 169 + xy: 582, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5342,7 +5342,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 582, 192 + xy: 594, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5356,21 +5356,21 @@ icon-check index: -1 icon-crafting rotate: false - xy: 594, 192 + xy: 606, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 606, 192 + xy: 618, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 618, 192 + xy: 630, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5391,7 +5391,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 630, 192 + xy: 642, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5531,14 +5531,14 @@ icon-grid index: -1 icon-hold rotate: false - xy: 642, 192 + xy: 654, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 654, 192 + xy: 666, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5559,7 +5559,7 @@ icon-host index: -1 icon-info rotate: false - xy: 666, 192 + xy: 554, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5573,14 +5573,14 @@ icon-itch.io index: -1 icon-item rotate: false - xy: 554, 180 + xy: 549, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 993, 275 + xy: 953, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5601,7 +5601,7 @@ icon-link index: -1 icon-liquid rotate: false - xy: 1007, 313 + xy: 561, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5643,7 +5643,7 @@ icon-locked index: -1 icon-logic rotate: false - xy: 1007, 301 + xy: 566, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5657,7 +5657,7 @@ icon-map index: -1 icon-menu rotate: false - xy: 1007, 289 + xy: 578, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5671,28 +5671,28 @@ icon-menu-large index: -1 icon-missing rotate: false - xy: 570, 182 + xy: 573, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 582, 180 + xy: 590, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 943, 225 + xy: 963, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 594, 180 + xy: 585, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5720,7 +5720,7 @@ icon-pick index: -1 icon-play rotate: false - xy: 606, 180 + xy: 602, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5734,21 +5734,21 @@ icon-play-2 index: -1 icon-players rotate: false - xy: 618, 180 + xy: 597, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 630, 180 + xy: 614, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 642, 180 + xy: 609, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5839,7 +5839,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 654, 180 + xy: 626, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5860,14 +5860,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 666, 180 + xy: 621, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 547, 168 + xy: 638, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5909,7 +5909,7 @@ icon-undo index: -1 icon-units rotate: false - xy: 559, 168 + xy: 633, 168 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5923,7 +5923,7 @@ icon-unlocks index: -1 icon-weapon rotate: false - xy: 582, 168 + xy: 650, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6130,44 +6130,58 @@ window-empty orig: 27, 61 offset: 0, 0 index: -1 +alpha-drone + rotate: false + xy: 71, 1 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +unit-icon-alpha-drone + rotate: false + xy: 71, 1 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 dagger rotate: false - xy: 849, 296 + xy: 287, 35 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 287, 35 + xy: 303, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 287, 35 + xy: 303, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 303, 51 + xy: 317, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 drone rotate: false - xy: 373, 51 + xy: 387, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 373, 51 + xy: 387, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6188,14 +6202,14 @@ unit-icon-fabricator index: -1 interceptor rotate: false - xy: 177, 3 + xy: 191, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 177, 3 + xy: 191, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6244,56 +6258,56 @@ titan-leg index: -1 blaster-equip rotate: false - xy: 166, 66 + xy: 849, 310 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 849, 310 + xy: 849, 296 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 1003, 367 + xy: 1003, 353 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 1003, 353 + xy: 1005, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 177, 17 + xy: 191, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 500, 195 + xy: 514, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 542, 195 + xy: 556, 192 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 512, 181 + xy: 526, 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 e67892be82..ee22111639 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 857dd28f85..3487c9b66b 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -11,9 +11,12 @@ import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.Lightning; +import io.anuke.mindustry.entities.units.BaseUnit; +import io.anuke.mindustry.entities.units.types.AlphaDrone; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; +import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.ContentList; import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.world.Tile; @@ -24,8 +27,7 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; -import static io.anuke.mindustry.Vars.tilesize; -import static io.anuke.mindustry.Vars.world; +import static io.anuke.mindustry.Vars.*; public class Mechs implements ContentList{ public static Mech alpha, delta, tau, omega, dart, javelin, trident, halberd; @@ -37,6 +39,7 @@ public class Mechs implements ContentList{ public void load(){ alpha = new Mech("alpha-mech", false){ + int maxDrones = 3; { drillPower = 1; mineSpeed = 1.5f; @@ -44,14 +47,41 @@ public class Mechs implements ContentList{ boostSpeed = 0.85f; weapon = Weapons.blaster; maxSpeed = 4f; - altChargeAlpha = 0.03f; + altChargeAlpha = 0.04f; + trailColorTo = Color.valueOf("ffd37f"); } @Override public void updateAlt(Player player){ - if(player.altHeat >= 0.91f){ - + if(getDrones(player) >= maxDrones){ + player.altHeat = 0f; } + + if(player.altHeat >= 0.91f){ + if(!Net.client()) { + AlphaDrone drone = (AlphaDrone) UnitTypes.alphaDrone.create(player.getTeam()); + drone.leader = player; + drone.set(player.x, player.y); + drone.add(); + Effects.effect(UnitFx.unitLand, player); + } + player.altHeat = 0f; + } + } + + @Override + public void draw(Player player){ + if(getDrones(player) < maxDrones){ + player.hitTime = Math.max(player.hitTime, player.altHeat * Unit.hitDuration); + } + } + + int getDrones(Player player){ + int sum = 0; + for(BaseUnit unit : unitGroups[player.getTeam().ordinal()].all()){ + if(unit instanceof AlphaDrone && ((AlphaDrone) unit).leader == player) sum ++; + } + return sum; } }; diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index b0fbd30a6b..24a3c02fa2 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.content; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.ObjectSet; import io.anuke.mindustry.entities.units.UnitType; @@ -8,7 +9,7 @@ import io.anuke.mindustry.game.Content; import io.anuke.mindustry.type.ContentList; public class UnitTypes implements ContentList{ - public static UnitType drone, dagger, interceptor, monsoon, titan, fabricator; + public static UnitType drone, alphaDrone, dagger, interceptor, monsoon, titan, fabricator; @Override public void load(){ @@ -17,12 +18,29 @@ public class UnitTypes implements ContentList{ drag = 0.01f; speed = 0.2f; maxVelocity = 0.8f; - ammoCapacity = 0; range = 50f; healSpeed = 0.05f; health = 60; }}; + alphaDrone = new UnitType("alpha-drone", AlphaDrone.class, AlphaDrone::new){ + { + isFlying = true; + drag = 0.005f; + speed = 0.5f; + maxVelocity = 1.6f; + range = 40f; + health = 15; + weapon = Weapons.droneBlaster; + trailColor = Color.valueOf("ffd37f"); + } + + @Override + public boolean isHidden() { + return true; + } + }; + dagger = new UnitType("dagger", Dagger.class, Dagger::new){{ maxVelocity = 1.1f; speed = 0.2f; @@ -57,7 +75,6 @@ public class UnitTypes implements ContentList{ drag = 0.01f; isFlying = true; weapon = Weapons.bomber; - ammoCapacity = 50; }}; fabricator = new UnitType("fabricator", Fabricator.class, Fabricator::new){{ @@ -65,7 +82,6 @@ public class UnitTypes implements ContentList{ drag = 0.01f; speed = 0.2f; maxVelocity = 0.9f; - ammoCapacity = 0; range = 70f; itemCapacity = 70; health = 220; diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 64ea91c834..da2df2f64b 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.type.ContentList; import io.anuke.mindustry.type.Weapon; public class Weapons implements ContentList{ - public static Weapon blaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, flakgun, flamethrower, missiles; + public static Weapon blaster, droneBlaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, flakgun, flamethrower, missiles; @Override public void load(){ @@ -21,6 +21,15 @@ public class Weapons implements ContentList{ ammo = AmmoTypes.bulletMech; }}; + droneBlaster = new Weapon("blaster"){{ + length = 2f; + reload = 40f; + width = 1f; + roundrobin = true; + ejectEffect = ShootFx.shellEjectSmall; + ammo = AmmoTypes.bulletCopper; + }}; + healBlaster = new Weapon("heal-blaster"){{ length = 1.5f; reload = 30f; diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index 6dc76ac680..7a5c5a8d61 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java @@ -5,7 +5,6 @@ import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.traits.CarriableTrait; import io.anuke.mindustry.entities.traits.CarryTrait; -import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Trail; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.AmmoType; @@ -154,7 +153,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ @Override public void drawOver(){ - trail.draw(Palette.lightTrail, 5f); + trail.draw(type.trailColor, 5f); } @Override diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java index 735c53cbfb..455eb09227 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitType.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.entities.units; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.ObjectSet; @@ -43,12 +44,12 @@ public class UnitType implements UnlockableContent{ public float retreatPercent = 0.2f; public float armor = 0f; public float carryWeight = 1f; - public int ammoCapacity = 200; public int itemCapacity = 30; public ObjectSet toMine = ObjectSet.with(Items.lead, Items.copper); public float buildPower = 0.3f, minePower = 0.7f, healSpeed = 0.1f; public Weapon weapon = Weapons.blaster; public float weaponOffsetX, weaponOffsetY; + public Color trailColor = Color.valueOf("ffa665"); public TextureRegion iconRegion, legRegion, baseRegion, region; diff --git a/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java b/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java new file mode 100644 index 0000000000..98beed9e2d --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java @@ -0,0 +1,76 @@ +package io.anuke.mindustry.entities.units.types; + +import com.badlogic.gdx.math.Vector2; +import io.anuke.mindustry.entities.Predict; +import io.anuke.mindustry.entities.Unit; +import io.anuke.mindustry.entities.traits.TargetTrait; +import io.anuke.mindustry.entities.units.FlyingUnit; +import io.anuke.mindustry.entities.units.UnitCommand; +import io.anuke.mindustry.entities.units.UnitState; +import io.anuke.mindustry.type.AmmoType; +import io.anuke.ucore.util.Mathf; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + +public class AlphaDrone extends FlyingUnit { + static final float followDistance = 80f; + + public Unit leader; + public final UnitState attack = new UnitState() { + @Override + public void update() { + if(leader == null || leader.isDead()){ + damage(99999f); + return; + } + TargetTrait last = target; + target = leader; + if(last == null){ + circle(50f); + } + target = last; + if(distanceTo(leader) < followDistance){ + targetClosest(); + }else{ + target = null; + } + if(target != null){ + attack(50f); + + if((Mathf.angNear(angleTo(target), rotation, 15f) && distanceTo(target) < getWeapon().getAmmo().getRange())){ + AmmoType ammo = getWeapon().getAmmo(); + + Vector2 to = Predict.intercept(AlphaDrone.this, target, ammo.bullet.speed); + getWeapon().update(AlphaDrone.this, to.x, to.y); + } + } + } + }; + + @Override + public void onCommand(UnitCommand command){ + //nuh + } + + @Override + public void behavior(){ + //nope + } + + @Override + public UnitState getStartState() { + return attack; + } + + @Override + public void writeSave(DataOutput stream) throws IOException { + super.writeSave(stream); + } + + @Override + public void readSave(DataInput stream) throws IOException { + super.readSave(stream); + } +} diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index 43beedba5e..e9a4c10323 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -23,7 +23,7 @@ import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.*; public class Sectors{ - private static final int sectorImageSize = 16; + private static final int sectorImageSize = 32; private static final float sectorLargeChance = 0.23f; private GridMap grid = new GridMap<>(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java index 34935b5f23..b09de237ba 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java @@ -65,7 +65,7 @@ public class SectorsDialog extends FloatingDialog{ class SectorView extends Element{ float lastX, lastY; - float sectorSize = Unit.dp.scl(100f); + float sectorSize = Unit.dp.scl(32*4); float sectorPadding = Unit.dp.scl(14f); boolean clicked = false; float panX = -sectorPadding/2f, panY = -sectorSize/2f; diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 758de960ec..0d4a951687 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ