diff --git a/core/assets-raw/sprites/blocks/steelwall-large-icon.png b/core/assets-raw/sprites/blocks/steelwall-large-icon.png new file mode 100644 index 0000000000..a38f508587 Binary files /dev/null and b/core/assets-raw/sprites/blocks/steelwall-large-icon.png differ diff --git a/core/assets-raw/sprites/blocks/steelwall-large.png b/core/assets-raw/sprites/blocks/steelwall-large.png new file mode 100644 index 0000000000..217e30ff5c Binary files /dev/null and b/core/assets-raw/sprites/blocks/steelwall-large.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 3f0d28ffae..82f97ada09 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,14 +13,14 @@ backgrounds/background index: -1 blank rotate: false - xy: 359, 168 + xy: 383, 391 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 blocks/block rotate: false - xy: 450, 480 + xy: 240, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -55,98 +55,98 @@ blocks/chainturret-icon index: -1 blocks/coal1 rotate: false - xy: 240, 67 + xy: 343, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 371, 158 + xy: 450, 470 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 244, 9 + xy: 333, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 413, 210 + xy: 343, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 413, 200 + xy: 333, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 413, 190 + xy: 457, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 413, 180 + xy: 467, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 413, 170 + xy: 443, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 413, 160 + xy: 443, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 431, 313 + xy: 443, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 431, 303 + xy: 443, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 431, 293 + xy: 439, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 427, 281 + xy: 439, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 427, 271 + xy: 439, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -160,49 +160,49 @@ blocks/core index: -1 blocks/cross rotate: false - xy: 427, 261 + xy: 232, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 427, 251 + xy: 232, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 480, 427 + xy: 242, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 476, 415 + xy: 242, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 476, 405 + xy: 470, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 476, 395 + xy: 480, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtblock rotate: false - xy: 476, 385 + xy: 449, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -216,21 +216,21 @@ blocks/dirtedge index: -1 blocks/doubleturret rotate: false - xy: 456, 425 + xy: 470, 453 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/drill rotate: false - xy: 473, 375 + xy: 449, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/duriumwall rotate: false - xy: 473, 365 + xy: 449, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -244,182 +244,182 @@ blocks/duriumwall-large index: -1 blocks/duriumwall-large-icon rotate: false - xy: 317, 142 + xy: 476, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/flameturret rotate: false - xy: 452, 413 + xy: 456, 425 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/fluxpump rotate: false - xy: 337, 143 + xy: 476, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 347, 143 + xy: 476, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 327, 133 + xy: 490, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 337, 133 + xy: 486, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock rotate: false - xy: 347, 133 + xy: 486, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 433, 361 + xy: 486, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 417, 229 + xy: 353, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 423, 190 + xy: 483, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 423, 180 + xy: 483, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 423, 170 + xy: 493, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 423, 160 + xy: 503, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 439, 351 + xy: 493, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 437, 341 + xy: 503, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 311, 152 + xy: 449, 365 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 449, 355 + xy: 415, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/lavaedge rotate: false - xy: 460, 465 + xy: 353, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/liquiditemjunction rotate: false - xy: 459, 355 + xy: 415, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 469, 355 + xy: 415, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 435, 331 + xy: 425, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 323, 165 + xy: 445, 353 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 335, 165 + xy: 317, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 323, 153 + xy: 329, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 459, 345 + xy: 425, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 459, 345 + xy: 425, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -433,7 +433,7 @@ blocks/nuclearreactor index: -1 blocks/nuclearreactor-icon rotate: false - xy: 479, 355 + xy: 343, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -447,315 +447,329 @@ blocks/nuclearreactor-small index: -1 blocks/oil rotate: false - xy: 479, 345 + xy: 409, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/oiledge rotate: false - xy: 474, 465 + xy: 399, 179 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/oilrefinery rotate: false - xy: 359, 146 + xy: 443, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 357, 136 + xy: 301, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 347, 165 + xy: 341, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 381, 151 + xy: 439, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 391, 151 + xy: 449, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 401, 151 + xy: 433, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 371, 148 + xy: 443, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 411, 150 + xy: 453, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduit rotate: false - xy: 421, 150 + xy: 435, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduitbottom rotate: false - xy: 483, 375 + xy: 435, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduittop rotate: false - xy: 483, 365 + xy: 445, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 489, 355 + xy: 435, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 335, 153 + xy: 230, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock rotate: false - xy: 357, 126 + xy: 445, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 381, 141 + xy: 455, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2shadow rotate: false - xy: 391, 141 + xy: 455, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow rotate: false - xy: 401, 141 + xy: 455, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 411, 140 + xy: 435, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator rotate: false - xy: 421, 140 + xy: 445, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shadow rotate: false - xy: 347, 153 + xy: 242, 23 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 437, 273 + xy: 425, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 449, 365 + xy: 464, 413 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 301, 124 + xy: 445, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 311, 123 + xy: 455, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 321, 123 + xy: 425, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 461, 365 + xy: 464, 401 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/sorter rotate: false - xy: 331, 123 + xy: 435, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 341, 123 + xy: 445, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 447, 335 + xy: 455, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 457, 335 + xy: 252, 13 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +blocks/steelwall-large + rotate: false + xy: 265, 132 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +blocks/steelwall-large-icon + rotate: false + xy: 252, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone rotate: false - xy: 456, 437 + xy: 474, 465 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 467, 335 + xy: 457, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 477, 335 + xy: 467, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 487, 335 + xy: 477, 359 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock rotate: false - xy: 431, 150 + xy: 477, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 431, 140 + xy: 487, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 490, 431 + xy: 487, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 490, 421 + xy: 497, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneedge rotate: false - xy: 470, 451 + xy: 456, 451 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 486, 411 + xy: 497, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 486, 401 + xy: 477, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 486, 391 + xy: 487, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 496, 411 + xy: 497, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -769,140 +783,140 @@ blocks/titancannon index: -1 blocks/titancannon-icon rotate: false - xy: 232, 7 + xy: 464, 389 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 496, 401 + xy: 419, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 496, 391 + xy: 487, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 493, 381 + xy: 497, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 503, 381 + xy: 246, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 493, 371 + xy: 256, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 503, 371 + xy: 266, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 499, 361 + xy: 276, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall-large rotate: false - xy: 230, 77 + xy: 317, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 499, 351 + xy: 286, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 359, 156 + xy: 461, 377 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 367, 136 + xy: 331, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 367, 126 + xy: 341, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 377, 131 + xy: 351, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 387, 131 + xy: 256, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 397, 131 + xy: 266, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/wateredge rotate: false - xy: 470, 437 + xy: 456, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/waveturret rotate: false - xy: 242, 19 + xy: 461, 365 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 bullet rotate: false - xy: 450, 470 + xy: 450, 480 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 417, 220 + xy: 311, 150 size: 8, 7 orig: 8, 7 offset: 0, 0 @@ -930,49 +944,49 @@ enemies/blastenemy-t1 index: -1 enemies/blastenemy-t2 rotate: false - xy: 433, 371 + xy: 317, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t3 rotate: false - xy: 301, 134 + xy: 335, 209 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t1 rotate: false - xy: 385, 225 + xy: 317, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t2 rotate: false - xy: 401, 225 + xy: 433, 371 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t3 rotate: false - xy: 317, 209 + xy: 301, 134 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t1 rotate: false - xy: 317, 193 + xy: 311, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/targetenemy-t1 rotate: false - xy: 317, 193 + xy: 311, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -993,203 +1007,203 @@ enemies/enemy-t3 index: -1 enemies/fastenemy-t1 rotate: false - xy: 333, 209 + xy: 385, 225 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t2 rotate: false - xy: 317, 177 + xy: 401, 225 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t3 rotate: false - xy: 333, 193 + xy: 351, 209 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t1 rotate: false - xy: 333, 177 + xy: 367, 216 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t2 rotate: false - xy: 349, 209 + xy: 367, 200 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t3 rotate: false - xy: 349, 193 + xy: 383, 209 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t1 rotate: false - xy: 349, 177 + xy: 399, 209 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t2 rotate: false - xy: 365, 216 + xy: 383, 193 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t3 rotate: false - xy: 365, 200 + xy: 399, 193 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 381, 161 + xy: 429, 351 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 397, 161 + xy: 417, 227 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 413, 351 + xy: 327, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 411, 335 + xy: 321, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 415, 307 + xy: 234, 51 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 415, 291 + xy: 234, 35 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 411, 275 + xy: 337, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 411, 259 + xy: 367, 184 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 411, 243 + xy: 383, 177 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/titanenemy-t1 rotate: false - xy: 265, 132 + xy: 283, 132 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t2 rotate: false - xy: 283, 132 + xy: 230, 95 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t3 rotate: false - xy: 230, 95 + xy: 230, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 317, 133 + xy: 367, 175 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 icon-coal rotate: false - xy: 429, 351 + xy: 486, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 427, 341 + xy: 496, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 246, 57 + xy: 496, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 246, 47 + xy: 496, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 246, 37 + xy: 496, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 423, 210 + xy: 473, 379 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 423, 200 + xy: 473, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1210,35 +1224,35 @@ laserend index: -1 mechs/player rotate: false - xy: 456, 451 + xy: 460, 465 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shell rotate: false - xy: 437, 283 + xy: 455, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 437, 263 + xy: 415, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 437, 253 + xy: 435, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 499, 341 + xy: 311, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1337,35 +1351,35 @@ ui/clear index: -1 ui/cursor rotate: false - xy: 359, 171 + xy: 468, 425 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 ui/icon-arrow-left rotate: false - xy: 468, 425 + xy: 452, 413 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-arrow-right rotate: false - xy: 452, 401 + xy: 470, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cancel rotate: false - xy: 365, 184 + xy: 413, 351 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-check rotate: false - xy: 381, 209 + xy: 411, 335 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1393,7 +1407,7 @@ ui/icon-close-over index: -1 ui/icon-crafting rotate: false - xy: 464, 413 + xy: 452, 401 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1407,119 +1421,119 @@ ui/icon-cursor index: -1 ui/icon-defense rotate: false - xy: 464, 401 + xy: 449, 377 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-distribution rotate: false - xy: 464, 389 + xy: 333, 175 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-info rotate: false - xy: 449, 377 + xy: 435, 323 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-load rotate: false - xy: 381, 193 + xy: 415, 307 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-menu rotate: false - xy: 461, 377 + xy: 431, 311 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-pause rotate: false - xy: 484, 453 + xy: 431, 299 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play rotate: false - xy: 484, 441 + xy: 431, 287 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play-2 rotate: false - xy: 397, 209 + xy: 415, 291 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-power rotate: false - xy: 234, 55 + xy: 427, 275 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-production rotate: false - xy: 234, 43 + xy: 427, 263 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-rotate rotate: false - xy: 397, 193 + xy: 411, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate-arrow rotate: false - xy: 381, 177 + xy: 411, 259 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-settings rotate: false - xy: 234, 31 + xy: 427, 251 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-tools rotate: false - xy: 397, 177 + xy: 411, 243 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-touch rotate: false - xy: 230, 19 + xy: 482, 453 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-tutorial rotate: false - xy: 365, 168 + xy: 427, 335 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-weapon rotate: false - xy: 311, 164 + xy: 482, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1590,21 +1604,21 @@ ui/scroll-knob-vertical index: -1 ui/selection rotate: false - xy: 362, 168 + xy: 311, 131 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/separator rotate: false - xy: 473, 386 + xy: 314, 131 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/slider rotate: false - xy: 443, 361 + xy: 383, 394 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -1741,35 +1755,35 @@ weapons/blaster index: -1 weapons/flamer rotate: false - xy: 327, 143 + xy: 476, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/mortar rotate: false - xy: 449, 345 + xy: 425, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/multigun rotate: false - xy: 469, 345 + xy: 399, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/railgun rotate: false - xy: 489, 345 + xy: 445, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 497, 331 + xy: 321, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 21be9ff2c5..7b3e02fb24 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/resource/Recipe.java b/core/src/io/anuke/mindustry/resource/Recipe.java index b5109c0360..f34109aa42 100644 --- a/core/src/io/anuke/mindustry/resource/Recipe.java +++ b/core/src/io/anuke/mindustry/resource/Recipe.java @@ -14,6 +14,7 @@ public enum Recipe{ titaniumwall(defense, DefenseBlocks.titaniumwall, stack(Item.titanium, 2)), duriumwall(defense, DefenseBlocks.diriumwall, stack(Item.dirium, 2)), //compositewall(defense, DefenseBlocks.compositewall, stack(Item.dirium, 2), stack(Item.titanium, 2), stack(Item.steel, 2), stack(Item.iron, 2)), + steelwalllarge(defense, DefenseBlocks.steelwalllarge, stack(Item.steel, 8)), titaniumwalllarge(defense, DefenseBlocks.titaniumwalllarge, stack(Item.titanium, 8)), duriumwalllarge(defense, DefenseBlocks.diriumwalllarge, stack(Item.dirium, 8)), titaniumshieldwall(defense, DefenseBlocks.titaniumshieldwall, stack(Item.titanium, 2)), diff --git a/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java index ceb32fae3e..e2d092e07a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java @@ -37,6 +37,11 @@ public class DefenseBlocks{ health = 270; formalName = "composite wall"; }}, + steelwalllarge = new Wall("steelwall-large"){{ + health = 110*4; + formalName = "large steel wall"; + width = height = 2; + }}, titaniumwalllarge = new Wall("titaniumwall-large"){{ health = 150*4; formalName = "large titanium wall"; diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index e407c32552..c288260fcc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -165,6 +165,25 @@ public class ProductionBlocks{ } }, + //TODO + lavacompressor = new LiquidCrafter("lavacompressor"){ + { + formalName = "lava compressor"; + inputLiquid = Liquid.lava; + liquidAmount = 40f; + liquidCapacity = 41f; + purifyTime = 25; + output = Item.iron; + health = 80; + craftEffect = Fx.purifystone; + } + + @Override + public String description(){ + return "Converts stone + lava to iron."; + } + }, + stonedrill = new Drill("stonedrill"){{ resource = Blocks.stone; result = Item.stone;