diff --git a/core/assets-raw/sprites/blocks/turrets/chainturret-icon.png b/core/assets-raw/sprites/blocks/turrets/chainturret-icon.png deleted file mode 100644 index 79f76d7eba..0000000000 Binary files a/core/assets-raw/sprites/blocks/turrets/chainturret-icon.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/turrets/titancannon-icon.png b/core/assets-raw/sprites/blocks/turrets/titancannon-icon.png deleted file mode 100644 index 29b3d2cb14..0000000000 Binary files a/core/assets-raw/sprites/blocks/turrets/titancannon-icon.png and /dev/null differ diff --git a/core/assets-raw/sprites/mechs/mech-standard-icon.png b/core/assets-raw/sprites/mechs/mech-standard-icon.png deleted file mode 100644 index 4546324c10..0000000000 Binary files a/core/assets-raw/sprites/mechs/mech-standard-icon.png and /dev/null differ diff --git a/core/assets-raw/sprites/mechs/mech-standard.png b/core/assets-raw/sprites/mechs/mech-standard.png deleted file mode 100644 index 1b343a9775..0000000000 Binary files a/core/assets-raw/sprites/mechs/mech-standard.png and /dev/null differ diff --git a/core/assets-raw/sprites/mechs/standard-mech-base.png b/core/assets-raw/sprites/mechs/standard-mech-base.png new file mode 100644 index 0000000000..50cd656428 Binary files /dev/null and b/core/assets-raw/sprites/mechs/standard-mech-base.png differ diff --git a/core/assets-raw/sprites/mechs/standard-mech-leg.png b/core/assets-raw/sprites/mechs/standard-mech-leg.png new file mode 100644 index 0000000000..7204dda0a7 Binary files /dev/null and b/core/assets-raw/sprites/mechs/standard-mech-leg.png differ diff --git a/core/assets-raw/sprites/mechs/standard-mech.png b/core/assets-raw/sprites/mechs/standard-mech.png new file mode 100644 index 0000000000..0676807889 Binary files /dev/null and b/core/assets-raw/sprites/mechs/standard-mech.png differ diff --git a/core/assets-raw/sprites/mechs/ship-standard.png b/core/assets-raw/sprites/mechs/standard-ship.png similarity index 100% rename from core/assets-raw/sprites/mechs/ship-standard.png rename to core/assets-raw/sprites/mechs/standard-ship.png diff --git a/core/assets-raw/sprites/weapons/blaster-equip.png b/core/assets-raw/sprites/weapons/blaster-equip.png index 6a90610d9f..9f6fd9dc06 100644 Binary files a/core/assets-raw/sprites/weapons/blaster-equip.png and b/core/assets-raw/sprites/weapons/blaster-equip.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index ade5359141..e59496e044 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -339,8 +339,10 @@ keybind.weapon_6.name=weapon_6 mode.waves.name=waves mode.sandbox.name=sandbox mode.freebuild.name=freebuild -upgrade.standard.name=standard -upgrade.standard.description=The standard mech. +upgrade.standard-mech.name=standard +upgrade.standard-mech.description=The standard mech. +upgrade.standard-ship.name=standard ship +upgrade.standard-ship.description=The standard ship. upgrade.blaster.name=blaster upgrade.blaster.description=Shoots a slow, weak bullet. upgrade.triblaster.name=triblaster diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 34371be525..37cc37e99f 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,56 +13,56 @@ background index: -1 blackrock1 rotate: false - xy: 520, 61 + xy: 231, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 530, 61 + xy: 315, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 714, 300 + xy: 241, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 724, 305 + xy: 325, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 734, 305 + xy: 251, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 744, 305 + xy: 335, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 711, 290 + xy: 261, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 711, 280 + xy: 345, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -76,217 +76,217 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 453, 49 + xy: 801, 438 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 463, 49 + xy: 555, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 473, 49 + xy: 610, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 493, 41 + xy: 690, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 503, 41 + xy: 677, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 513, 41 + xy: 677, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 523, 41 + xy: 687, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 357, 55 + xy: 485, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 620, 203 + xy: 673, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 630, 203 + xy: 683, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 640, 208 + xy: 753, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 650, 208 + xy: 763, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 539, 87 + xy: 773, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 371, 55 + xy: 199, 46 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 549, 87 + xy: 813, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 541, 77 + xy: 823, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 551, 77 + xy: 833, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 385, 55 + xy: 195, 32 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 562, 85 + xy: 843, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 572, 85 + xy: 853, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 582, 85 + xy: 533, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 582, 85 + xy: 533, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 592, 85 + xy: 543, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 592, 85 + xy: 543, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 602, 85 + xy: 553, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 561, 75 + xy: 301, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 571, 75 + xy: 311, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 731, 285 + xy: 660, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 399, 55 + xy: 195, 18 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 721, 245 + xy: 693, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 731, 255 + xy: 693, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,56 +300,56 @@ oiledge index: -1 rock1 rotate: false - xy: 756, 321 + xy: 415, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 773, 352 + xy: 425, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 751, 281 + xy: 465, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 751, 271 + xy: 475, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 751, 261 + xy: 811, 422 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 751, 251 + xy: 821, 422 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 751, 241 + xy: 831, 422 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 751, 231 + xy: 620, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -363,518 +363,525 @@ sandedge index: -1 shrub rotate: false - xy: 175, 20 + xy: 690, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 185, 32 + xy: 640, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 791, 428 + xy: 680, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 801, 428 + xy: 690, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 811, 432 + xy: 766, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 821, 432 + xy: 766, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 831, 432 + xy: 770, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 543, 57 + xy: 371, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 255, 39 + xy: 241, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 650, 188 + xy: 451, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 659, 228 + xy: 461, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 657, 218 + xy: 471, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 669, 228 + xy: 670, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 667, 218 + xy: 680, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 660, 208 + xy: 690, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 297, 39 + xy: 339, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 660, 188 + xy: 491, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 670, 198 + xy: 581, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 670, 188 + xy: 697, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 690, 198 + xy: 700, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 690, 188 + xy: 700, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 697, 218 + xy: 700, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 710, 200 + xy: 707, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 311, 39 + xy: 353, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 711, 240 + xy: 291, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 711, 240 + xy: 291, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 801, 438 + xy: 660, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 483, 39 + xy: 680, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 546, 113 + xy: 641, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +cross-3 + rotate: false + xy: 364, 105 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 enemyspawn rotate: false - xy: 620, 213 + xy: 677, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 741, 255 + xy: 753, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 430, 59 + xy: 257, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 alloysmelter rotate: false - xy: 714, 310 + xy: 698, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coaldrill rotate: false - xy: 483, 49 + xy: 610, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 493, 51 + xy: 620, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 503, 51 + xy: 630, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 513, 51 + xy: 620, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 523, 51 + xy: 630, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 641, 270 + xy: 659, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 659, 274 + xy: 641, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 641, 252 + xy: 659, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 659, 256 + xy: 659, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 630, 213 + xy: 687, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 581, 75 + xy: 321, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 largesolarpanel rotate: false - xy: 390, 105 + xy: 416, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 521, 87 + xy: 231, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 721, 265 + xy: 673, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 494, 105 + xy: 537, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 537, 131 + xy: 520, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 520, 105 + xy: 589, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor rotate: false - xy: 589, 219 + xy: 615, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-liquid rotate: false - xy: 615, 223 + xy: 727, 357 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 741, 265 + xy: 690, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 731, 245 + xy: 690, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 741, 245 + xy: 750, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 760, 341 + xy: 395, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 760, 331 + xy: 405, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 249, 69 + xy: 321, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 754, 301 + xy: 445, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 754, 291 + xy: 455, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 185, 22 + xy: 650, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 195, 36 + xy: 660, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 195, 26 + xy: 670, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 543, 47 + xy: 381, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 679, 228 + xy: 776, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 677, 218 + xy: 776, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 670, 208 + xy: 485, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 680, 208 + xy: 697, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 680, 198 + xy: 697, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 707, 220 + xy: 720, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 700, 208 + xy: 730, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 375, 69 + xy: 447, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 393, 69 + xy: 465, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 battery rotate: false - xy: 490, 61 + xy: 539, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -895,42 +902,42 @@ batterylarge-base index: -1 conduit-bottom rotate: false - xy: 791, 438 + xy: 650, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 433, 39 + xy: 640, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 443, 39 + xy: 650, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 453, 39 + xy: 660, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 463, 39 + xy: 681, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 473, 39 + xy: 691, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -944,245 +951,245 @@ core index: -1 junction rotate: false - xy: 721, 285 + xy: 640, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-base rotate: false - xy: 721, 275 + xy: 650, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 731, 275 + xy: 683, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 741, 285 + xy: 670, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 721, 255 + xy: 670, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 731, 265 + xy: 680, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 741, 275 + xy: 680, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 416, 105 + xy: 442, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 442, 105 + xy: 468, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 468, 105 + xy: 494, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 231, 69 + xy: 303, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 640, 198 + xy: 763, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 650, 198 + xy: 773, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 721, 235 + xy: 760, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 731, 235 + xy: 756, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 741, 235 + xy: 756, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 753, 351 + xy: 361, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 750, 341 + xy: 365, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 750, 331 + xy: 375, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 763, 351 + xy: 385, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 756, 311 + xy: 435, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 823, 442 + xy: 640, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 267, 69 + xy: 339, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 543, 37 + xy: 391, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 620, 193 + xy: 401, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 630, 193 + xy: 411, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 618, 183 + xy: 421, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 628, 183 + xy: 431, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 727, 357 + xy: 724, 331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 724, 331 + xy: 584, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 690, 208 + xy: 700, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 153, 40 + xy: 153, 14 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 700, 198 + xy: 740, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 411, 69 + xy: 483, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 711, 250 + xy: 281, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1203,231 +1210,217 @@ block-3 index: -1 chainturret rotate: false - xy: 659, 292 + xy: 546, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -chainturret-icon - rotate: false - xy: 1013, 471 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 doubleturret rotate: false - xy: 1013, 447 + xy: 165, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 flakturret rotate: false - xy: 677, 256 + xy: 269, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 325, 41 + xy: 1013, 471 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 364, 105 + xy: 390, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 337, 41 + xy: 1013, 459 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 574, 95 + xy: 609, 141 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 563, 140 + xy: 249, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 584, 175 + xy: 267, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 213, 70 + xy: 285, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasmaturret rotate: false - xy: 586, 95 + xy: 221, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 598, 95 + xy: 233, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 421, 43 + xy: 245, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 442, 59 + xy: 269, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 454, 59 + xy: 281, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 584, 193 + xy: 153, 40 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -titancannon-icon - rotate: false - xy: 466, 59 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 turret rotate: false - xy: 478, 59 + xy: 293, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 compositewall rotate: false - xy: 533, 51 + xy: 640, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 533, 41 + xy: 677, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 677, 274 + xy: 681, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 641, 234 + xy: 233, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 610, 209 + xy: 687, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 610, 199 + xy: 687, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 659, 238 + xy: 251, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 591, 75 + xy: 331, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 640, 188 + xy: 441, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 285, 69 + xy: 357, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 660, 198 + xy: 481, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 680, 188 + xy: 697, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 689, 228 + xy: 700, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 357, 69 + xy: 429, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1448,21 +1441,21 @@ bullet index: -1 chainbullet rotate: false - xy: 563, 131 + xy: 177, 1 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 573, 131 + xy: 187, 1 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 laser rotate: false - xy: 427, 55 + xy: 677, 274 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1483,112 +1476,112 @@ laserfull index: -1 shell rotate: false - xy: 813, 442 + xy: 630, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 853, 443 + xy: 670, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 175, 30 + xy: 680, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 687, 218 + xy: 703, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blastenemy-t1 rotate: false - xy: 153, 2 + xy: 501, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t2 rotate: false - xy: 429, 71 + xy: 517, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t3 rotate: false - xy: 445, 71 + xy: 580, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t1 rotate: false - xy: 461, 71 + xy: 581, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t2 rotate: false - xy: 477, 71 + xy: 724, 315 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t3 rotate: false - xy: 493, 71 + xy: 641, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t1 rotate: false - xy: 509, 71 + xy: 657, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t2 rotate: false - xy: 525, 71 + xy: 753, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t3 rotate: false - xy: 580, 159 + xy: 753, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t1 rotate: false - xy: 581, 143 + xy: 753, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t2 rotate: false - xy: 724, 315 + xy: 753, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t3 rotate: false - xy: 641, 218 + xy: 769, 410 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1609,238 +1602,245 @@ fortressenemy-t2 index: -1 fortressenemy-t3 rotate: false - xy: 153, 18 + xy: 659, 288 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 healerenemy-t1 rotate: false - xy: 753, 409 + xy: 769, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t2 rotate: false - xy: 753, 393 + xy: 769, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t3 rotate: false - xy: 753, 377 + xy: 769, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t1 rotate: false - xy: 179, 42 + xy: 325, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t2 rotate: false - xy: 213, 54 + xy: 341, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t3 rotate: false - xy: 229, 53 + xy: 357, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t1 rotate: false - xy: 245, 53 + xy: 373, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t2 rotate: false - xy: 261, 53 + xy: 389, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t3 rotate: false - xy: 277, 53 + xy: 405, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t1 rotate: false - xy: 293, 53 + xy: 421, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 targetenemy-t1 rotate: false - xy: 293, 53 + xy: 421, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t2 rotate: false - xy: 269, 39 + xy: 311, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standardenemy-t3 rotate: false - xy: 283, 39 + xy: 325, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tankenemy-t1 rotate: false - xy: 309, 53 + xy: 437, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t2 rotate: false - xy: 325, 53 + xy: 453, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t3 rotate: false - xy: 341, 53 + xy: 469, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titanenemy-t1 rotate: false - xy: 303, 69 + xy: 375, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t2 rotate: false - xy: 321, 69 + xy: 393, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t3 rotate: false - xy: 339, 69 + xy: 411, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 601, 75 + xy: 341, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 541, 67 + xy: 351, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 551, 67 + xy: 791, 428 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 561, 65 + xy: 801, 428 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 571, 65 + xy: 811, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 581, 65 + xy: 821, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 591, 65 + xy: 831, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 601, 65 + xy: 620, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 724, 295 + xy: 630, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 734, 295 + xy: 618, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 744, 295 + xy: 628, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -mech-standard +standard-mech rotate: false - xy: 413, 55 + xy: 255, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 -mech-standard-icon +standard-mech-base rotate: false - xy: 199, 46 + xy: 269, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 -ship-standard +standard-mech-leg rotate: false - xy: 241, 39 + xy: 283, 39 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +standard-ship + rotate: false + xy: 297, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1981,7 +1981,7 @@ check-over index: -1 clear rotate: false - xy: 1013, 459 + xy: 153, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1995,28 +1995,28 @@ cursor index: -1 controller-cursor rotate: false - xy: 677, 292 + xy: 641, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 753, 361 + xy: 740, 315 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 769, 410 + xy: 869, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 769, 394 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2030,77 +2030,77 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 564, 119 + xy: 1013, 447 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 769, 378 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 583, 131 + xy: 367, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 576, 119 + xy: 379, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 349, 41 + xy: 391, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 361, 43 + xy: 403, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 677, 238 + xy: 287, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 769, 362 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 698, 304 + xy: 869, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 373, 43 + xy: 415, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 695, 288 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2128,434 +2128,434 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 385, 43 + xy: 427, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 397, 43 + xy: 439, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 409, 43 + xy: 451, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 695, 272 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 965, 439 + xy: 463, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 695, 256 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 695, 240 + xy: 933, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 740, 315 + xy: 949, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 869, 463 + xy: 933, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 233, 87 + xy: 305, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 885, 463 + xy: 949, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 901, 463 + xy: 965, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 917, 463 + xy: 965, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 251, 87 + xy: 323, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 977, 439 + xy: 475, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 989, 439 + xy: 487, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 869, 447 + xy: 981, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 885, 447 + xy: 981, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1001, 439 + xy: 708, 308 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-line rotate: false - xy: 269, 87 + xy: 341, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 1013, 435 + xy: 209, 28 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 901, 447 + xy: 997, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 287, 87 + xy: 359, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 305, 87 + xy: 377, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 323, 87 + xy: 395, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 588, 119 + xy: 209, 16 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 595, 131 + xy: 965, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 600, 119 + xy: 977, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 169, 6 + xy: 989, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 341, 87 + xy: 413, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 917, 447 + xy: 997, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 359, 87 + xy: 431, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 596, 163 + xy: 1001, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 933, 460 + xy: 546, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 608, 165 + xy: 1013, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 597, 151 + xy: 533, 75 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 609, 153 + xy: 549, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 949, 460 + xy: 602, 177 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 377, 87 + xy: 449, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 933, 444 + xy: 183, 58 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 949, 444 + xy: 179, 42 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 395, 87 + xy: 467, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 965, 467 + xy: 179, 26 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 965, 451 + xy: 179, 10 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 981, 467 + xy: 213, 54 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 981, 451 + xy: 229, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 997, 467 + xy: 245, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 413, 87 + xy: 485, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 431, 87 + xy: 503, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 564, 107 + xy: 596, 163 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 449, 87 + xy: 521, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 997, 451 + xy: 261, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 576, 107 + xy: 608, 165 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 588, 107 + xy: 597, 151 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 546, 97 + xy: 277, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 467, 87 + xy: 563, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 602, 177 + xy: 293, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 485, 87 + xy: 584, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 600, 107 + xy: 609, 153 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 562, 95 + xy: 597, 139 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 503, 87 + xy: 213, 70 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 183, 58 + xy: 309, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2633,7 +2633,7 @@ selection index: -1 slider rotate: false - xy: 559, 87 + xy: 750, 347 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2728,84 +2728,84 @@ window-empty index: -1 beam rotate: false - xy: 500, 61 + xy: 221, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 510, 61 + xy: 305, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 711, 270 + xy: 271, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 711, 260 + xy: 355, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 433, 49 + xy: 545, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 443, 49 + xy: 791, 438 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 833, 442 + xy: 650, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 843, 443 + xy: 660, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 699, 230 + xy: 703, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 709, 230 + xy: 700, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 700, 188 + xy: 707, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 710, 210 + xy: 707, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 91e95d302b..735779d980 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 45edfc36c1..6dc1ec65d0 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Mar 14 20:14:54 EDT 2018 +#Wed Mar 14 22:59:39 EDT 2018 version=release -androidBuildCode=500 +androidBuildCode=520 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 562bc2fda7..2519652677 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -66,9 +66,7 @@ public class Logic extends Module { state.lastUpdated = state.wave + 1; } - for(EnemySpawn spawn : spawns){ - //TODO spawn enemies for that spawnpoint - } + //TODO spawn enemies state.wave ++; state.wavetime = wavespace * state.difficulty.timeScaling; diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 8a90ebf503..0e03756466 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -184,8 +184,8 @@ public class Renderer extends RendererModule{ Graphics.shader(Shaders.outline, false); Entities.draw(enemyGroup); - Entities.draw(playerGroup, p -> !p.mech.flying); Graphics.shader(); + Entities.draw(playerGroup, p -> !p.mech.flying); Entities.draw(Entities.defaultGroup()); diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index a878be07f2..02a19cacdd 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -45,6 +45,7 @@ public class Player extends Unit{ public int clientid = -1; public boolean isLocal = false; public Timer timer = new Timer(4); + public float footRotation, walktime; private Vector2 movement = new Vector2(); private Translator tr = new Translator(); @@ -116,35 +117,46 @@ public class Player extends Unit{ @Override public void drawSmooth(){ if((debug && (!showPlayer || !showUI)) || dead) return; + + Graphics.beginShaders(Shaders.outline); + boolean snap = snapCamera && Settings.getBool("smoothcam") && Settings.getBool("pixelate") && isLocal; - String mname = "mech-" + mech.name; + String mname = mech.name; Shaders.outline.color.set(getColor()); Shaders.outline.lighten = 0f; - Shaders.outline.region = Draw.region(mname); - Shaders.outline.apply(); + float px = x, py =y; + + if(snap){ + x = (int)x; + y = (int)y; + } + + float ft = Mathf.sin(walktime, 6f, 2f); + + for(int i : Mathf.signs){ + tr.trns(footRotation, ft * i); + Draw.rect(mname + "-leg", x + tr.x, y + tr.y, 12f * i, 12f - Mathf.clamp(ft*i, 0, 2), footRotation- 90); + } + + Draw.rect(mname + "-base", x, y,footRotation- 90); + + Draw.rect(mname, x, y, rotation -90); for (int i : Mathf.signs) { Weapon weapon = i < 0 ? weaponLeft : weaponRight; - tr.trns(rotation - 90, 3*i, 2); + tr.trns(rotation - 90, 4*i, 3); float w = i > 0 ? -8 : 8; - if(snap){ - Draw.rect(weapon.name + "-equip", (int)x + tr.x, (int)y + tr.y, w, 8, rotation - 90); - }else{ - Draw.rect(weapon.name + "-equip", x + tr.x, y + tr.y, w, 8, rotation - 90); - } + Draw.rect(weapon.name + "-equip", x + tr.x, y + tr.y, w, 8, rotation - 90); } - if(snap){ - Draw.rect(mname, (int)x, (int)y, rotation -90); - }else{ - Draw.rect(mname, x, y, rotation -90); - } + Graphics.endShaders(); - Graphics.flush(); + x = px; + y = py; } @Override @@ -224,9 +236,15 @@ public class Player extends Unit{ y += movement.y*Timers.delta(); } + if(!movement.isZero()){ + walktime += Timers.delta(); + footRotation = Mathf.slerpDelta(footRotation, movement.angle(), 0.13f); + } + if(!shooting){ - if(!movement.isZero()) + if(!movement.isZero()) { rotation = Mathf.slerpDelta(rotation, movement.angle(), 0.13f); + } }else{ float angle = Angles.mouseAngle(x, y); this.rotation = Mathf.slerpDelta(this.rotation, angle, 0.1f); diff --git a/core/src/io/anuke/mindustry/resource/Mech.java b/core/src/io/anuke/mindustry/resource/Mech.java index 44726ba3af..65f226038c 100644 --- a/core/src/io/anuke/mindustry/resource/Mech.java +++ b/core/src/io/anuke/mindustry/resource/Mech.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.resource; public class Mech extends Upgrade{ public static final Mech - standard = new Mech("standard", false), + standard = new Mech("standard-mech", false), standardShip = new Mech("standard-ship", true); public boolean flying; diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index 5023ecc2a3..def05e2203 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -96,11 +96,10 @@ public class PlayerListFragment implements Fragment{ button.margin(5).marginBottom(10); Stack stack = new Stack(); - BorderImage image = new BorderImage(Draw.region("mech-" + player.mech.name), 3f); + BorderImage image = new BorderImage(Draw.region(player.mech.name), 3f); stack.add(image); - stack.add(new Element(){ public void draw(){ float s = getWidth() / 12f;