diff --git a/core/assets-raw/sprites/units/vtol-booster-1.png b/core/assets-raw/sprites/units/vtol-booster-1.png new file mode 100644 index 0000000000..bddcf0738a Binary files /dev/null and b/core/assets-raw/sprites/units/vtol-booster-1.png differ diff --git a/core/assets-raw/sprites/units/vtol-booster-2.png b/core/assets-raw/sprites/units/vtol-booster-2.png new file mode 100644 index 0000000000..af530d4dd1 Binary files /dev/null and b/core/assets-raw/sprites/units/vtol-booster-2.png differ diff --git a/core/assets-raw/sprites/units/vtol.png b/core/assets-raw/sprites/units/vtol.png new file mode 100644 index 0000000000..7497dee1d0 Binary files /dev/null and b/core/assets-raw/sprites/units/vtol.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 0815432157..04ab7bce5d 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -27,84 +27,84 @@ bridgeconduit-arrow index: -1 bridgeconduit-bridge rotate: false - xy: 765, 286 + xy: 787, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 849, 441 + xy: 777, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 849, 431 + xy: 787, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 849, 421 + xy: 849, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 859, 443 + xy: 849, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 869, 443 + xy: 849, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 879, 423 + xy: 879, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 909, 443 + xy: 879, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 889, 423 + xy: 889, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 899, 433 + xy: 909, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 919, 443 + xy: 889, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 899, 423 + xy: 899, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -118,98 +118,98 @@ core index: -1 junction rotate: false - xy: 1009, 417 + xy: 989, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 848, 401 + xy: 999, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 848, 391 + xy: 1009, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 848, 381 + xy: 848, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 844, 371 + xy: 848, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 844, 361 + xy: 848, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 363, 113 + xy: 846, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 373, 114 + xy: 846, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 383, 114 + xy: 846, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 393, 103 + xy: 413, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 403, 103 + xy: 363, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 413, 103 + xy: 373, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 522, 165 + xy: 383, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 532, 165 + xy: 393, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -244,77 +244,77 @@ multiplexer index: -1 overflowgate rotate: false - xy: 670, 207 + xy: 650, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 670, 197 + xy: 660, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 680, 207 + xy: 660, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 832, 347 + xy: 680, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 677, 281 + xy: 670, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 694, 271 + xy: 684, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 690, 191 + xy: 690, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 700, 201 + xy: 700, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 700, 191 + xy: 690, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 710, 201 + xy: 700, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 710, 191 + xy: 710, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -328,7 +328,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 724, 181 + xy: 694, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -342,7 +342,7 @@ vault index: -1 vault-icon rotate: false - xy: 724, 171 + xy: 704, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,56 +356,56 @@ weaponfactory index: -1 blackrock1 rotate: false - xy: 767, 326 + xy: 767, 304 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 767, 316 + xy: 767, 294 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 767, 306 + xy: 778, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 777, 337 + xy: 778, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 777, 327 + xy: 767, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 777, 317 + xy: 788, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 777, 307 + xy: 788, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 767, 296 + xy: 778, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -419,49 +419,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 859, 423 + xy: 859, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 869, 433 + xy: 879, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 889, 443 + xy: 859, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 929, 443 + xy: 899, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 909, 423 + xy: 909, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 919, 433 + xy: 929, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 939, 443 + xy: 909, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -475,35 +475,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 949, 433 + xy: 959, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 969, 443 + xy: 939, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 949, 423 + xy: 949, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 959, 433 + xy: 969, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 979, 443 + xy: 949, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -517,21 +517,21 @@ grassedge index: -1 ice1 rotate: false - xy: 959, 423 + xy: 959, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 969, 433 + xy: 979, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 989, 443 + xy: 959, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,70 +545,70 @@ iceedge index: -1 icerock1 rotate: false - xy: 999, 443 + xy: 969, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 969, 423 + xy: 989, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 979, 433 + xy: 999, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 979, 433 + xy: 999, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 979, 423 + xy: 969, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 979, 423 + xy: 969, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 989, 423 + xy: 979, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 999, 433 + xy: 989, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 1009, 437 + xy: 989, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 393, 113 + xy: 842, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -622,63 +622,63 @@ lavaedge index: -1 lead1 rotate: false - xy: 413, 113 + xy: 373, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 363, 103 + xy: 383, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 373, 104 + xy: 393, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 520, 155 + xy: 522, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 530, 155 + xy: 532, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 540, 155 + xy: 542, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 550, 155 + xy: 552, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 650, 204 + xy: 520, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 650, 194 + xy: 530, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -692,14 +692,14 @@ metalflooredge index: -1 mossblock rotate: false - xy: 650, 184 + xy: 540, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 660, 207 + xy: 550, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -713,56 +713,56 @@ oiledge index: -1 rock1 rotate: false - xy: 674, 261 + xy: 717, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 684, 261 + xy: 674, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 684, 251 + xy: 694, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 694, 261 + xy: 674, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 704, 271 + xy: 674, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 684, 241 + xy: 684, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 694, 251 + xy: 694, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 704, 261 + xy: 704, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -776,56 +776,56 @@ sandedge index: -1 shrub rotate: false - xy: 704, 241 + xy: 704, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 714, 251 + xy: 714, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 714, 231 + xy: 714, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 690, 221 + xy: 704, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 690, 211 + xy: 714, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 700, 221 + xy: 714, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 690, 201 + xy: 690, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 700, 211 + xy: 690, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -839,7 +839,7 @@ snowedge index: -1 space rotate: false - xy: 710, 211 + xy: 710, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -853,42 +853,42 @@ spaceedge index: -1 stone1 rotate: false - xy: 854, 351 + xy: 798, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 654, 174 + xy: 808, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 664, 177 + xy: 818, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 674, 177 + xy: 808, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 654, 164 + xy: 818, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 664, 167 + xy: 828, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -902,84 +902,84 @@ stoneedge index: -1 thorium1 rotate: false - xy: 694, 171 + xy: 852, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 704, 181 + xy: 848, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 704, 171 + xy: 848, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 714, 181 + xy: 654, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 714, 171 + xy: 664, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 694, 161 + xy: 674, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 423, 133 + xy: 714, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 818, 353 + xy: 804, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 787, 315 + xy: 788, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 787, 315 + xy: 788, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 889, 433 + xy: 899, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 909, 433 + xy: 919, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1007,21 +1007,21 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 939, 433 + xy: 949, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 660, 187 + xy: 650, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 743, 298 + xy: 755, 298 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1056,7 +1056,7 @@ rubble-2-1 index: -1 shadow rotate: false - xy: 755, 310 + xy: 731, 285 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1077,14 +1077,14 @@ batterylarge index: -1 combustiongenerator rotate: false - xy: 869, 423 + xy: 869, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 879, 433 + xy: 889, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,7 +1154,7 @@ largesolarpanel index: -1 liquidcombustiongenerator rotate: false - xy: 383, 104 + xy: 403, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1182,14 +1182,14 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 670, 187 + xy: 670, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 680, 197 + xy: 660, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1203,28 +1203,28 @@ powernodelarge index: -1 powervoid rotate: false - xy: 680, 187 + xy: 670, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 674, 251 + xy: 674, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 674, 241 + xy: 684, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 694, 241 + xy: 704, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1238,7 +1238,7 @@ shieldprojector index: -1 solarpanel rotate: false - xy: 710, 221 + xy: 700, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1259,7 +1259,7 @@ teleporter-top index: -1 thermalgenerator rotate: false - xy: 694, 181 + xy: 1009, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1371,63 +1371,63 @@ cultivator-top index: -1 extractor rotate: false - xy: 959, 443 + xy: 929, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 939, 423 + xy: 939, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 989, 433 + xy: 979, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 999, 423 + xy: 999, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 1009, 427 + xy: 1009, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 1009, 427 + xy: 1009, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 849, 411 + xy: 999, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 989, 413 + xy: 969, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 999, 413 + xy: 979, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1455,21 +1455,21 @@ laserdrill-top index: -1 lavasmelter rotate: false - xy: 403, 113 + xy: 363, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 542, 165 + xy: 403, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 552, 165 + xy: 413, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1532,7 +1532,7 @@ oilextractor-top index: -1 oilrefinery rotate: false - xy: 660, 197 + xy: 650, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1616,63 +1616,63 @@ siliconsmelter-top index: -1 pulverizer rotate: false - xy: 687, 281 + xy: 680, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 697, 281 + xy: 680, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 707, 281 + xy: 677, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 717, 281 + xy: 687, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 674, 271 + xy: 697, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 684, 271 + xy: 707, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 714, 271 + xy: 684, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 684, 231 + xy: 694, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 704, 231 + xy: 694, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1686,56 +1686,56 @@ siliconsmelter index: -1 smelter rotate: false - xy: 714, 241 + xy: 704, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 1009, 407 + xy: 700, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 854, 371 + xy: 710, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 854, 361 + xy: 710, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 674, 167 + xy: 828, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 684, 177 + xy: 838, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 704, 161 + xy: 654, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 714, 161 + xy: 664, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1770,7 +1770,7 @@ waterextractor-top index: -1 block-1 rotate: false - xy: 787, 325 + xy: 777, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1812,7 +1812,7 @@ chainturret index: -1 doubleturret rotate: false - xy: 949, 443 + xy: 919, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1882,14 +1882,14 @@ gatlingturret-heat index: -1 laserturret rotate: false - xy: 743, 334 + xy: 743, 322 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret-heat rotate: false - xy: 755, 334 + xy: 743, 310 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1924,35 +1924,35 @@ missileturret index: -1 railgunturret rotate: false - xy: 743, 322 + xy: 755, 322 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret-heat rotate: false - xy: 743, 310 + xy: 743, 298 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 755, 322 + xy: 755, 310 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 755, 298 + xy: 743, 286 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret-heat rotate: false - xy: 731, 285 + xy: 755, 286 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2008,14 +2008,14 @@ walkerfactory-top-open index: -1 compositewall rotate: false - xy: 899, 443 + xy: 869, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 919, 423 + xy: 919, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2036,14 +2036,14 @@ door-large-open index: -1 door-open rotate: false - xy: 929, 433 + xy: 939, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 929, 423 + xy: 929, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2057,14 +2057,14 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 859, 413 + xy: 1009, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 844, 351 + xy: 798, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2078,21 +2078,21 @@ steelwall-large index: -1 stonewall rotate: false - xy: 684, 167 + xy: 838, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 720, 221 + xy: 674, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 720, 211 + xy: 684, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2162,105 +2162,105 @@ laserfull index: -1 shell rotate: false - xy: 743, 287 + xy: 767, 335 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 754, 287 + xy: 767, 324 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 694, 231 + xy: 694, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 869, 413 + xy: 849, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 879, 413 + xy: 859, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 889, 413 + xy: 869, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 899, 413 + xy: 879, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 909, 413 + xy: 889, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 919, 413 + xy: 899, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 929, 413 + xy: 909, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 939, 413 + xy: 919, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 949, 413 + xy: 929, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 959, 413 + xy: 939, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 969, 413 + xy: 949, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 979, 413 + xy: 959, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2492,28 +2492,28 @@ icon-arrow index: -1 icon-arrow-down rotate: false - xy: 832, 369 + xy: 818, 341 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 832, 357 + xy: 830, 341 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 804, 341 + xy: 638, 304 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 816, 341 + xy: 638, 292 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2541,7 +2541,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 638, 304 + xy: 650, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2576,21 +2576,21 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 638, 292 + xy: 662, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 650, 289 + xy: 650, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 662, 289 + xy: 662, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2611,7 +2611,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 650, 277 + xy: 650, 265 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2709,14 +2709,14 @@ icon-grid index: -1 icon-hold rotate: false - xy: 662, 277 + xy: 650, 253 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 650, 265 + xy: 662, 265 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2737,7 +2737,7 @@ icon-host index: -1 icon-info rotate: false - xy: 650, 253 + xy: 650, 241 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2765,7 +2765,7 @@ icon-link index: -1 icon-liquid rotate: false - xy: 662, 265 + xy: 662, 253 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2800,14 +2800,14 @@ icon-loading index: -1 icon-logic rotate: false - xy: 650, 241 + xy: 662, 241 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 662, 253 + xy: 660, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2821,14 +2821,14 @@ icon-menu-large index: -1 icon-none rotate: false - xy: 662, 241 + xy: 205, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 660, 229 + xy: 654, 217 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2856,7 +2856,7 @@ icon-pick index: -1 icon-play rotate: false - xy: 205, 8 + xy: 666, 217 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2870,21 +2870,21 @@ icon-play-2 index: -1 icon-players rotate: false - xy: 654, 217 + xy: 672, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 666, 217 + xy: 678, 217 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 672, 229 + xy: 731, 333 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2975,7 +2975,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 678, 217 + xy: 731, 321 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2996,14 +2996,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 731, 333 + xy: 731, 309 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 731, 321 + xy: 731, 297 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -3045,14 +3045,14 @@ icon-undo index: -1 icon-units rotate: false - xy: 731, 309 + xy: 743, 334 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 731, 297 + xy: 755, 334 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -3286,6 +3286,27 @@ standard-mech-leg orig: 12, 12 offset: 0, 0 index: -1 +vtol + rotate: false + xy: 818, 353 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +vtol-booster-1 + rotate: false + xy: 832, 367 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +vtol-booster-2 + rotate: false + xy: 832, 353 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 beam rotate: false xy: 790, 373 @@ -3295,77 +3316,77 @@ beam index: -1 beam-equip rotate: false - xy: 767, 336 + xy: 767, 314 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 777, 297 + xy: 777, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 787, 335 + xy: 777, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 859, 433 + xy: 859, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 879, 443 + xy: 869, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 704, 251 + xy: 714, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 714, 261 + xy: 684, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 720, 201 + xy: 684, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 720, 191 + xy: 694, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 724, 161 + xy: 704, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 423, 143 + xy: 714, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 4292af6293..c711641c28 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 f67546d8c5..9b3e7182db 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sun Apr 22 16:19:48 EDT 2018 +#Mon Apr 23 21:27:41 EDT 2018 version=pre-alpha -androidBuildCode=1087 +androidBuildCode=1090 name=Mindustry code=4.0 build=custom build diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index c393d49809..f127240bef 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -1,28 +1,40 @@ package io.anuke.mindustry.content; import io.anuke.mindustry.content.bullets.TurretBullets; +import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.resource.AmmoType; public class AmmoTypes { public static final AmmoType - basicIron = new AmmoType(Items.iron, TurretBullets.basicIron, 5, 0.9f), + basicIron = new AmmoType(Items.iron, TurretBullets.basicIron, 5){{ + shootEffect = ShootFx.shootSmall; + smokeEffect = ShootFx.shootSmallSmoke; + }}, - basicSteel = new AmmoType(Items.steel, TurretBullets.basicSteel, 5, 0.8f), + basicSteel = new AmmoType(Items.steel, TurretBullets.basicSteel, 5){{ + shootEffect = ShootFx.shootBig; + smokeEffect = ShootFx.shootBigSmoke; + }}, - basicFlame = new AmmoType(Liquids.oil, TurretBullets.basicFlame, 0.3f, 0.9f), + basicFlame = new AmmoType(Liquids.oil, TurretBullets.basicFlame, 0.3f){{ + shootEffect = ShootFx.shootSmallFlame; + }}, - basicLeadFrag = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1, 0.8f), + basicLeadFrag = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1){{ + shootEffect = ShootFx.shootBig2; + smokeEffect = ShootFx.shootBigSmoke2; + }}, lancerLaser = new AmmoType(TurretBullets.lancerLaser), lightning = new AmmoType(TurretBullets.lightning), - oil = new AmmoType(Liquids.oil, TurretBullets.oilShot, 0.3f, 1f), + oil = new AmmoType(Liquids.oil, TurretBullets.oilShot, 0.3f), - water = new AmmoType(Liquids.water, TurretBullets.waterShot, 0.3f, 1f), + water = new AmmoType(Liquids.water, TurretBullets.waterShot, 0.3f), - lava = new AmmoType(Liquids.lava, TurretBullets.lavaShot, 0.3f, 1f), + lava = new AmmoType(Liquids.lava, TurretBullets.lavaShot, 0.3f), - cryofluid = new AmmoType(Liquids.cryofluid, TurretBullets.cryoShot, 0.3f, 1f); + cryofluid = new AmmoType(Liquids.cryofluid, TurretBullets.cryoShot, 0.3f); } diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 88cb592b1e..c5909351e7 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -114,11 +114,11 @@ public class Recipes { new Recipe(liquid, LiquidBlocks.pump, stack(Items.steel, 10)), new Recipe(liquid, LiquidBlocks.fluxpump, stack(Items.steel, 10), stack(Items.densealloy, 5)), - new Recipe(units, UnitBlocks.droneFactory, stack(Items.steel, 10)), - new Recipe(units, UnitBlocks.vtolFactory, stack(Items.steel, 10)), - new Recipe(units, UnitBlocks.droneFactory, stack(Items.steel, 10)), - new Recipe(units, UnitBlocks.droneFactory, stack(Items.steel, 10)), - new Recipe(units, UnitBlocks.walkerFactory, stack(Items.steel, 10)), + //new Recipe(units, UnitBlocks.droneFactory, stack(Items.steel, 10)), + //new Recipe(units, UnitBlocks.vtolFactory, stack(Items.steel, 10)), + //new Recipe(units, UnitBlocks.droneFactory, stack(Items.steel, 10)), + //new Recipe(units, UnitBlocks.droneFactory, stack(Items.steel, 10)), + //new Recipe(units, UnitBlocks.walkerFactory, stack(Items.steel, 10)), new Recipe(units, DebugBlocks.itemSource, stack(Items.steel, 10)).setDebug(), new Recipe(units, DebugBlocks.itemVoid, stack(Items.steel, 10)).setDebug(), diff --git a/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java index 8b4666eb61..975b5e5c8b 100644 --- a/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java @@ -19,8 +19,6 @@ public class WeaponBlocks{ ammoTypes = new AmmoType[]{AmmoTypes.basicIron}; reload = 25f; restitution = 0.03f; - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; ammoUseEffect = ShootFx.shellEjectSmall; }}, @@ -32,8 +30,6 @@ public class WeaponBlocks{ restitution = 0.03f; recoil = 1.5f; burstSpacing = 6f; - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; ammoUseEffect = ShootFx.shellEjectSmall; }}, @@ -42,7 +38,6 @@ public class WeaponBlocks{ recoil = 0f; reload = 5f; shootCone = 50f; - shootEffect = ShootFx.shootSmallFlame; ammoUseEffect = ShootFx.shellEjectSmall; drawer = (tile, entity) -> { @@ -58,8 +53,6 @@ public class WeaponBlocks{ ammoEjectBack = 2f; recoil = 3f; shootShake = 2f; - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; ammoUseEffect = ShootFx.shellEjectMedium; }}, @@ -73,8 +66,6 @@ public class WeaponBlocks{ cooldown = 0.03f; recoil = 3f; shootShake = 2f; - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; ammoUseEffect = ShootFx.shellEjectBig; drawer = (tile, entity) -> { diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnitType.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnitType.java index 64b42eb9cb..746ffdba42 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnitType.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnitType.java @@ -2,9 +2,10 @@ package io.anuke.mindustry.entities.units; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.mindustry.content.bullets.TurretBullets; +import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.game.TeamInfo.TeamData; -import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Timers; @@ -21,7 +22,7 @@ public class FlyingUnitType extends UnitType { public FlyingUnitType(String name) { super(name); speed = 0.2f; - maxVelocity = 4f; + maxVelocity = 2f; drag = 0.01f; isFlying = true; } @@ -65,7 +66,7 @@ public class FlyingUnitType extends UnitType { unit.velocity.add(vec); //TODO clamp it so it doesn't glitch out at low fps if(unit.timer.get(timerReload, reload) && len < range){ - //shoot(unit, BulletType.shot, ang, 4f); + shoot(unit, TurretBullets.basicIron, unit.rotation, 4f); } } diff --git a/core/src/io/anuke/mindustry/entities/units/types/Brute.java b/core/src/io/anuke/mindustry/entities/units/types/Brute.java index 85faf3f62f..1b6ca79c5a 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Brute.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Brute.java @@ -3,7 +3,9 @@ package io.anuke.mindustry.entities.units.types; import io.anuke.mindustry.entities.units.GroundUnitType; public class Brute extends GroundUnitType { + public Brute(String name) { super(name); } + } diff --git a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java b/core/src/io/anuke/mindustry/entities/units/types/Vtol.java index 1cb8140508..e609870159 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Vtol.java @@ -4,6 +4,7 @@ import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.FlyingUnitType; import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.util.Mathf; public class Vtol extends FlyingUnitType { @@ -16,6 +17,10 @@ public class Vtol extends FlyingUnitType { Draw.alpha(unit.hitTime / Unit.hitDuration); Draw.rect(name, unit.x, unit.y, unit.rotation - 90); + for(int i : Mathf.signs){ + Draw.rect(name + "-booster-1", unit.x, unit.y, 12*i, 12, unit.rotation - 90); + Draw.rect(name + "-booster-2", unit.x, unit.y, 12*i, 12, unit.rotation - 90); + } Draw.alpha(1f); } diff --git a/core/src/io/anuke/mindustry/resource/AmmoType.java b/core/src/io/anuke/mindustry/resource/AmmoType.java index f4c8955eba..4a6f6b13ed 100644 --- a/core/src/io/anuke/mindustry/resource/AmmoType.java +++ b/core/src/io/anuke/mindustry/resource/AmmoType.java @@ -1,7 +1,9 @@ package io.anuke.mindustry.resource; import com.badlogic.gdx.utils.Array; +import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.BulletType; +import io.anuke.ucore.core.Effects.Effect; public class AmmoType { private static int lastID = 0; @@ -17,8 +19,12 @@ public class AmmoType { /**For item ammo, this is amount given per ammo item. * For liquid ammo, this is amount used per shot.*/ public final float quantityMultiplier; - /**Turret shoot speed multiplier.*/ - public final float speedMultiplier; + /**Reload speed multiplier.*/ + public float speedMultiplier = 1f; + /**Effect created when shooting.*/ + public Effect shootEffect = Fx.none; + /**Extra smoke effect created when shooting.*/ + public Effect smokeEffect = Fx.none; { this.id = (byte)(lastID++); @@ -33,20 +39,18 @@ public class AmmoType { this.speedMultiplier = 1f; } - public AmmoType(Item item, BulletType result, float multiplier, float speedMultiplier){ + public AmmoType(Item item, BulletType result, float multiplier){ this.item = item; this.liquid = null; this.bullet = result; this.quantityMultiplier = multiplier; - this.speedMultiplier = speedMultiplier; } - public AmmoType(Liquid liquid, BulletType result, float multiplier, float speedMultiplier){ + public AmmoType(Liquid liquid, BulletType result, float multiplier){ this.item = null; this.liquid = liquid; this.bullet = result; this.quantityMultiplier = multiplier; - this.speedMultiplier = speedMultiplier; } public static Array getAllTypes() { diff --git a/core/src/io/anuke/mindustry/resource/Weapon.java b/core/src/io/anuke/mindustry/resource/Weapon.java index 5a45ed467b..c1143da3c3 100644 --- a/core/src/io/anuke/mindustry/resource/Weapon.java +++ b/core/src/io/anuke/mindustry/resource/Weapon.java @@ -1,8 +1,6 @@ package io.anuke.mindustry.resource; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.entities.Bullet; -import io.anuke.mindustry.entities.BulletType; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.net.Net; @@ -16,8 +14,6 @@ import io.anuke.ucore.util.Translator; public class Weapon extends Upgrade{ /**weapon reload in frames*/ protected float reload; - /**type of bullet shot*/ - protected BulletType type; /**sound made when shooting*/ protected String shootsound = "shoot"; /**amount of shots per fire*/ @@ -37,10 +33,9 @@ public class Weapon extends Upgrade{ /**translator for vector calulations*/ protected Translator tr = new Translator(); - protected Weapon(String name, float reload, BulletType type){ + protected Weapon(String name, float reload){ super(name); this.reload = reload; - this.type = type; } public void update(Player p, boolean left){ @@ -78,7 +73,7 @@ public class Weapon extends Upgrade{ void bullet(Unit owner, float x, float y, float angle){ tr.trns(angle, 3f); - - Bullet.create(type, owner, x + tr.x, y + tr.y, angle); + //TODO implement! + //Bullet.create(type, owner, x + tr.x, y + tr.y, angle); } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java index 6426a3e4c6..d4d526746a 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java @@ -67,7 +67,9 @@ public class DebugFragment implements Fragment { row(); new button("death", () -> player.damage(99999, false)); row(); - new button("spawn", () -> new BaseUnit(UnitTypes.scout, Team.red).set(player.x, player.y).add()); + new button("spawn1", () -> new BaseUnit(UnitTypes.vtol, Team.red).set(player.x, player.y).add()); + row(); + new button("spawn2", () -> new BaseUnit(UnitTypes.scout, Team.red).set(player.x, player.y).add()); row(); }}.end(); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java index f15b25c9b2..b13ab160e0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java @@ -225,6 +225,9 @@ public abstract class Turret extends Block{ } protected void effects(Tile tile){ + Effect shootEffect = this.shootEffect == Fx.none ? peekAmmo(tile).shootEffect : this.shootEffect; + Effect smokeEffect = this.smokeEffect == Fx.none ? peekAmmo(tile).smokeEffect : this.smokeEffect; + TurretEntity entity = tile.entity(); Effects.effect(shootEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation);