diff --git a/core/assets-raw/sprites/blocks/tech/battery.png b/core/assets-raw/sprites/blocks/tech/battery.png new file mode 100644 index 0000000000..63334e534f Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/battery.png differ diff --git a/core/assets-raw/sprites/blocks/tech/batterylarge.png b/core/assets-raw/sprites/blocks/tech/batterylarge.png new file mode 100644 index 0000000000..f1b81a8c2b Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/batterylarge.png differ diff --git a/core/assets-raw/sprites/blocks/tech/powerlaser.png b/core/assets-raw/sprites/blocks/tech/powerlaser.png index a20be88c15..38d9a851a3 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 52c2858c7d..4c2173d4a8 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/teleporter-top.png b/core/assets-raw/sprites/blocks/tech/teleporter-top.png index 5e624107a8..5c65258375 100644 Binary files a/core/assets-raw/sprites/blocks/tech/teleporter-top.png and b/core/assets-raw/sprites/blocks/tech/teleporter-top.png differ diff --git a/core/assets-raw/sprites/blocks/tech/teleporter.png b/core/assets-raw/sprites/blocks/tech/teleporter.png index 74f3d68a16..ec2f0b3f14 100644 Binary files a/core/assets-raw/sprites/blocks/tech/teleporter.png and b/core/assets-raw/sprites/blocks/tech/teleporter.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d925074879..f9a2d37dcb 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,1057 +13,1071 @@ background index: -1 blackrock1 rotate: false - xy: 713, 272 + xy: 596, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 637, 234 + xy: 596, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 647, 234 + xy: 606, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 657, 234 + xy: 606, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 667, 234 + xy: 596, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 677, 234 + xy: 594, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 584, 214 + xy: 606, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 584, 204 + xy: 616, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 171, 20 + xy: 191, 44 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 580, 165 + xy: 636, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 590, 165 + xy: 646, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 580, 155 + xy: 646, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 723, 272 + xy: 689, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 713, 262 + xy: 699, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 723, 262 + xy: 709, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 600, 165 + xy: 657, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 171, 6 + xy: 207, 58 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 857, 431 + xy: 656, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 620, 169 + xy: 656, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 620, 159 + xy: 667, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 610, 149 + xy: 677, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 620, 149 + xy: 687, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 191, 28 + xy: 205, 44 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 633, 224 + xy: 697, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 643, 224 + xy: 707, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 653, 224 + xy: 656, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 205, 26 + xy: 965, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 663, 224 + xy: 666, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 673, 224 + xy: 666, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 683, 224 + xy: 676, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 683, 224 + xy: 676, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 687, 234 + xy: 676, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 687, 234 + xy: 676, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 693, 224 + xy: 686, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 556, 125 + xy: 686, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 556, 115 + xy: 696, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 251, 33 + xy: 568, 102 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 185, 14 + xy: 979, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 293, 47 + xy: 578, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 303, 47 + xy: 588, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 993, 437 + xy: 231, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 785, 416 + xy: 656, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 785, 406 + xy: 666, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 785, 386 + xy: 706, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 795, 396 + xy: 716, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 795, 386 + xy: 624, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 805, 416 + xy: 634, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 805, 406 + xy: 193, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 805, 396 + xy: 193, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 609, 231 + xy: 245, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 825, 420 + xy: 837, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 815, 400 + xy: 847, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 825, 400 + xy: 656, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 835, 410 + xy: 666, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 815, 380 + xy: 676, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 825, 390 + xy: 686, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 835, 400 + xy: 696, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 825, 380 + xy: 706, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 223, 55 + xy: 273, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 701, 248 + xy: 684, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 711, 242 + xy: 694, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 721, 242 + xy: 704, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 867, 437 + xy: 714, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 877, 437 + xy: 213, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 887, 437 + xy: 213, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 237, 41 + xy: 315, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 897, 427 + xy: 233, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 907, 427 + xy: 233, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 917, 427 + xy: 243, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 733, 274 + xy: 273, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 733, 264 + xy: 263, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 261, 33 + xy: 273, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 323, 37 + xy: 293, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 251, 55 + xy: 329, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 594, 205 + xy: 626, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduitliquid rotate: false - xy: 614, 179 + xy: 604, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 723, 282 + xy: 679, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 213, 90 + xy: 560, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemyspawn rotate: false - xy: 837, 430 + xy: 697, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 333, 47 + xy: 598, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 689, 268 + xy: 579, 154 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 alloysmelter rotate: false - xy: 713, 282 + xy: 221, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coaldrill rotate: false - xy: 590, 155 + xy: 646, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 604, 209 + xy: 604, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 604, 199 + xy: 614, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 604, 189 + xy: 590, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 604, 179 + xy: 591, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cultivator rotate: false - xy: 468, 113 + xy: 659, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 847, 431 + xy: 707, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 724, 352 + xy: 696, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 231, 69 + xy: 411, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 263, 45 + xy: 568, 92 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 338, 105 + xy: 364, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 364, 105 + xy: 390, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 390, 105 + xy: 416, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 313, 47 + xy: 588, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 323, 47 + xy: 598, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 343, 47 + xy: 1007, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 453, 47 + xy: 636, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 221, 4 + xy: 646, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 321, 69 + xy: 501, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 785, 396 + xy: 686, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 795, 406 + xy: 696, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 825, 410 + xy: 857, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 835, 420 + xy: 349, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 815, 390 + xy: 646, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 835, 390 + xy: 716, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 897, 437 + xy: 213, 10 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 907, 437 + xy: 223, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 887, 427 + xy: 223, 10 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 927, 434 + xy: 233, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 937, 434 + xy: 243, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 273, 37 + xy: 283, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 283, 37 + xy: 273, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +battery + rotate: false + xy: 221, 52 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +batterylarge + rotate: false + xy: 234, 105 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 conduit rotate: false - xy: 614, 199 + xy: 591, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduitbottom rotate: false - xy: 614, 189 + xy: 591, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittop rotate: false - xy: 1007, 437 + xy: 614, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 793, 426 + xy: 586, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 803, 426 + xy: 596, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 817, 430 + xy: 659, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 827, 430 + xy: 669, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core rotate: false - xy: 286, 105 + xy: 312, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction rotate: false - xy: 740, 312 + xy: 716, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 273, 47 + xy: 567, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 283, 47 + xy: 578, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 303, 69 + xy: 483, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 353, 47 + xy: 763, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 363, 47 + xy: 183, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 373, 47 + xy: 183, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 383, 47 + xy: 183, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 393, 47 + xy: 793, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 403, 47 + xy: 803, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 413, 47 + xy: 817, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit rotate: false - xy: 423, 47 + xy: 827, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduitbottom rotate: false - xy: 433, 47 + xy: 339, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduittop rotate: false - xy: 443, 47 + xy: 626, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 795, 416 + xy: 676, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 785, 376 + xy: 193, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 339, 69 + xy: 231, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 835, 380 + xy: 624, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 815, 370 + xy: 634, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 825, 370 + xy: 644, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 835, 370 + xy: 654, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 711, 252 + xy: 664, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 867, 427 - size: 8, 8 - orig: 8, 8 + xy: 442, 105 + size: 24, 24 + orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 877, 427 - size: 8, 8 - orig: 8, 8 + xy: 468, 105 + size: 24, 24 + orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 733, 284 + xy: 263, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 442, 105 + xy: 537, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 293, 37 + xy: 283, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 447, 69 + xy: 339, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 594, 215 + xy: 626, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1077,14 +1091,14 @@ block-2 index: -1 block-3 rotate: false - xy: 234, 105 + xy: 260, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 chainturret rotate: false - xy: 727, 365 + xy: 213, 90 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1105,210 +1119,210 @@ doubleturret index: -1 flakturret rotate: false - xy: 504, 113 + xy: 153, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 185, 2 + xy: 343, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 312, 105 + xy: 338, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 251, 43 + xy: 609, 233 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 609, 219 + xy: 303, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 249, 69 + xy: 429, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 267, 69 + xy: 447, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 285, 69 + xy: 465, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasmaturret rotate: false - xy: 691, 292 + xy: 315, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 689, 280 + xy: 327, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 703, 292 + xy: 171, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 701, 280 + xy: 579, 142 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 715, 292 + xy: 579, 130 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 416, 105 + xy: 494, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titancannon-icon rotate: false - xy: 689, 256 + xy: 584, 212 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 turret rotate: false - xy: 701, 268 + xy: 584, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 compositewall rotate: false - xy: 614, 209 + xy: 591, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 600, 155 + xy: 667, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 655, 292 + xy: 538, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 486, 113 + xy: 677, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 610, 169 + xy: 677, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 610, 159 + xy: 687, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 673, 292 + xy: 153, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 724, 342 + xy: 706, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 721, 252 + xy: 674, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 357, 69 + xy: 249, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 917, 437 + xy: 223, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 947, 434 + xy: 253, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 927, 424 + xy: 243, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 429, 69 + xy: 321, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1322,154 +1336,154 @@ blank index: -1 bullet rotate: false - xy: 594, 195 + xy: 626, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 584, 175 + xy: 594, 176 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 623, 226 + xy: 657, 227 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 laser rotate: false - xy: 219, 26 + xy: 727, 290 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laserend rotate: false - xy: 560, 158 + xy: 589, 225 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 589, 225 + xy: 727, 363 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shell rotate: false - xy: 805, 386 + xy: 203, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 815, 420 + xy: 193, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 815, 410 + xy: 203, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 937, 424 + xy: 253, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blastenemy-t1 rotate: false - xy: 540, 119 + xy: 357, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t2 rotate: false - xy: 641, 276 + xy: 373, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t3 rotate: false - xy: 641, 260 + xy: 389, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t1 rotate: false - xy: 657, 276 + xy: 405, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t2 rotate: false - xy: 657, 260 + xy: 421, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t3 rotate: false - xy: 673, 276 + xy: 437, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t1 rotate: false - xy: 673, 260 + xy: 453, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t2 rotate: false - xy: 641, 244 + xy: 469, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t3 rotate: false - xy: 657, 244 + xy: 485, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t1 rotate: false - xy: 673, 244 + xy: 501, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t2 rotate: false - xy: 698, 304 + xy: 563, 144 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t3 rotate: false - xy: 753, 409 + xy: 563, 128 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1490,238 +1504,238 @@ fortressenemy-t2 index: -1 fortressenemy-t3 rotate: false - xy: 537, 135 + xy: 637, 288 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 healerenemy-t1 rotate: false - xy: 753, 393 + xy: 698, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t2 rotate: false - xy: 769, 410 + xy: 695, 288 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t3 rotate: false - xy: 769, 394 + xy: 695, 272 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t1 rotate: false - xy: 497, 65 + xy: 519, 81 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t2 rotate: false - xy: 513, 65 + xy: 535, 81 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t3 rotate: false - xy: 191, 58 + xy: 556, 112 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t1 rotate: false - xy: 532, 97 + xy: 552, 96 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t2 rotate: false - xy: 529, 81 + xy: 551, 80 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t3 rotate: false - xy: 529, 65 + xy: 747, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t1 rotate: false - xy: 207, 56 + xy: 191, 58 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 targetenemy-t1 rotate: false - xy: 207, 56 + xy: 191, 58 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t2 rotate: false - xy: 223, 41 + xy: 287, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standardenemy-t3 rotate: false - xy: 237, 55 + xy: 301, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tankenemy-t1 rotate: false - xy: 191, 42 + xy: 517, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t2 rotate: false - xy: 175, 34 + xy: 533, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t3 rotate: false - xy: 207, 40 + xy: 549, 64 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titanenemy-t1 rotate: false - xy: 375, 69 + xy: 267, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t2 rotate: false - xy: 393, 69 + xy: 285, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t3 rotate: false - xy: 411, 69 + xy: 303, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 724, 332 + xy: 706, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 724, 322 + xy: 666, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 545, 87 + xy: 676, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 545, 77 + xy: 686, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 545, 67 + xy: 696, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 727, 294 + xy: 706, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 734, 352 + xy: 719, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 734, 342 + xy: 717, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 734, 332 + xy: 717, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 734, 322 + xy: 716, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 730, 312 + xy: 716, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-standard rotate: false - xy: 965, 437 + xy: 993, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-standard-icon rotate: false - xy: 979, 437 + xy: 572, 114 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ship-standard rotate: false - xy: 623, 235 + xy: 259, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1826,7 +1840,7 @@ button-map-over index: -1 button-select rotate: false - xy: 260, 105 + xy: 286, 105 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -1869,35 +1883,35 @@ clear index: -1 cursor rotate: false - xy: 185, 28 + xy: 747, 377 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 controller-cursor rotate: false - xy: 637, 292 + xy: 520, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 714, 304 + xy: 695, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 753, 377 + xy: 753, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 769, 378 + xy: 753, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1911,77 +1925,77 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 265, 57 + xy: 621, 237 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 869, 463 + xy: 769, 410 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 277, 57 + xy: 609, 221 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 289, 57 + xy: 621, 225 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 301, 57 + xy: 633, 237 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 313, 57 + xy: 633, 225 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 153, 26 + xy: 641, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 885, 463 + xy: 769, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 901, 463 + xy: 714, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 325, 57 + xy: 645, 240 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 917, 463 + xy: 711, 288 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2009,434 +2023,434 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 337, 57 + xy: 645, 228 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 349, 57 + xy: 578, 166 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 361, 57 + xy: 763, 365 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 869, 447 + xy: 711, 272 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 373, 57 + xy: 775, 366 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 885, 447 + xy: 711, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 901, 447 + xy: 753, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 917, 447 + xy: 769, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 933, 460 + xy: 869, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 153, 8 + xy: 659, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 949, 460 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 933, 444 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 949, 444 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 213, 72 + xy: 641, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 385, 57 + xy: 175, 38 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 397, 57 + xy: 171, 26 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 965, 467 + xy: 869, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 965, 451 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 409, 57 + xy: 171, 14 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-line rotate: false - xy: 231, 87 + xy: 659, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 421, 57 + xy: 781, 432 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 981, 467 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 249, 87 + xy: 677, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 267, 87 + xy: 677, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 285, 87 + xy: 213, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 433, 57 + xy: 793, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 445, 57 + xy: 805, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 199, 14 + xy: 817, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 197, 2 + xy: 829, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 303, 87 + xy: 231, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 981, 451 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 321, 87 + xy: 249, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 211, 14 + xy: 841, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 997, 467 + xy: 933, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 209, 2 + xy: 853, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 781, 432 + xy: 219, 40 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 793, 436 + xy: 231, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 997, 451 + xy: 949, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 339, 87 + xy: 267, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 175, 50 + xy: 933, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 468, 97 + xy: 949, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 357, 87 + xy: 285, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 484, 97 + xy: 965, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 500, 97 + xy: 965, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 516, 97 + xy: 981, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 465, 81 + xy: 981, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 481, 81 + xy: 997, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 375, 87 + xy: 303, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 393, 87 + xy: 321, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 805, 436 + xy: 243, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 411, 87 + xy: 339, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 497, 81 + xy: 997, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 817, 440 + xy: 255, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 829, 440 + xy: 267, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 513, 81 + xy: 175, 50 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 429, 87 + xy: 357, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 465, 65 + xy: 520, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 447, 87 + xy: 375, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 841, 441 + xy: 279, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 853, 441 + xy: 291, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 522, 113 + xy: 393, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 481, 65 + xy: 536, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2507,14 +2521,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 537, 132 + xy: 560, 157 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 171, 34 + xy: 600, 166 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2542,7 +2556,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 727, 362 + xy: 183, 5 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2586,7 +2600,7 @@ textfield-over index: -1 white rotate: false - xy: 604, 220 + xy: 183, 69 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -2609,84 +2623,84 @@ window-empty index: -1 beam rotate: false - xy: 689, 246 + xy: 584, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 701, 258 + xy: 584, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 584, 194 + xy: 616, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 584, 184 + xy: 616, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 594, 185 + xy: 636, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 594, 175 + xy: 636, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 795, 376 + xy: 203, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 805, 376 + xy: 203, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 947, 424 + xy: 263, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 545, 57 + xy: 253, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 303, 37 + xy: 293, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 313, 37 + xy: 283, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index a1b37d5039..1dfa3b32d3 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 5dc688e05d..b37417968d 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sat Mar 10 15:19:13 EST 2018 +#Sat Mar 10 20:25:11 EST 2018 version=release -androidBuildCode=431 +androidBuildCode=439 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index b3c0deac96..3b6c9d4a18 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -78,6 +78,8 @@ public class Recipes { new Recipe(power, DistributionBlocks.powerlaser, stack(Item.steel, 3), stack(Item.iron, 3)), new Recipe(power, DistributionBlocks.powerlasercorner, stack(Item.steel, 4), stack(Item.iron, 4)), new Recipe(power, DistributionBlocks.powerlaserrouter, stack(Item.steel, 5), stack(Item.iron, 5)), + new Recipe(power, DistributionBlocks.battery, stack(Item.steel, 5), stack(Item.iron, 5)), + new Recipe(power, DistributionBlocks.batteryLarge, stack(Item.steel, 5), stack(Item.iron, 5)), new Recipe(power, DefenseBlocks.shieldgenerator, stack(Item.titanium, 30), stack(Item.dirium, 30)), diff --git a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java index 4c521bd5ee..4da97a11ba 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java @@ -72,11 +72,21 @@ public class DistributionBlocks{ }}, powerlaser = new PowerLaser("powerlaser"){{ }}, - powerlaserrouter = new PowerLaserRouter("powerlaserrouter"){{ + powerlaserrouter = new PowerLaser("powerlaserrouter"){{ + laserDirections = 3; }}, - powerlasercorner = new PowerLaserRouter("powerlasercorner"){{ + powerlasercorner = new PowerLaser("powerlasercorner"){{ laserDirections = 2; }}, + battery = new PowerLaser("battery"){{ + laserDirections = 1; + powerCapacity = 320f; + }}, + batteryLarge = new PowerLaser("batterylarge"){{ + laserDirections = 1; + size = 3; + powerCapacity = 2000f; + }}, teleporter = new Teleporter("teleporter"){{ }}, sorter = new Sorter("sorter"){{ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/BlockPart.java b/core/src/io/anuke/mindustry/world/blocks/types/BlockPart.java index 2f8208da97..9c6d8c8f8b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/BlockPart.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/BlockPart.java @@ -13,6 +13,7 @@ public class BlockPart extends Block{ public BlockPart() { super("blockpart"); solid = false; + hasPower = hasInventory = hasLiquids = true; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/PowerBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/PowerBlock.java index 0982e2f202..a055a8a3a0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/PowerBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/PowerBlock.java @@ -5,7 +5,6 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.BlockGroup; public abstract class PowerBlock extends Block{ - public float powerCapacity = 10f; public float voltage = 0.001f; public PowerBlock(String name) { diff --git a/core/src/io/anuke/mindustry/world/blocks/types/Wall.java b/core/src/io/anuke/mindustry/world/blocks/types/Wall.java index 973d0cabde..7cbe9e4e8f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/Wall.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/Wall.java @@ -10,6 +10,7 @@ public class Wall extends Block{ solid = true; destructible = true; group = BlockGroup.walls; + hasInventory = false; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/LiquidTurret.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/LiquidTurret.java index 6e289c6e63..130001ce93 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/LiquidTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/LiquidTurret.java @@ -10,6 +10,7 @@ public abstract class LiquidTurret extends Turret{ public LiquidTurret(String name) { super(name); + hasLiquids = true; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/ShieldBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/ShieldBlock.java index 06ae6580b6..dac9dd7b83 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/ShieldBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/ShieldBlock.java @@ -26,6 +26,7 @@ public class ShieldBlock extends PowerBlock{ super(name); voltage = powerDrain; powerCapacity = 80f; + 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 d40ed20a0e..dcacac48a2 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 @@ -3,6 +3,7 @@ package io.anuke.mindustry.world.blocks.types.distribution; import com.badlogic.gdx.graphics.Color; 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"); @@ -14,6 +15,12 @@ public class PowerLaser extends Generator{ explosive = false; laserDirections = 1; health = 50; + hasInventory = false; + } + + @Override + public void draw(Tile tile) { + Draw.rect(name(), tile.drawx(), tile.drawy(), tile.getRotation() * 90 - 90); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaserRouter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaserRouter.java deleted file mode 100644 index 93db96ac2b..0000000000 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/PowerLaserRouter.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.anuke.mindustry.world.blocks.types.distribution; - -import io.anuke.mindustry.world.Tile; - -public class PowerLaserRouter extends PowerLaser{ - - public PowerLaserRouter(String name) { - super(name); - laserDirections = 3; - } - - @Override - public void update(Tile tile){ - distributeLaserPower(tile); - } - -} diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java index 4c21ee37d4..c924bfbb36 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.ObjectSet; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.resource.Item; +import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.PowerBlock; import io.anuke.ucore.core.Timers; @@ -13,7 +14,6 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Strings; import java.io.DataInputStream; @@ -47,7 +47,7 @@ public class Teleporter extends PowerBlock{ solid = true; health = 80; powerCapacity = 30f; - instantTransfer = true; + size = 3; } @Override @@ -59,6 +59,12 @@ public class Teleporter extends PowerBlock{ } } + @Override + public void setBars(){ + super.setBars(); + bars.remove(BarType.inventory); + } + @Override public void setStats(){ super.setStats(); @@ -78,10 +84,10 @@ public class Teleporter extends PowerBlock{ super.draw(tile); Draw.color(colorArray[entity.color]); - Draw.rect("blank", tile.worldx(), tile.worldy(), 2, 2); - Draw.color(Color.WHITE); - Draw.alpha(0.45f + Mathf.absin(Timers.time(), 7f, 0.26f)); - Draw.rect("teleporter-top", tile.worldx(), tile.worldy()); + Draw.rect("teleporter-top", tile.drawx(), tile.drawy()); + //Draw.color(Color.WHITE); + //Draw.alpha(0.45f + Mathf.absin(Timers.time(), 7f, 0.26f)); + //Draw.rect("teleporter-top", tile.worldx(), tile.worldy()); Draw.reset(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java index d6ea368877..c6137c348b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java @@ -255,7 +255,7 @@ public class Generator extends PowerBlock{ if(other != null && other.block().hasPower){ Tile linked = other.getLinked(); - if(linked == null || linked.block().hasPower){ + if((linked == null || linked.block().hasPower) && linked != tile){ return other; } }