diff --git a/core/assets-raw/sprites/blocks/production/waterextractor.png b/core/assets-raw/sprites/blocks/production/waterextractor.png index 86f80db8d2..8e3a678eab 100644 Binary files a/core/assets-raw/sprites/blocks/production/waterextractor.png and b/core/assets-raw/sprites/blocks/production/waterextractor.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index b952410b0e..d9729ce024 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,546 +13,546 @@ background index: -1 blackrock1 rotate: false - xy: 221, 50 + xy: 610, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 714, 300 + xy: 620, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 231, 33 + xy: 630, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 241, 33 + xy: 620, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 659, 228 + xy: 630, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 669, 228 + xy: 640, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 679, 228 + xy: 650, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 657, 218 + xy: 726, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 191, 44 + xy: 199, 60 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 564, 107 + xy: 746, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 562, 97 + xy: 723, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 563, 87 + xy: 723, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 765, 351 + xy: 545, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 775, 352 + xy: 559, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 760, 309 + xy: 569, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 760, 299 + xy: 579, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 965, 437 + xy: 309, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 574, 107 + xy: 827, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 572, 97 + xy: 785, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 573, 87 + xy: 785, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 563, 77 + xy: 795, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 573, 77 + xy: 785, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 979, 437 + xy: 323, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 561, 67 + xy: 795, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 571, 67 + xy: 785, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 837, 430 + xy: 795, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 993, 437 + xy: 337, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 847, 431 + xy: 785, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 857, 431 + xy: 795, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 193, 34 + xy: 785, 366 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 193, 34 + xy: 785, 366 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 193, 24 + xy: 795, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 193, 24 + xy: 795, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 193, 14 + xy: 795, 366 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 203, 32 + xy: 805, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 203, 22 + xy: 805, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 613, 125 + xy: 680, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 564, 117 + xy: 351, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 594, 105 + xy: 700, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 604, 105 + xy: 700, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 620, 161 + xy: 393, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 723, 283 + xy: 760, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 723, 273 + xy: 756, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 743, 283 + xy: 756, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 723, 253 + xy: 753, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 733, 263 + xy: 753, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 743, 273 + xy: 175, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 723, 243 + xy: 185, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 733, 253 + xy: 175, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 533, 73 + xy: 407, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 749, 233 + xy: 541, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 729, 223 + xy: 555, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 367, 61 + xy: 595, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 377, 61 + xy: 551, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 387, 61 + xy: 561, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 397, 61 + xy: 571, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 407, 61 + xy: 581, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 417, 61 + xy: 591, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 547, 69 + xy: 435, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 497, 61 + xy: 857, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 507, 61 + xy: 785, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 517, 61 + xy: 795, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 355, 51 + xy: 805, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 365, 51 + xy: 783, 346 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 375, 51 + xy: 793, 346 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 231, 55 + xy: 477, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 425, 51 + xy: 815, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 435, 51 + xy: 825, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 445, 51 + xy: 835, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 537, 63 + xy: 835, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 525, 51 + xy: 815, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 547, 59 + xy: 825, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 567, 47 + xy: 630, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 245, 55 + xy: 491, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 687, 218 + xy: 746, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 687, 218 + xy: 746, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduitliquid rotate: false - xy: 295, 47 + xy: 773, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 345, 47 + xy: 549, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -566,21 +566,21 @@ cross-2 index: -1 enemyspawn rotate: false - xy: 251, 33 + xy: 803, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 583, 79 + xy: 618, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 753, 349 + xy: 853, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -594,56 +594,56 @@ alloysmelter index: -1 coaldrill rotate: false - xy: 793, 426 + xy: 733, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 803, 426 + xy: 733, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 817, 430 + xy: 743, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 827, 430 + xy: 743, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 255, 45 + xy: 640, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cultivator rotate: false - xy: 153, 26 + xy: 641, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 719, 230 + xy: 817, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 203, 12 + xy: 805, 396 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -657,14 +657,14 @@ largesolarpanel index: -1 laserdrill rotate: false - xy: 431, 87 + xy: 467, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 623, 131 + xy: 689, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -690,156 +690,170 @@ nuclearreactor-lights orig: 24, 24 offset: 0, 0 index: -1 +oilextractor + rotate: false + xy: 589, 219 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +oilextractor-liquid + rotate: false + xy: 615, 223 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 oilrefinery rotate: false - xy: 584, 99 + xy: 620, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 583, 89 + xy: 630, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 594, 95 + xy: 628, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 734, 293 + xy: 763, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 744, 293 + xy: 773, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 521, 87 + xy: 584, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 723, 263 + xy: 756, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 733, 273 + xy: 756, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 739, 223 + xy: 565, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 749, 223 + xy: 575, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 357, 61 + xy: 585, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 427, 61 + xy: 551, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 385, 51 + xy: 803, 346 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 395, 51 + xy: 815, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 415, 51 + xy: 825, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 455, 51 + xy: 815, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 465, 51 + xy: 825, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 537, 53 + xy: 835, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 547, 49 + xy: 825, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 303, 69 + xy: 321, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 321, 69 + xy: 339, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 battery rotate: false - xy: 539, 87 + xy: 711, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -860,42 +874,42 @@ batterylarge-base index: -1 conduit-bottom rotate: false - xy: 275, 47 + xy: 753, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 285, 47 + xy: 763, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 305, 47 + xy: 195, 48 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 315, 47 + xy: 195, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 325, 47 + xy: 535, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 335, 47 + xy: 539, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,49 +923,49 @@ core index: -1 junction rotate: false - xy: 593, 125 + xy: 670, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-base rotate: false - xy: 603, 125 + xy: 680, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 623, 121 + xy: 687, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 633, 131 + xy: 699, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 633, 121 + xy: 690, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 594, 115 + xy: 690, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 604, 115 + xy: 697, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -979,175 +993,175 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 503, 87 + xy: 563, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 604, 95 + xy: 640, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 593, 85 + xy: 650, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 603, 85 + xy: 660, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 593, 75 + xy: 670, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 603, 75 + xy: 680, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 583, 69 + xy: 690, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 593, 65 + xy: 700, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 603, 65 + xy: 753, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 724, 293 + xy: 750, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 733, 283 + xy: 756, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 733, 243 + xy: 195, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 563, 140 + xy: 213, 70 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 437, 61 + xy: 561, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 447, 61 + xy: 571, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 457, 61 + xy: 581, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 467, 61 + xy: 591, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 477, 61 + xy: 837, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 589, 219 + xy: 727, 357 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 615, 223 + xy: 724, 331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 527, 61 + xy: 825, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 724, 331 + xy: 153, 40 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 557, 57 + xy: 835, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 339, 69 + xy: 357, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 689, 228 + xy: 736, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1189,14 +1203,14 @@ doubleturret index: -1 flakturret rotate: false - xy: 641, 252 + xy: 677, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 580, 159 + xy: 505, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1210,189 +1224,189 @@ fornaxcannon index: -1 gatlingturret rotate: false - xy: 259, 57 + xy: 517, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 711, 264 + xy: 805, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 449, 87 + xy: 485, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 467, 87 + xy: 503, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 485, 87 + xy: 521, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasmaturret rotate: false - xy: 711, 252 + xy: 817, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 711, 240 + xy: 829, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 748, 303 + xy: 841, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 750, 331 + xy: 714, 298 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 756, 319 + xy: 714, 286 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 727, 357 + xy: 584, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titancannon-icon rotate: false - xy: 578, 119 + xy: 711, 274 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 turret rotate: false - xy: 615, 145 + xy: 711, 262 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 compositewall rotate: false - xy: 265, 47 + xy: 650, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 183, 28 + xy: 589, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 153, 8 + xy: 659, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 641, 270 + xy: 641, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 183, 18 + xy: 599, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 183, 8 + xy: 793, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 659, 274 + xy: 659, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 193, 4 + xy: 805, 386 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 487, 61 + xy: 847, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 213, 70 + xy: 231, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 405, 51 + xy: 815, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 475, 51 + xy: 835, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 485, 51 + xy: 815, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 285, 69 + xy: 303, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1406,7 +1420,7 @@ blank index: -1 bullet rotate: false - xy: 699, 230 + xy: 746, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1427,7 +1441,7 @@ enemyarrow index: -1 laser rotate: false - xy: 750, 343 + xy: 711, 290 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1448,112 +1462,112 @@ laserfull index: -1 shell rotate: false - xy: 743, 263 + xy: 185, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 729, 233 + xy: 195, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 739, 233 + xy: 541, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 495, 51 + xy: 825, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blastenemy-t1 rotate: false - xy: 357, 71 + xy: 153, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t2 rotate: false - xy: 373, 71 + xy: 375, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t3 rotate: false - xy: 389, 71 + xy: 391, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t1 rotate: false - xy: 405, 71 + xy: 407, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t2 rotate: false - xy: 421, 71 + xy: 423, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t3 rotate: false - xy: 437, 71 + xy: 439, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t1 rotate: false - xy: 453, 71 + xy: 455, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t2 rotate: false - xy: 469, 71 + xy: 471, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t3 rotate: false - xy: 485, 71 + xy: 487, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t1 rotate: false - xy: 501, 71 + xy: 503, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t2 rotate: false - xy: 517, 71 + xy: 519, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t3 rotate: false - xy: 584, 203 + xy: 580, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1567,245 +1581,245 @@ fortressenemy-t1 index: -1 fortressenemy-t2 rotate: false - xy: 153, 44 + xy: 637, 288 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 fortressenemy-t3 rotate: false - xy: 637, 288 + xy: 153, 18 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 healerenemy-t1 rotate: false - xy: 584, 187 + xy: 581, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t2 rotate: false - xy: 600, 203 + xy: 724, 315 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t3 rotate: false - xy: 600, 187 + xy: 641, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t1 rotate: false - xy: 949, 444 + xy: 546, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t2 rotate: false - xy: 965, 467 + xy: 602, 177 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t3 rotate: false - xy: 965, 451 + xy: 183, 58 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t1 rotate: false - xy: 981, 467 + xy: 179, 42 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t2 rotate: false - xy: 981, 451 + xy: 213, 54 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t3 rotate: false - xy: 997, 467 + xy: 229, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t1 rotate: false - xy: 997, 451 + xy: 245, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 targetenemy-t1 rotate: false - xy: 997, 451 + xy: 245, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t2 rotate: false - xy: 207, 56 + xy: 449, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standardenemy-t3 rotate: false - xy: 205, 42 + xy: 463, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tankenemy-t1 rotate: false - xy: 175, 50 + xy: 261, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t2 rotate: false - xy: 546, 97 + xy: 277, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t3 rotate: false - xy: 191, 58 + xy: 293, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titanenemy-t1 rotate: false - xy: 231, 69 + xy: 249, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t2 rotate: false - xy: 249, 69 + xy: 267, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t3 rotate: false - xy: 267, 69 + xy: 285, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 203, 2 + xy: 805, 376 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 584, 109 + xy: 805, 366 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 213, 28 + xy: 659, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 213, 18 + xy: 657, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 213, 8 + xy: 669, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 627, 151 + xy: 667, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 627, 141 + xy: 660, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 583, 131 + xy: 679, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 593, 135 + xy: 677, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 603, 135 + xy: 660, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 613, 135 + xy: 670, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-standard rotate: false - xy: 592, 157 + xy: 365, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-standard-icon rotate: false - xy: 606, 157 + xy: 379, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ship-standard rotate: false - xy: 549, 83 + xy: 421, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1953,7 +1967,7 @@ clear index: -1 cursor rotate: false - xy: 753, 343 + xy: 781, 426 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -1967,21 +1981,21 @@ controller-cursor index: -1 icon-about rotate: false - xy: 616, 207 + xy: 753, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 616, 191 + xy: 753, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 724, 315 + xy: 753, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1995,77 +2009,77 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 271, 57 + xy: 564, 119 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 641, 218 + xy: 753, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 283, 57 + xy: 583, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 295, 57 + xy: 576, 119 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 307, 57 + xy: 965, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 319, 57 + xy: 977, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 659, 256 + xy: 641, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 753, 409 + xy: 769, 410 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 753, 393 + xy: 769, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 331, 57 + xy: 989, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 753, 377 + xy: 769, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2093,434 +2107,434 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 343, 57 + xy: 1001, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 591, 145 + xy: 1013, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 603, 145 + xy: 588, 119 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 753, 361 + xy: 769, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 175, 38 + xy: 595, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 769, 410 + xy: 698, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 769, 394 + xy: 695, 288 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 769, 378 + xy: 695, 272 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 769, 362 + xy: 695, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 677, 274 + xy: 659, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 698, 304 + xy: 695, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 695, 288 + xy: 740, 315 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 695, 272 + xy: 869, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 641, 234 + xy: 677, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 171, 26 + xy: 600, 119 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 171, 14 + xy: 169, 6 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 695, 256 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 695, 240 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 781, 432 + xy: 596, 163 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-line rotate: false - xy: 659, 238 + xy: 677, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 793, 436 + xy: 608, 165 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 740, 315 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 677, 256 + xy: 233, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 677, 238 + xy: 251, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 233, 87 + xy: 269, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 805, 436 + xy: 597, 151 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 817, 440 + xy: 609, 153 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 829, 440 + xy: 529, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 841, 441 + xy: 564, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 251, 87 + xy: 287, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 584, 171 + xy: 869, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 269, 87 + xy: 305, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 853, 441 + xy: 576, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 600, 171 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 219, 38 + xy: 588, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 231, 43 + xy: 600, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 243, 43 + xy: 562, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 616, 175 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 287, 87 + xy: 323, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 869, 463 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 885, 463 + xy: 933, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 305, 87 + xy: 341, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 901, 463 + xy: 949, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 917, 463 + xy: 933, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 869, 447 + xy: 949, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 885, 447 + xy: 965, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 901, 447 + xy: 965, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 323, 87 + xy: 359, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 341, 87 + xy: 377, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 171, 2 + xy: 574, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 359, 87 + xy: 395, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 917, 447 + xy: 981, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 724, 303 + xy: 586, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 736, 303 + xy: 598, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 933, 460 + xy: 981, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 377, 87 + xy: 413, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 949, 460 + xy: 997, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 395, 87 + xy: 431, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 711, 288 + xy: 781, 432 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 711, 276 + xy: 793, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 413, 87 + xy: 449, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 933, 444 + xy: 997, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2591,14 +2605,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 695, 307 + xy: 580, 175 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 590, 121 + xy: 750, 347 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2626,7 +2640,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 581, 146 + xy: 610, 196 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2693,84 +2707,84 @@ window-empty index: -1 beam rotate: false - xy: 221, 60 + xy: 711, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 581, 149 + xy: 610, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 667, 218 + xy: 726, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 677, 218 + xy: 736, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 709, 230 + xy: 726, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 1007, 437 + xy: 736, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 743, 253 + xy: 195, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 743, 243 + xy: 185, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 505, 51 + xy: 835, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 515, 51 + xy: 815, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 567, 57 + xy: 835, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 557, 47 + xy: 620, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 7a0fa17988..6e9b61dd24 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 dad06a7adc..d06a8b1c92 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Tue Mar 13 00:12:47 EDT 2018 +#Tue Mar 13 01:15:39 EDT 2018 version=release -androidBuildCode=474 +androidBuildCode=479 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 2fd3d7301f..79a78866b4 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -68,6 +68,7 @@ public class Recipes { new Recipe(production, ProductionBlocks.cultivator, stack(Item.titanium, 40), stack(Item.dirium, 40)), new Recipe(production, ProductionBlocks.laserdrill, stack(Item.titanium, 40), stack(Item.dirium, 40)), new Recipe(production, ProductionBlocks.waterextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), + new Recipe(production, ProductionBlocks.oilextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), new Recipe(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30), stack(Item.stone, 20)), new Recipe(power, ProductionBlocks.thermalgenerator, stack(Item.steel, 30), stack(Item.iron, 30)), diff --git a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java index 0d410bfe78..c1bc767970 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java @@ -72,7 +72,7 @@ public abstract class BaseBlock { } public void tryMoveLiquid(Tile tile, Tile tileSource, Tile next, float amount){ - float flow = Math.min(next.block().liquidCapacity - next.entity.liquid.amount, amount); + float flow = Math.min(next.block().liquidCapacity - next.entity.liquid.amount - 0.001f, amount); if(next.block().acceptLiquid(next, tileSource, tile.entity.liquid.liquid, flow)){ next.block().handleLiquid(next, tileSource, tile.entity.liquid.liquid, flow); diff --git a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java index a0b3aeec65..36770853a0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java @@ -22,14 +22,14 @@ public class DistributionBlocks{ }}, liquidrouter = new LiquidRouter("liquidrouter"){{ - liquidCapacity = 30f; + liquidCapacity = 40f; liquidRegion = "liquidrouter-liquid"; }}, liquidtank = new LiquidRouter("liquidtank"){{ size = 3; liquidRegion = "liquidtank-liquid"; - liquidCapacity = 1300f; + liquidCapacity = 1500f; }}, conveyor = new Conveyor("conveyor"){{ diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index 660e8c6317..5d54afc166 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -16,11 +16,15 @@ public class ProductionBlocks{ core = new CoreBlock("core"){}, - pump = new Pump("pump"){}, + pump = new Pump("pump"){ + { + pumpAmount = 0.8f; + } + }, fluxpump = new Pump("fluxpump"){ { - pumpAmount = 3f; + pumpAmount = 1.2f; } }, @@ -87,9 +91,9 @@ public class ProductionBlocks{ oilrefinery = new LiquidCrafter("oilrefinery"){ { inputLiquid = Liquid.oil; - liquidAmount = 45f; - liquidCapacity = 46f; - purifyTime = 60; + liquidAmount = 55f; + liquidCapacity = 56f; + purifyTime = 65; output = Item.coal; health = 80; craftEffect = Fx.purifyoil; @@ -213,12 +217,23 @@ public class ProductionBlocks{ } }, - //TODO test it waterextractor = new SolidPump("waterextractor"){ { result = Liquid.water; powerUse = 0.1f; + pumpAmount = 0.4f; size = 2; + liquidCapacity = 30f; + } + }, + + oilextractor = new SolidPump("oilextractor"){ + { + result = Liquid.oil; + powerUse = 0.5f; + pumpAmount = 0.4f; + size = 3; + liquidCapacity = 80f; } }, diff --git a/core/src/io/anuke/mindustry/world/blocks/types/modules/LiquidModule.java b/core/src/io/anuke/mindustry/world/blocks/types/modules/LiquidModule.java index d5c0b4c89a..a0104e6220 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/modules/LiquidModule.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/modules/LiquidModule.java @@ -14,13 +14,13 @@ public class LiquidModule extends BlockModule { @Override public void write(DataOutputStream stream) throws IOException { stream.writeByte(liquid.id); - stream.writeByte((byte)(amount)); + stream.writeFloat(amount); } @Override public void read(DataInputStream stream) throws IOException{ byte id = stream.readByte(); liquid = Liquid.getByID(id); - amount = stream.readByte(); + amount = stream.readFloat(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Pump.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Pump.java index da3711ccb9..9c5d464e28 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/Pump.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Pump.java @@ -12,7 +12,7 @@ import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Strings; public class Pump extends LiquidBlock{ - protected float pumpAmount = 2f; + protected float pumpAmount = 1f; public Pump(String name) { super(name); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/types/production/SolidPump.java index 386b9c0323..33bd73ba2d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/SolidPump.java @@ -8,6 +8,7 @@ import io.anuke.ucore.core.Timers; /**Pump that makes liquid from solids and takes in power. Only works on solid floor blocks.*/ public class SolidPump extends Pump { protected Liquid result = Liquid.water; + /**Power use per liquid unit.*/ protected float powerUse = 0.1f; protected final Array drawTiles = new Array<>();