diff --git a/core/assets-raw/sprites/blocks/production/fluxpump.png b/core/assets-raw/sprites/blocks/production/fluxpump.png index 3ed76c6a32..dc91327e72 100644 Binary files a/core/assets-raw/sprites/blocks/production/fluxpump.png and b/core/assets-raw/sprites/blocks/production/fluxpump.png differ diff --git a/core/assets-raw/sprites/blocks/tech/conduitbottom.png b/core/assets-raw/sprites/blocks/tech/conduit-bottom.png similarity index 100% rename from core/assets-raw/sprites/blocks/tech/conduitbottom.png rename to core/assets-raw/sprites/blocks/tech/conduit-bottom.png diff --git a/core/assets-raw/sprites/blocks/tech/conduittop.png b/core/assets-raw/sprites/blocks/tech/conduit-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/tech/conduittop.png rename to core/assets-raw/sprites/blocks/tech/conduit-top.png diff --git a/core/assets-raw/sprites/blocks/tech/conduit.png b/core/assets-raw/sprites/blocks/tech/conduit.png deleted file mode 100644 index cccbd3da93..0000000000 Binary files a/core/assets-raw/sprites/blocks/tech/conduit.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/tech/liquidrouter-bottom.png b/core/assets-raw/sprites/blocks/tech/liquidrouter-bottom.png new file mode 100644 index 0000000000..655303b3c6 Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/liquidrouter-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/tech/liquidrouter-liquid.png b/core/assets-raw/sprites/blocks/tech/liquidrouter-liquid.png new file mode 100644 index 0000000000..08f30e7a73 Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/liquidrouter-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/tech/liquidrouter-top.png b/core/assets-raw/sprites/blocks/tech/liquidrouter-top.png new file mode 100644 index 0000000000..0321a9b629 Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/liquidrouter-top.png differ diff --git a/core/assets-raw/sprites/blocks/tech/liquidrouter.png b/core/assets-raw/sprites/blocks/tech/liquidrouter.png index 2b542a739f..dd4230684e 100644 Binary files a/core/assets-raw/sprites/blocks/tech/liquidrouter.png and b/core/assets-raw/sprites/blocks/tech/liquidrouter.png differ diff --git a/core/assets-raw/sprites/blocks/tech/liquidsilo-bottom.png b/core/assets-raw/sprites/blocks/tech/liquidsilo-bottom.png new file mode 100644 index 0000000000..082dace989 Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/liquidsilo-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/tech/liquidsilo-liquid.png b/core/assets-raw/sprites/blocks/tech/liquidsilo-liquid.png new file mode 100644 index 0000000000..5e1e387d8f Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/liquidsilo-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/tech/liquidsilo-top.png b/core/assets-raw/sprites/blocks/tech/liquidsilo-top.png new file mode 100644 index 0000000000..ee332f30fc Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/liquidsilo-top.png differ diff --git a/core/assets-raw/sprites/blocks/tech/pulseconduitbottom.png b/core/assets-raw/sprites/blocks/tech/pulseconduit-bottom.png similarity index 100% rename from core/assets-raw/sprites/blocks/tech/pulseconduitbottom.png rename to core/assets-raw/sprites/blocks/tech/pulseconduit-bottom.png diff --git a/core/assets-raw/sprites/blocks/tech/pulseconduit-top.png b/core/assets-raw/sprites/blocks/tech/pulseconduit-top.png new file mode 100644 index 0000000000..5cc6fd009a Binary files /dev/null and b/core/assets-raw/sprites/blocks/tech/pulseconduit-top.png differ diff --git a/core/assets-raw/sprites/blocks/tech/pulseconduit.png b/core/assets-raw/sprites/blocks/tech/pulseconduit.png deleted file mode 100644 index 8a634d9746..0000000000 Binary files a/core/assets-raw/sprites/blocks/tech/pulseconduit.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/tech/pulseconduittop.png b/core/assets-raw/sprites/blocks/tech/pulseconduittop.png deleted file mode 100644 index a2d6cc9c54..0000000000 Binary files a/core/assets-raw/sprites/blocks/tech/pulseconduittop.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index c7c20c674e..a51b96cbe5 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,805 +13,805 @@ background index: -1 blackrock1 rotate: false - xy: 853, 443 + xy: 667, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 609, 221 + xy: 677, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 527, 61 + xy: 689, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 239, 9 + xy: 687, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 584, 214 + xy: 699, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 584, 204 + xy: 709, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 584, 194 + xy: 719, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 584, 184 + xy: 185, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 187, 12 + xy: 933, 446 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 614, 211 + xy: 817, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 614, 201 + xy: 827, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 614, 191 + xy: 561, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 803, 426 + xy: 591, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 817, 430 + xy: 601, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 827, 430 + xy: 571, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 594, 175 + xy: 581, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 965, 437 + xy: 947, 446 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 629, 225 + xy: 847, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 837, 430 + xy: 857, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 847, 431 + xy: 611, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 637, 239 + xy: 611, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 647, 242 + xy: 621, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 979, 437 + xy: 175, 52 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 857, 433 + xy: 611, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 639, 229 + xy: 621, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 649, 232 + xy: 631, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 993, 437 + xy: 546, 99 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 659, 236 + xy: 611, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 669, 236 + xy: 621, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 679, 236 + xy: 631, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 679, 236 + xy: 631, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 689, 236 + xy: 621, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 689, 236 + xy: 621, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 699, 236 + xy: 631, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 709, 236 + xy: 631, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 719, 236 + xy: 641, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 649, 222 + xy: 611, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 580, 118 + xy: 746, 311 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 689, 226 + xy: 651, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 699, 226 + xy: 651, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 578, 164 + xy: 171, 10 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 937, 424 + xy: 652, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 947, 424 + xy: 642, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 689, 216 + xy: 672, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 699, 216 + xy: 662, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 709, 216 + xy: 652, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 719, 216 + xy: 682, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 654, 206 + xy: 672, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 654, 196 + xy: 662, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 579, 150 + xy: 965, 469 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 674, 196 + xy: 672, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 684, 206 + xy: 682, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 694, 206 + xy: 692, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 674, 176 + xy: 697, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 684, 186 + xy: 707, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 694, 196 + xy: 717, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 704, 206 + xy: 640, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 684, 176 + xy: 650, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 777, 364 + xy: 993, 469 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 714, 186 + xy: 702, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 714, 176 + xy: 700, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 654, 166 + xy: 712, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 664, 166 + xy: 712, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 674, 166 + xy: 712, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 684, 166 + xy: 712, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 237, 55 + xy: 979, 455 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 724, 196 + xy: 651, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 724, 186 + xy: 661, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 724, 176 + xy: 671, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 927, 414 + xy: 722, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 937, 414 + xy: 722, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 947, 414 + xy: 722, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 917, 407 + xy: 721, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 223, 27 + xy: 993, 455 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 594, 185 + xy: 617, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduitliquid rotate: false - xy: 679, 246 + xy: 571, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 793, 426 + xy: 581, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 659, 292 + xy: 546, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemyspawn rotate: false - xy: 624, 171 + xy: 637, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 634, 209 + xy: 782, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 793, 436 + xy: 997, 443 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 alloysmelter rotate: false - xy: 187, 2 + xy: 659, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coaldrill rotate: false - xy: 619, 221 + xy: 571, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 614, 181 + xy: 581, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 624, 211 + xy: 591, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 624, 201 + xy: 601, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 624, 191 + xy: 571, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cultivator rotate: false - xy: 677, 292 + xy: 153, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 593, 155 + xy: 837, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 867, 437 + xy: 641, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 429, 87 + xy: 431, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 659, 226 + xy: 621, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 390, 105 + xy: 468, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 416, 105 + xy: 494, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 442, 105 + xy: 537, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 709, 226 + xy: 782, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 719, 226 + xy: 782, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 634, 199 + xy: 727, 294 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 947, 434 + xy: 632, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 927, 424 + xy: 642, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 519, 87 + xy: 521, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 669, 216 + xy: 652, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 679, 216 + xy: 642, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 664, 176 + xy: 692, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 674, 186 + xy: 692, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 684, 196 + xy: 692, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 694, 186 + xy: 660, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 694, 166 + xy: 641, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 704, 166 + xy: 651, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 724, 206 + xy: 641, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 724, 166 + xy: 671, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 867, 417 + xy: 681, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 867, 407 + xy: 710, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 877, 407 + xy: 711, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery rotate: false - xy: 197, 2 + xy: 669, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -830,51 +830,44 @@ batterylarge-base orig: 24, 24 offset: 0, 0 index: -1 -conduit +conduit-bottom rotate: false - xy: 659, 246 + xy: 591, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -conduitbottom +conduit-top rotate: false - xy: 669, 246 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conduittop - rotate: false - xy: 689, 246 + xy: 601, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 699, 246 + xy: 581, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 709, 246 + xy: 591, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 719, 246 + xy: 601, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 1007, 437 + xy: 571, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -888,210 +881,245 @@ core index: -1 junction rotate: false - xy: 847, 421 + xy: 635, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-base rotate: false - xy: 639, 219 + xy: 645, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 669, 226 + xy: 631, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 679, 226 + xy: 641, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +liquidrouter-bottom + rotate: false + xy: 621, 59 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquidrouter-liquid + rotate: false + xy: 631, 59 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquidrouter-top + rotate: false + xy: 641, 59 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquidsilo-bottom + rotate: false + xy: 390, 105 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +liquidsilo-liquid + rotate: false + xy: 416, 105 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +liquidsilo-top + rotate: false + xy: 442, 105 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 multiplexer rotate: false - xy: 501, 87 + xy: 503, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 634, 189 + xy: 727, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 634, 179 + xy: 727, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 634, 169 + xy: 727, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 644, 209 + xy: 727, 254 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 644, 199 + xy: 727, 244 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 644, 189 + xy: 729, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 644, 179 + xy: 729, 224 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -pulseconduit +pulseconduit-bottom rotate: false - xy: 644, 169 + xy: 632, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -pulseconduitbottom +pulseconduit-top rotate: false - xy: 927, 434 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -pulseconduittop - rotate: false - xy: 937, 434 + xy: 632, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 659, 216 + xy: 662, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 654, 186 + xy: 672, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 231, 69 + xy: 563, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 704, 196 + xy: 670, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 714, 206 + xy: 680, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 694, 176 + xy: 690, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 704, 186 + xy: 702, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 714, 196 + xy: 702, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 468, 105 + xy: 520, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 494, 105 + xy: 589, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 857, 413 + xy: 722, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 520, 105 + xy: 727, 357 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 887, 407 + xy: 711, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 339, 69 + xy: 267, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 594, 195 + xy: 551, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1112,35 +1140,35 @@ block-3 index: -1 chainturret rotate: false - xy: 213, 90 + xy: 659, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 chainturret-icon rotate: false - xy: 563, 132 + xy: 1007, 457 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 1013, 459 + xy: 592, 159 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 flakturret rotate: false - xy: 641, 270 + xy: 641, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 1013, 447 + xy: 604, 159 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1154,350 +1182,350 @@ fornaxcannon index: -1 gatlingturret rotate: false - xy: 575, 132 + xy: 616, 163 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 225, 15 + xy: 746, 299 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 447, 87 + xy: 449, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 465, 87 + xy: 467, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 483, 87 + xy: 485, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasmaturret rotate: false - xy: 237, 19 + xy: 961, 443 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 227, 3 + xy: 973, 443 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 781, 432 + xy: 985, 443 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 805, 436 + xy: 1009, 445 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 817, 440 + xy: 628, 163 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 537, 131 + xy: 615, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titancannon-icon rotate: false - xy: 829, 440 + xy: 629, 151 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 turret rotate: false - xy: 841, 441 + xy: 629, 139 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 compositewall rotate: false - xy: 624, 181 + xy: 581, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 592, 165 + xy: 591, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 546, 113 + xy: 153, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 153, 26 + xy: 641, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 604, 172 + xy: 601, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 614, 171 + xy: 565, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 153, 8 + xy: 659, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 877, 437 + xy: 641, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 704, 176 + xy: 702, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 249, 69 + xy: 724, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 714, 166 + xy: 661, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 877, 417 + xy: 681, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 887, 417 + xy: 691, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 321, 69 + xy: 249, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blank rotate: false - xy: 231, 105 + xy: 724, 359 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 bullet rotate: false - xy: 604, 211 + xy: 627, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 604, 182 + xy: 171, 1 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 593, 146 + xy: 181, 1 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 laser rotate: false - xy: 533, 73 + xy: 560, 99 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laserend rotate: false - xy: 589, 225 + xy: 213, 88 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 727, 363 + xy: 560, 158 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shell rotate: false - xy: 664, 206 + xy: 682, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 654, 176 + xy: 652, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 664, 186 + xy: 662, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 897, 417 + xy: 691, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blastenemy-t1 rotate: false - xy: 357, 71 + xy: 285, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t2 rotate: false - xy: 373, 71 + xy: 301, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t3 rotate: false - xy: 389, 71 + xy: 317, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t1 rotate: false - xy: 405, 71 + xy: 333, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t2 rotate: false - xy: 421, 71 + xy: 349, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t3 rotate: false - xy: 437, 71 + xy: 365, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t1 rotate: false - xy: 453, 71 + xy: 381, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t2 rotate: false - xy: 469, 71 + xy: 397, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t3 rotate: false - xy: 485, 71 + xy: 413, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t1 rotate: false - xy: 501, 71 + xy: 429, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t2 rotate: false - xy: 517, 71 + xy: 445, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t3 rotate: false - xy: 563, 144 + xy: 461, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1525,231 +1553,231 @@ fortressenemy-t3 index: -1 healerenemy-t1 rotate: false - xy: 698, 304 + xy: 477, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t2 rotate: false - xy: 695, 288 + xy: 493, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t3 rotate: false - xy: 695, 272 + xy: 509, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t1 rotate: false - xy: 747, 361 + xy: 869, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t2 rotate: false - xy: 191, 58 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t3 rotate: false - xy: 191, 42 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t1 rotate: false - xy: 175, 34 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t2 rotate: false - xy: 171, 18 + xy: 869, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t3 rotate: false - xy: 207, 56 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t1 rotate: false - xy: 207, 40 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 targetenemy-t1 rotate: false - xy: 207, 40 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t2 rotate: false - xy: 223, 55 + xy: 1007, 469 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standardenemy-t3 rotate: false - xy: 223, 41 + xy: 965, 455 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tankenemy-t1 rotate: false - xy: 171, 2 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t2 rotate: false - xy: 191, 26 + xy: 933, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t3 rotate: false - xy: 207, 24 + xy: 949, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titanenemy-t1 rotate: false - xy: 267, 69 + xy: 724, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t2 rotate: false - xy: 285, 69 + xy: 213, 70 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t3 rotate: false - xy: 303, 69 + xy: 231, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 887, 437 + xy: 641, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 897, 437 + xy: 571, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 907, 437 + xy: 575, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 917, 437 + xy: 585, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 867, 427 + xy: 581, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 877, 427 + xy: 595, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 887, 427 + xy: 591, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 897, 427 + xy: 605, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 907, 427 + xy: 601, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 917, 427 + xy: 615, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 857, 423 + xy: 625, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-standard rotate: false - xy: 609, 231 + xy: 175, 38 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-standard-icon rotate: false - xy: 623, 235 + xy: 171, 24 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ship-standard rotate: false - xy: 763, 363 + xy: 979, 469 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1890,42 +1918,42 @@ check-over index: -1 clear rotate: false - xy: 1013, 471 + xy: 580, 159 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cursor rotate: false - xy: 747, 377 + xy: 539, 99 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 controller-cursor rotate: false - xy: 560, 160 + xy: 677, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 695, 256 + xy: 525, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 753, 409 + xy: 584, 203 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 753, 393 + xy: 584, 187 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1939,77 +1967,77 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 237, 43 + xy: 581, 147 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 769, 410 + xy: 600, 203 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 251, 57 + xy: 593, 147 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 237, 31 + xy: 605, 147 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 263, 57 + xy: 539, 87 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 275, 57 + xy: 541, 75 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 659, 274 + xy: 659, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 769, 394 + xy: 600, 187 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 714, 304 + xy: 616, 207 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 287, 57 + xy: 551, 87 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 711, 288 + xy: 616, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2037,154 +2065,154 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 299, 57 + xy: 553, 75 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 311, 57 + xy: 758, 349 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 323, 57 + xy: 758, 337 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 711, 272 + xy: 641, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 335, 57 + xy: 758, 325 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 711, 256 + xy: 742, 341 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 753, 377 + xy: 742, 325 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 769, 378 + xy: 698, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 537, 89 + xy: 695, 288 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 641, 252 + xy: 677, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 564, 116 + xy: 695, 272 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 869, 463 + xy: 695, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 885, 463 + xy: 695, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 659, 256 + xy: 641, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 347, 57 + xy: 770, 350 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 359, 59 + xy: 770, 338 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 901, 463 + xy: 753, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 917, 463 + xy: 753, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 371, 59 + xy: 770, 326 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-line rotate: false - xy: 677, 274 + xy: 659, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 383, 59 + xy: 760, 313 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 869, 447 + xy: 753, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2198,273 +2226,273 @@ icon-load-image index: -1 icon-load-map rotate: false - xy: 213, 72 + xy: 677, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 231, 87 + xy: 233, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 395, 59 + xy: 772, 314 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 407, 59 + xy: 581, 135 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 419, 59 + xy: 593, 135 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 431, 59 + xy: 605, 135 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 249, 87 + xy: 251, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 885, 447 + xy: 753, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 267, 87 + xy: 269, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 443, 59 + xy: 617, 151 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 901, 447 + xy: 769, 410 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 455, 59 + xy: 617, 139 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 467, 59 + xy: 781, 432 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 479, 59 + xy: 793, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 917, 447 + xy: 769, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 285, 87 + xy: 287, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 933, 460 + xy: 769, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 949, 460 + xy: 769, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 303, 87 + xy: 305, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 933, 444 + xy: 714, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 949, 444 + xy: 711, 288 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 965, 467 + xy: 711, 272 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 965, 451 + xy: 711, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 981, 467 + xy: 711, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 321, 87 + xy: 323, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 339, 87 + xy: 341, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 491, 59 + xy: 805, 436 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 357, 87 + xy: 359, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 981, 451 + xy: 730, 305 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 503, 59 + xy: 817, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 515, 59 + xy: 829, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 997, 467 + xy: 584, 171 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 375, 87 + xy: 377, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 997, 451 + xy: 600, 171 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 393, 87 + xy: 395, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 201, 12 + xy: 841, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 213, 12 + xy: 853, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 411, 87 + xy: 413, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 175, 50 + xy: 616, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2535,14 +2563,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 560, 157 + xy: 695, 307 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 171, 34 + xy: 632, 213 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2570,7 +2598,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 584, 181 + xy: 632, 180 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2614,7 +2642,7 @@ textfield-over index: -1 white rotate: false - xy: 654, 217 + xy: 584, 219 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -2637,84 +2665,84 @@ window-empty index: -1 beam rotate: false - xy: 207, 2 + xy: 679, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 217, 2 + xy: 657, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 594, 215 + xy: 185, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 594, 205 + xy: 541, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 604, 201 + xy: 793, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 604, 191 + xy: 803, 426 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 664, 196 + xy: 682, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 674, 206 + xy: 642, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 907, 417 + xy: 701, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 917, 417 + xy: 701, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 897, 407 + xy: 720, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 907, 407 + xy: 721, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index bfdcb510d8..bd0e095b00 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 5ec49a4f3a..f0de441295 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sun Mar 11 10:06:17 EDT 2018 +#Mon Mar 12 16:07:14 EDT 2018 version=release -androidBuildCode=441 +androidBuildCode=461 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 3b6c9d4a18..1795a49648 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -91,6 +91,7 @@ public class Recipes { new Recipe(liquid, DistributionBlocks.conduit, stack(Item.steel, 1)), new Recipe(liquid, DistributionBlocks.pulseconduit, stack(Item.titanium, 1), stack(Item.steel, 1)), new Recipe(liquid, DistributionBlocks.liquidrouter, stack(Item.steel, 2)), + new Recipe(liquid, DistributionBlocks.liquidsilo, stack(Item.steel, 2)), new Recipe(liquid, DistributionBlocks.liquidjunction, stack(Item.steel, 2)), new Recipe(liquid, DistributionBlocks.conduittunnel, stack(Item.titanium, 2), stack(Item.steel, 2)), diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index 6254d9f84f..71b396f051 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -117,7 +117,7 @@ public class BlocksFragment implements Fragment{ for (Recipe r : recipes) { ImageButton image = new ImageButton(new TextureRegion(), "select"); - TextureRegion[] regions = r.result.getIcon(true); + TextureRegion[] regions = r.result.getCompactIcon(); Stack istack = new Stack(); for(TextureRegion region : regions){ istack.add(new Image(region)); @@ -259,7 +259,7 @@ public class BlocksFragment implements Fragment{ desctable.row(); - TextureRegion[] regions = recipe.result.getIcon(true); + TextureRegion[] regions = recipe.result.getCompactIcon(); Stack istack = new Stack(); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index c88d97007a..a405b8a9e6 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -177,16 +177,24 @@ public class Block extends BaseBlock { Effects.sound(explosionSound, x, y); } - public TextureRegion[] getIcon(boolean compact){ + public TextureRegion[] getIcon(){ if(Draw.hasRegion(name + "-icon")){ return new TextureRegion[]{Draw.region(name + "-icon")}; }else{ - return new TextureRegion[]{compact ? iconRegion(name) : Draw.region(name)}; + return new TextureRegion[]{Draw.region(name)}; } } - protected TextureRegion iconRegion(String name){ - TextureRegion region = new TextureRegion(Draw.region(name)); + public TextureRegion[] getCompactIcon(){ + TextureRegion[] out = getIcon(); + for(int i = 0; i < out.length; i ++){ + out[i] = iconRegion(out[i]); + } + return out; + } + + protected TextureRegion iconRegion(TextureRegion src){ + TextureRegion region = new TextureRegion(src); region.setRegionWidth(8); region.setRegionHeight(8); return region; @@ -252,7 +260,7 @@ public class Block extends BaseBlock { "entity.x", tile.entity.x, "entity.y", tile.entity.y, "entity.id", tile.entity.id, - "entity.items.total", tile.entity.inventory.totalItems() + "entity.items.total", hasInventory ? tile.entity.inventory.totalItems() : null ); } diff --git a/core/src/io/anuke/mindustry/world/Edges.java b/core/src/io/anuke/mindustry/world/Edges.java index ced20276d6..b138945e0d 100644 --- a/core/src/io/anuke/mindustry/world/Edges.java +++ b/core/src/io/anuke/mindustry/world/Edges.java @@ -14,7 +14,7 @@ public class Edges { static{ for(int i = 0; i < maxSize; i ++){ - int bot = -(int)(i/2f-0.5f) - 1; + int bot = -(int)(i/2f) - 1; int top = (int)(i/2f+0.5f) + 1; edges[i] = new GridPoint2[(i + 1) * 4]; diff --git a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java index 240a6fd024..0d410bfe78 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java @@ -6,7 +6,6 @@ import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.Edges; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; public abstract class BaseBlock { public boolean hasInventory = true; @@ -28,7 +27,7 @@ public abstract class BaseBlock { public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){ return tile.entity.liquid.amount + amount < liquidCapacity - && (tile.entity.liquid.liquid == liquid || tile.entity.liquid.amount <= 0.01f); + && (tile.entity.liquid.liquid == liquid || tile.entity.liquid.amount <= 0.001f); } public void handleLiquid(Tile tile, Tile source, Liquid liquid, float amount){ @@ -49,9 +48,35 @@ public abstract class BaseBlock { } public void tryDumpLiquid(Tile tile){ - if(tile.entity.liquid.amount > 0.01f){ - tryMoveLiquid(tile, tile.getNearby(tile.getDump())); - tile.setDump((byte) Mathf.mod(tile.getDump() + 1, 4)); + int size = tile.block().size; + + GridPoint2[] nearby = Edges.getEdges(size); + byte i = tile.getDump(); + + for (int j = 0; j < nearby.length; j ++) { + Tile other = tile.getNearby(nearby[i]); + Tile in = tile.getNearby(Edges.getInsideEdges(size)[i]); + + if(other != null) other = other.target(); + + if (other != null && other.block().hasLiquids) { + float ofract = other.entity.liquid.amount / other.block().liquidCapacity; + float fract = tile.entity.liquid.amount / liquidCapacity; + + if(ofract < fract) tryMoveLiquid(tile, in, other, (fract - ofract) * liquidCapacity / 2f); + } + + i = (byte) ((i + 1) % nearby.length); + } + + } + + public void tryMoveLiquid(Tile tile, Tile tileSource, Tile next, float amount){ + float flow = Math.min(next.block().liquidCapacity - next.entity.liquid.amount, amount); + + if(next.block().acceptLiquid(next, tileSource, tile.entity.liquid.liquid, flow)){ + next.block().handleLiquid(next, tileSource, tile.entity.liquid.liquid, flow); + tile.entity.liquid.amount -= flow; } } @@ -60,9 +85,13 @@ public abstract class BaseBlock { next = next.target(); - if(next.block().hasLiquids && tile.entity.liquid.amount > 0.01f){ + if(next.block().hasLiquids && tile.entity.liquid.amount > 0f){ + float ofract = next.entity.liquid.amount / next.block().liquidCapacity; + float fract = tile.entity.liquid.amount / liquidCapacity; - float flow = Math.min(next.block().liquidCapacity - next.entity.liquid.amount - 0.001f, + if(ofract > fract) return; + + float flow = Math.min((fract - ofract) * liquidCapacity/2f, Math.min(tile.entity.liquid.amount/liquidFlowFactor * Math.max(Timers.delta(), 1f), tile.entity.liquid.amount)); if(flow <= 0f || tile.entity.liquid.amount < flow) return; diff --git a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java index 6761df2f33..97d03b2587 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java @@ -22,7 +22,14 @@ public class DistributionBlocks{ }}, liquidrouter = new LiquidRouter("liquidrouter"){{ + liquidCapacity = 30f; + liquidRegion = "liquidrouter-liquid"; + }}, + liquidsilo = new LiquidRouter("liquidsilo"){{ + size = 3; + liquidRegion = "liquidsilo-liquid"; + liquidCapacity = 1300f; }}, conveyor = new Conveyor("conveyor"){{ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/LiquidBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/LiquidBlock.java index 9874c2e92d..9520b0a9ce 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/LiquidBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/LiquidBlock.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.world.blocks.types; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.BlockGroup; import io.anuke.mindustry.world.Tile; @@ -8,29 +9,38 @@ import io.anuke.ucore.graphics.Draw; public class LiquidBlock extends Block{ protected final int timerFlow = timers++; + protected String liquidRegion = "conduitliquid"; public LiquidBlock(String name) { super(name); rotate = true; update = true; hasLiquids = true; + hasInventory = false; group = BlockGroup.liquids; } + + @Override + public TextureRegion[] getIcon(){ + return new TextureRegion[]{Draw.region(name() + "-bottom"), Draw.region(name() + "-top")}; + } @Override public void draw(Tile tile){ LiquidModule mod = tile.entity.liquid; + + int rotation = rotate ? tile.getRotation() * 90 : 0; - Draw.rect(name() + "bottom", tile.worldx(), tile.worldy(), tile.getRotation() * 90); + Draw.rect(name() + "-bottom", tile.worldx(), tile.worldy(), rotation); if(mod.amount > 0.01f){ Draw.color(mod.liquid.color); Draw.alpha(mod.amount / liquidCapacity); - Draw.rect("conduitliquid", tile.worldx(), tile.worldy(), tile.getRotation() * 90); + Draw.rect(liquidRegion, tile.worldx(), tile.worldy(), rotation); Draw.color(); } - Draw.rect(name() + "top", tile.worldx(), tile.worldy(), tile.getRotation() * 90); + Draw.rect(name() + "-top", tile.worldx(), tile.worldy(), rotation); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java index af6acc2abd..610b9b31a4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.world.blocks.types.distribution; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.LiquidBlock; @@ -19,7 +20,12 @@ public class LiquidJunction extends LiquidBlock{ public void draw(Tile tile){ Draw.rect(name(), tile.worldx(), tile.worldy()); } - + + @Override + public TextureRegion[] getIcon(){ + return new TextureRegion[]{Draw.region(name)}; + } + @Override public void handleLiquid(Tile tile, Tile source, Liquid liquid, float amount){ int dir = source.relativeTo(tile.x, tile.y); 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 6976cd24a1..4b8e34135e 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 @@ -1,9 +1,7 @@ package io.anuke.mindustry.world.blocks.types.distribution; -import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.LiquidBlock; -import io.anuke.ucore.graphics.Draw; public class LiquidRouter extends LiquidBlock{ @@ -19,28 +17,8 @@ public class LiquidRouter extends LiquidBlock{ public void update(Tile tile){ if(tile.entity.liquid.amount > 0){ - if(tile.getExtra() != tile.getRotation()){ - tryMoveLiquid(tile, tile.getNearby(tile.getRotation())); - } - - tile.setRotation((byte)((tile.getRotation() + 1) % 4)); + tryDumpLiquid(tile); } } - - @Override - public void handleLiquid(Tile tile, Tile source, Liquid liquid, float amount){ - super.handleLiquid(tile, source, liquid, amount); - tile.setExtra(tile.relativeTo(source.x, source.y)); - } - - @Override - public void draw(Tile tile){ - Draw.rect(name(), tile.worldx(), tile.worldy()); - - Draw.color(tile.entity.liquid.liquid.color); - Draw.alpha(tile.entity.liquid.amount / liquidCapacity); - Draw.rect("blank", tile.worldx(), tile.worldy(), 2, 2); - Draw.color(); - } } 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 a8f04a05cb..4f72a5298a 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 @@ -21,10 +21,9 @@ public class PowerLaser extends Generator{ } @Override - public TextureRegion[] getIcon(boolean compact){ + public TextureRegion[] getIcon(){ String bname = base == null ? "laser-base" : base; - return new TextureRegion[]{compact ? iconRegion(bname) : Draw.region(bname), - compact ? iconRegion(name) : Draw.region(name)}; + return new TextureRegion[]{Draw.region(bname), Draw.region(name)}; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java index 31a0bd21b3..b1752445a6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java @@ -11,6 +11,8 @@ public class Splitter extends Block{ super(name); solid = true; instantTransfer = true; + destructible = true; + hasInventory = false; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConduit.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConduit.java index 549056cfeb..4f419b7384 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConduit.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConduit.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.world.blocks.types.distribution; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.LiquidBlock; @@ -17,6 +18,11 @@ public class TunnelConduit extends LiquidBlock { instantTransfer = true; } + @Override + public TextureRegion[] getIcon(){ + return new TextureRegion[]{Draw.region(name)}; + } + @Override public void draw(Tile tile){ Draw.rect(name, tile.drawx(), tile.drawy(), tile.getRotation() * 90); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidCrafter.java b/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidCrafter.java index 8a9f54f1eb..bad83ca074 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidCrafter.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.world.blocks.types.production; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.graphics.Fx; import io.anuke.mindustry.resource.Item; @@ -23,7 +24,6 @@ public class LiquidCrafter extends LiquidBlock{ public Liquid inputLiquid = null; public float liquidAmount = 20f; public Item output = null; - public int itemCapacity = 90; public int purifyTime = 80; public Effect craftEffect = Fx.purify; @@ -33,6 +33,8 @@ public class LiquidCrafter extends LiquidBlock{ rotate = false; solid = true; health = 60; + hasInventory = true; + itemCapacity = 90; liquidCapacity = 21f; } @@ -66,6 +68,11 @@ public class LiquidCrafter extends LiquidBlock{ Draw.rect("blank", tile.drawx(), tile.drawy(), 2, 2); Draw.color(); } + + @Override + public TextureRegion[] getIcon(){ + return new TextureRegion[]{Draw.region(name)}; + } @Override public void update(Tile tile){ 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 4edc4f2842..2098a7617c 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 @@ -1,5 +1,6 @@ package io.anuke.mindustry.world.blocks.types.production; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.BlockGroup; import io.anuke.mindustry.world.Layer; @@ -11,9 +12,6 @@ import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Strings; public class Pump extends LiquidBlock{ - protected final int timerPump = timers++; - protected final int timerDump = timers++; - protected float pumpAmount = 2f; public Pump(String name) { @@ -46,6 +44,11 @@ public class Pump extends LiquidBlock{ Draw.color(); } + @Override + public TextureRegion[] getIcon(){ + return new TextureRegion[]{Draw.region(name)}; + } + @Override public boolean isLayer(Tile tile) { return tile.floor().liquidDrop == null; @@ -66,10 +69,8 @@ public class Pump extends LiquidBlock{ tile.entity.liquid.liquid = tile.floor().liquidDrop; tile.entity.liquid.amount += maxPump; } - - if(tile.entity.timer.get(timerDump, 1)){ - tryDumpLiquid(tile); - } + + tryDumpLiquid(tile); } }