diff --git a/core/assets-raw/sprites/blocks/production/nuclearreactor.png b/core/assets-raw/sprites/blocks/production/nuclearreactor.png index 99b0a88bd1..63fbde275a 100644 Binary files a/core/assets-raw/sprites/blocks/production/nuclearreactor.png and b/core/assets-raw/sprites/blocks/production/nuclearreactor.png differ diff --git a/core/assets-raw/sprites/blocks/tech/battery.png b/core/assets-raw/sprites/blocks/tech/battery.png index 63334e534f..e457591b58 100644 Binary files a/core/assets-raw/sprites/blocks/tech/battery.png and b/core/assets-raw/sprites/blocks/tech/battery.png differ diff --git a/core/assets-raw/sprites/blocks/tech/batterylarge-base.png b/core/assets-raw/sprites/blocks/tech/batterylarge-base.png new file mode 100644 index 0000000000..7800659d35 Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/batterylarge-base.png differ diff --git a/core/assets-raw/sprites/blocks/tech/batterylarge.png b/core/assets-raw/sprites/blocks/tech/batterylarge.png index f1b81a8c2b..57f09a427c 100644 Binary files a/core/assets-raw/sprites/blocks/tech/batterylarge.png and b/core/assets-raw/sprites/blocks/tech/batterylarge.png differ diff --git a/core/assets-raw/sprites/blocks/tech/laser-base.png b/core/assets-raw/sprites/blocks/tech/laser-base.png new file mode 100644 index 0000000000..55a722af55 Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/laser-base.png differ diff --git a/core/assets-raw/sprites/blocks/tech/powerlaser.png b/core/assets-raw/sprites/blocks/tech/powerlaser.png index 38d9a851a3..43a5edfcc7 100644 Binary files a/core/assets-raw/sprites/blocks/tech/powerlaser.png and b/core/assets-raw/sprites/blocks/tech/powerlaser.png differ diff --git a/core/assets-raw/sprites/blocks/tech/powerlasercorner.png b/core/assets-raw/sprites/blocks/tech/powerlasercorner.png index 4c2173d4a8..7a606bbf37 100644 Binary files a/core/assets-raw/sprites/blocks/tech/powerlasercorner.png and b/core/assets-raw/sprites/blocks/tech/powerlasercorner.png differ diff --git a/core/assets-raw/sprites/blocks/tech/powerlaserrouter.png b/core/assets-raw/sprites/blocks/tech/powerlaserrouter.png index ea7c8122f3..9e525c33ec 100644 Binary files a/core/assets-raw/sprites/blocks/tech/powerlaserrouter.png and b/core/assets-raw/sprites/blocks/tech/powerlaserrouter.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index f9a2d37dcb..c7c20c674e 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,805 +13,805 @@ background index: -1 blackrock1 rotate: false - xy: 596, 215 + xy: 853, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 596, 205 + xy: 609, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 606, 211 + xy: 527, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 606, 201 + xy: 239, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 596, 195 + xy: 584, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 594, 185 + xy: 584, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 606, 191 + xy: 584, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 616, 211 + xy: 584, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 191, 44 + xy: 187, 12 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 636, 195 + xy: 614, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 646, 218 + xy: 614, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 646, 208 + xy: 614, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 689, 246 + xy: 803, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 699, 246 + xy: 817, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 709, 246 + xy: 827, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 657, 236 + xy: 594, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 207, 58 + xy: 965, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 656, 217 + xy: 629, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 656, 207 + xy: 837, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 667, 226 + xy: 847, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 677, 226 + xy: 637, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 687, 226 + xy: 647, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 205, 44 + xy: 979, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 697, 226 + xy: 857, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 707, 226 + xy: 639, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 656, 197 + xy: 649, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 965, 437 + xy: 993, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 666, 216 + xy: 659, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 666, 206 + xy: 669, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 676, 216 + xy: 679, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 676, 216 + xy: 679, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 676, 206 + xy: 689, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 676, 206 + xy: 689, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 686, 216 + xy: 699, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 686, 206 + xy: 709, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 696, 216 + xy: 719, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 568, 102 + xy: 649, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 979, 437 + xy: 580, 118 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 578, 94 + xy: 689, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 588, 106 + xy: 699, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 231, 55 + xy: 578, 164 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 656, 187 + xy: 937, 424 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 666, 186 + xy: 947, 424 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 706, 186 + xy: 689, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 716, 186 + xy: 699, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 624, 175 + xy: 709, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 634, 175 + xy: 719, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 193, 34 + xy: 654, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 193, 24 + xy: 654, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 245, 55 + xy: 579, 150 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 837, 430 + xy: 674, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 847, 431 + xy: 684, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 656, 177 + xy: 694, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 666, 176 + xy: 674, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 676, 176 + xy: 684, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 686, 176 + xy: 694, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 696, 176 + xy: 704, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 706, 176 + xy: 684, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 273, 55 + xy: 777, 364 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 684, 166 + xy: 714, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 694, 166 + xy: 714, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 704, 166 + xy: 654, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 714, 166 + xy: 664, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 213, 30 + xy: 674, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 213, 20 + xy: 684, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 315, 55 + xy: 237, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 233, 33 + xy: 724, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 233, 23 + xy: 724, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 243, 33 + xy: 724, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 273, 33 + xy: 927, 414 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 263, 13 + xy: 937, 414 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 273, 23 + xy: 947, 414 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 293, 23 + xy: 917, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 329, 55 + xy: 223, 27 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 626, 205 + xy: 594, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduitliquid rotate: false - xy: 604, 171 + xy: 679, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 679, 246 + xy: 793, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 560, 160 + xy: 659, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemyspawn rotate: false - xy: 697, 236 + xy: 624, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 598, 96 + xy: 634, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 579, 154 + xy: 793, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 alloysmelter rotate: false - xy: 221, 62 + xy: 187, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coaldrill rotate: false - xy: 646, 198 + xy: 619, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 604, 181 + xy: 614, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 614, 181 + xy: 624, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 590, 166 + xy: 624, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 591, 156 + xy: 624, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cultivator rotate: false - xy: 659, 292 + xy: 677, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 707, 236 + xy: 593, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 696, 206 + xy: 867, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 411, 87 + xy: 429, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 568, 92 + xy: 659, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 364, 105 + xy: 390, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 390, 105 + xy: 416, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 416, 105 + xy: 442, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 588, 96 + xy: 709, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 598, 106 + xy: 719, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 1007, 437 + xy: 634, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 636, 185 + xy: 947, 434 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 646, 188 + xy: 927, 424 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 501, 87 + xy: 519, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 686, 186 + xy: 669, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 696, 186 + xy: 679, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 857, 431 + xy: 664, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 349, 47 + xy: 674, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 646, 178 + xy: 684, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 716, 176 + xy: 694, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 213, 10 + xy: 694, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 223, 30 + xy: 704, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 223, 10 + xy: 724, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 233, 13 + xy: 724, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 243, 23 + xy: 867, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 283, 33 + xy: 867, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 273, 13 + xy: 877, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery rotate: false - xy: 221, 52 + xy: 197, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -823,170 +823,184 @@ batterylarge orig: 24, 24 offset: 0, 0 index: -1 +batterylarge-base + rotate: false + xy: 260, 105 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 conduit - rotate: false - xy: 591, 136 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conduitbottom - rotate: false - xy: 591, 126 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conduittop - rotate: false - xy: 614, 171 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conduittunnel - rotate: false - xy: 586, 116 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conveyor - rotate: false - xy: 596, 116 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conveyormove rotate: false xy: 659, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -conveyortunnel +conduitbottom rotate: false xy: 669, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +conduittop + rotate: false + xy: 689, 246 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +conduittunnel + rotate: false + xy: 699, 246 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +conveyor + rotate: false + xy: 709, 246 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +conveyormove + rotate: false + xy: 719, 246 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +conveyortunnel + rotate: false + xy: 1007, 437 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 core rotate: false - xy: 312, 105 + xy: 338, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction rotate: false - xy: 716, 196 + xy: 847, 421 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +laser-base + rotate: false + xy: 639, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 567, 82 + xy: 669, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 578, 104 + xy: 679, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 483, 87 + xy: 501, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 763, 355 + xy: 634, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 183, 28 + xy: 634, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 183, 18 + xy: 634, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 183, 8 + xy: 644, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 793, 426 + xy: 644, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 803, 426 + xy: 644, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 817, 430 + xy: 644, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit rotate: false - xy: 827, 430 + xy: 644, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduitbottom rotate: false - xy: 339, 45 + xy: 927, 434 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduittop rotate: false - xy: 626, 185 + xy: 937, 434 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 676, 186 + xy: 659, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 193, 14 + xy: 654, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1000,70 +1014,70 @@ shieldprojector index: -1 sortedunloader rotate: false - xy: 624, 165 + xy: 704, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 634, 165 + xy: 714, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 644, 168 + xy: 694, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 654, 167 + xy: 704, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 664, 166 + xy: 714, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 442, 105 + xy: 468, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 468, 105 + xy: 494, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 263, 23 + xy: 857, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 537, 131 + xy: 520, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 283, 23 + xy: 887, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1077,7 +1091,7 @@ weaponfactory index: -1 block-1 rotate: false - xy: 626, 215 + xy: 594, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1091,7 +1105,7 @@ block-2 index: -1 block-3 rotate: false - xy: 260, 105 + xy: 286, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1105,189 +1119,189 @@ chainturret index: -1 chainturret-icon rotate: false - xy: 1013, 471 + xy: 563, 132 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 1013, 447 + xy: 1013, 459 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 flakturret rotate: false - xy: 153, 8 + xy: 641, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 343, 57 + xy: 1013, 447 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 338, 105 + xy: 364, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 609, 233 + xy: 575, 132 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 303, 43 + xy: 225, 15 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 429, 87 + xy: 447, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 447, 87 + xy: 465, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 465, 87 + xy: 483, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasmaturret rotate: false - xy: 315, 43 + xy: 237, 19 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 327, 43 + xy: 227, 3 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 171, 2 + xy: 781, 432 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 579, 142 + xy: 805, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 579, 130 + xy: 817, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 494, 105 + xy: 537, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titancannon-icon rotate: false - xy: 584, 212 + xy: 829, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 turret rotate: false - xy: 584, 200 + xy: 841, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 compositewall rotate: false - xy: 591, 146 + xy: 624, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 667, 236 + xy: 592, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 538, 113 + xy: 546, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 677, 292 + xy: 153, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 677, 236 + xy: 604, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 687, 236 + xy: 614, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 153, 26 + xy: 153, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 706, 216 + xy: 877, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 674, 166 + xy: 704, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1301,21 +1315,21 @@ steelwall-large index: -1 stonewall rotate: false - xy: 223, 20 + xy: 714, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 253, 33 + xy: 877, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 243, 13 + xy: 887, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1336,28 +1350,28 @@ blank index: -1 bullet rotate: false - xy: 626, 195 + xy: 604, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 594, 176 + xy: 604, 182 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 657, 227 + xy: 593, 146 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 laser rotate: false - xy: 727, 290 + xy: 533, 73 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1378,28 +1392,28 @@ laserfull index: -1 shell rotate: false - xy: 203, 34 + xy: 664, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 193, 4 + xy: 654, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 203, 4 + xy: 664, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 253, 23 + xy: 897, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1476,14 +1490,14 @@ flamerenemy-t1 index: -1 flamerenemy-t2 rotate: false - xy: 563, 144 + xy: 517, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t3 rotate: false - xy: 563, 128 + xy: 563, 144 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1532,91 +1546,91 @@ healerenemy-t3 index: -1 mortarenemy-t1 rotate: false - xy: 519, 81 + xy: 747, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t2 rotate: false - xy: 535, 81 + xy: 191, 58 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t3 rotate: false - xy: 556, 112 + xy: 191, 42 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t1 rotate: false - xy: 552, 96 + xy: 175, 34 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t2 rotate: false - xy: 551, 80 + xy: 171, 18 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t3 rotate: false - xy: 747, 361 + xy: 207, 56 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t1 rotate: false - xy: 191, 58 + xy: 207, 40 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 targetenemy-t1 rotate: false - xy: 191, 58 + xy: 207, 40 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t2 rotate: false - xy: 287, 55 + xy: 223, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standardenemy-t3 rotate: false - xy: 301, 55 + xy: 223, 41 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tankenemy-t1 rotate: false - xy: 517, 65 + xy: 171, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t2 rotate: false - xy: 533, 65 + xy: 191, 26 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t3 rotate: false - xy: 549, 64 + xy: 207, 24 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1644,98 +1658,98 @@ titanenemy-t3 index: -1 item-biomatter rotate: false - xy: 706, 206 + xy: 887, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 666, 196 + xy: 897, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 676, 196 + xy: 907, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 686, 196 + xy: 917, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 696, 196 + xy: 867, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 706, 196 + xy: 877, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 719, 246 + xy: 887, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 717, 236 + xy: 897, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 717, 226 + xy: 907, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 716, 216 + xy: 917, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 716, 206 + xy: 857, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-standard rotate: false - xy: 993, 437 + xy: 609, 231 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-standard-icon rotate: false - xy: 572, 114 + xy: 623, 235 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ship-standard rotate: false - xy: 259, 55 + xy: 763, 363 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1840,7 +1854,7 @@ button-map-over index: -1 button-select rotate: false - xy: 286, 105 + xy: 312, 105 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -1876,7 +1890,7 @@ check-over index: -1 clear rotate: false - xy: 1013, 459 + xy: 1013, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1890,7 +1904,7 @@ cursor index: -1 controller-cursor rotate: false - xy: 520, 113 + xy: 560, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1925,7 +1939,7 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 621, 237 + xy: 237, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1939,35 +1953,35 @@ icon-arrow index: -1 icon-arrow-down rotate: false - xy: 609, 221 + xy: 251, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 621, 225 + xy: 237, 31 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 633, 237 + xy: 263, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 633, 225 + xy: 275, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 641, 270 + xy: 659, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1988,7 +2002,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 645, 240 + xy: 287, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2023,21 +2037,21 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 645, 228 + xy: 299, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 578, 166 + xy: 311, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 763, 365 + xy: 323, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2051,7 +2065,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 775, 366 + xy: 335, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2079,378 +2093,378 @@ icon-editor index: -1 icon-file-text rotate: false - xy: 869, 463 + xy: 537, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 659, 274 + xy: 641, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 885, 463 + xy: 564, 116 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 901, 463 + xy: 869, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 917, 463 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 641, 252 + xy: 659, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 175, 38 + xy: 347, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 171, 26 + xy: 359, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 869, 447 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 885, 447 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 171, 14 + xy: 371, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-line rotate: false - xy: 659, 256 + xy: 677, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 781, 432 + xy: 383, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 901, 447 + xy: 869, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 677, 274 + xy: 677, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 677, 256 + xy: 213, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 213, 72 + xy: 231, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 793, 436 + xy: 395, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 805, 436 + xy: 407, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 817, 440 + xy: 419, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 829, 440 + xy: 431, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 231, 87 + xy: 249, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 917, 447 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 249, 87 + xy: 267, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 841, 441 + xy: 443, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 933, 460 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 853, 441 + xy: 455, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 219, 40 + xy: 467, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 231, 43 + xy: 479, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 949, 460 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 267, 87 + xy: 285, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 933, 444 + xy: 933, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 949, 444 + xy: 949, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 285, 87 + xy: 303, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 965, 467 + xy: 933, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 965, 451 + xy: 949, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 981, 467 + xy: 965, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 981, 451 + xy: 965, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 997, 467 + xy: 981, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 303, 87 + xy: 321, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 321, 87 + xy: 339, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 243, 43 + xy: 491, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 339, 87 + xy: 357, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 997, 451 + xy: 981, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 255, 43 + xy: 503, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 267, 43 + xy: 515, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 175, 50 + xy: 997, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 357, 87 + xy: 375, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 520, 97 + xy: 997, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 375, 87 + xy: 393, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 279, 43 + xy: 201, 12 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 291, 43 + xy: 213, 12 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 393, 87 + xy: 411, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 536, 97 + xy: 175, 50 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2528,7 +2542,7 @@ selection index: -1 slider rotate: false - xy: 600, 166 + xy: 171, 34 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2556,7 +2570,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 183, 5 + xy: 584, 181 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2600,7 +2614,7 @@ textfield-over index: -1 white rotate: false - xy: 183, 69 + xy: 654, 217 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -2623,84 +2637,84 @@ window-empty index: -1 beam rotate: false - xy: 584, 190 + xy: 207, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 584, 180 + xy: 217, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 616, 201 + xy: 594, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 616, 191 + xy: 594, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 636, 215 + xy: 604, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 636, 205 + xy: 604, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 203, 24 + xy: 664, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 203, 14 + xy: 674, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 263, 33 + xy: 907, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 253, 13 + xy: 917, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 293, 33 + xy: 897, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 283, 13 + xy: 907, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 1dfa3b32d3..bfdcb510d8 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index b37417968d..0986a1bf92 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sat Mar 10 20:25:11 EST 2018 +#Sat Mar 10 23:26:21 EST 2018 version=release -androidBuildCode=439 +androidBuildCode=441 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index 933cb23f8d..6254d9f84f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.ui.fragments; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Colors; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.math.Interpolation; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.core.GameState.State; @@ -114,7 +115,17 @@ public class BlocksFragment implements Fragment{ int i = 0; for (Recipe r : recipes) { - ImageButton image = new ImageButton(r.result.getIcon(), "select"); + ImageButton image = new ImageButton(new TextureRegion(), "select"); + + TextureRegion[] regions = r.result.getIcon(true); + Stack istack = new Stack(); + for(TextureRegion region : regions){ + istack.add(new Image(region)); + } + + image.getImageCell().setActor(istack).size(size); + image.addChild(istack); + image.getImage().remove(); image.addListener(new ClickListener(){ @Override @@ -152,14 +163,13 @@ public class BlocksFragment implements Fragment{ }); table.add(image).size(size + 8); - image.getImageCell().size(size); image.update(() -> { boolean canPlace = !control.tutorial().active() || control.tutorial().canPlace(); boolean has = (state.inventory.hasItems(r.requirements)) && canPlace; image.setChecked(input.recipe == r); image.setTouchable(canPlace ? Touchable.enabled : Touchable.disabled); - image.getImage().setColor(has ? Color.WHITE : Hue.lightness(0.33f)); + for(Element e : istack.getChildren()) e.setColor(has ? Color.WHITE : Hue.lightness(0.33f)); }); if (i % rows == rows - 1) @@ -248,8 +258,14 @@ public class BlocksFragment implements Fragment{ desctable.add(header).left(); desctable.row(); + + TextureRegion[] regions = recipe.result.getIcon(true); + + Stack istack = new Stack(); + + for(TextureRegion region : regions) istack.add(new Image(region)); - header.addImage(recipe.result.getIcon()).size(8*5).padTop(4); + header.add(istack).size(8*5).padTop(4); Label nameLabel = new Label(recipe.result.formalName); nameLabel.setWrap(true); header.add(nameLabel).padLeft(2).width(120f); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index d8f4f724ec..c88d97007a 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -177,16 +177,20 @@ public class Block extends BaseBlock { Effects.sound(explosionSound, x, y); } - public TextureRegion getIcon(){ + public TextureRegion[] getIcon(boolean compact){ if(Draw.hasRegion(name + "-icon")){ - return Draw.region(name + "-icon"); + return new TextureRegion[]{Draw.region(name + "-icon")}; }else{ - TextureRegion region = new TextureRegion(Draw.region(name)); - region.setRegionWidth(8); - region.setRegionHeight(8); - return region; + return new TextureRegion[]{compact ? iconRegion(name) : Draw.region(name)}; } } + + protected TextureRegion iconRegion(String name){ + TextureRegion region = new TextureRegion(Draw.region(name)); + region.setRegionWidth(8); + region.setRegionHeight(8); + return region; + } public TileEntity getEntity(){ return new TileEntity(); diff --git a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java index 79930c13ff..240a6fd024 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java @@ -56,8 +56,11 @@ public abstract class BaseBlock { } public void tryMoveLiquid(Tile tile, Tile next){ + if(next == null) return; - if(next != null && next.block().hasLiquids && tile.entity.liquid.amount > 0.01f){ + next = next.target(); + + if(next.block().hasLiquids && tile.entity.liquid.amount > 0.01f){ float flow = Math.min(next.block().liquidCapacity - next.entity.liquid.amount - 0.001f, Math.min(tile.entity.liquid.amount/liquidFlowFactor * Math.max(Timers.delta(), 1f), tile.entity.liquid.amount)); diff --git a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java index 4da97a11ba..6761df2f33 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java @@ -86,6 +86,7 @@ public class DistributionBlocks{ laserDirections = 1; size = 3; powerCapacity = 2000f; + base = "batterylarge-base"; }}, teleporter = new Teleporter("teleporter"){{ }}, diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidRouter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidRouter.java index 2fe20f4cfc..6976cd24a1 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidRouter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidRouter.java @@ -12,6 +12,7 @@ public class LiquidRouter extends LiquidBlock{ rotate = false; solid = true; liquidFlowFactor = 2f; + hasInventory = false; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaser.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaser.java index dcacac48a2..a8f04a05cb 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaser.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaser.java @@ -1,12 +1,14 @@ package io.anuke.mindustry.world.blocks.types.distribution; import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.generation.Generator; import io.anuke.ucore.graphics.Draw; public class PowerLaser extends Generator{ public Color color = Color.valueOf("e54135"); + public String base = null; public PowerLaser(String name) { super(name); @@ -18,8 +20,16 @@ public class PowerLaser extends Generator{ hasInventory = false; } + @Override + public TextureRegion[] getIcon(boolean compact){ + String bname = base == null ? "laser-base" : base; + return new TextureRegion[]{compact ? iconRegion(bname) : Draw.region(bname), + compact ? iconRegion(name) : Draw.region(name)}; + } + @Override public void draw(Tile tile) { + Draw.rect(base == null ? "laser-base" : base, tile.drawx(), tile.drawy()); Draw.rect(name(), tile.drawx(), tile.drawy(), tile.getRotation() * 90 - 90); }