diff --git a/core/assets-raw/sprites/blocks/block-2x2.png b/core/assets-raw/sprites/blocks/block-2x2.png index e8651c2bd8..1616811924 100644 Binary files a/core/assets-raw/sprites/blocks/block-2x2.png and b/core/assets-raw/sprites/blocks/block-2x2.png differ diff --git a/core/assets-raw/sprites/blocks/block-3x3.png b/core/assets-raw/sprites/blocks/block-3x3.png index 29553385c1..2752d719a0 100644 Binary files a/core/assets-raw/sprites/blocks/block-3x3.png and b/core/assets-raw/sprites/blocks/block-3x3.png differ diff --git a/core/assets-raw/sprites/ui/icon-quit.png b/core/assets-raw/sprites/ui/icon-quit.png new file mode 100644 index 0000000000..dc4f747a45 Binary files /dev/null and b/core/assets-raw/sprites/ui/icon-quit.png differ diff --git a/core/assets-raw/sprites/ui/icon-save.png b/core/assets-raw/sprites/ui/icon-save.png new file mode 100644 index 0000000000..f05dfa89d2 Binary files /dev/null and b/core/assets-raw/sprites/ui/icon-save.png differ diff --git a/core/assets/maps/arena.png b/core/assets/maps/arena.png new file mode 100644 index 0000000000..9755ab4f8a Binary files /dev/null and b/core/assets/maps/arena.png differ diff --git a/core/assets/maps/volcanic.png b/core/assets/maps/caldera.png similarity index 100% rename from core/assets/maps/volcanic.png rename to core/assets/maps/caldera.png diff --git a/core/assets/maps/rooms.png b/core/assets/maps/caves.png similarity index 100% rename from core/assets/maps/rooms.png rename to core/assets/maps/caves.png diff --git a/core/assets/maps/fortress.png b/core/assets/maps/fortress.png index 0a95a595d5..6b977c13de 100644 Binary files a/core/assets/maps/fortress.png and b/core/assets/maps/fortress.png differ diff --git a/core/assets/maps/islands.png b/core/assets/maps/islands.png new file mode 100644 index 0000000000..54fe10d40d Binary files /dev/null and b/core/assets/maps/islands.png differ diff --git a/core/assets/maps/maze.png b/core/assets/maps/maze.png index 5e681efa2e..ffab959f20 100644 Binary files a/core/assets/maps/maze.png and b/core/assets/maps/maze.png differ diff --git a/core/assets/maps/maze2.png b/core/assets/maps/maze2.png deleted file mode 100644 index 82684d1761..0000000000 Binary files a/core/assets/maps/maze2.png and /dev/null differ diff --git a/core/assets/maps/maze3.png b/core/assets/maps/maze3.png deleted file mode 100644 index 82684d1761..0000000000 Binary files a/core/assets/maps/maze3.png and /dev/null differ diff --git a/core/assets/maps/maze4.png b/core/assets/maps/maze4.png deleted file mode 100644 index 82684d1761..0000000000 Binary files a/core/assets/maps/maze4.png and /dev/null differ diff --git a/core/assets/maps/maze5.png b/core/assets/maps/maze5.png deleted file mode 100644 index 82684d1761..0000000000 Binary files a/core/assets/maps/maze5.png and /dev/null differ diff --git a/core/assets/maps/out-1512092193155.png b/core/assets/maps/out-1512092193155.png new file mode 100644 index 0000000000..fcfcaced42 Binary files /dev/null and b/core/assets/maps/out-1512092193155.png differ diff --git a/core/assets/maps/out-1512096271461.png b/core/assets/maps/out-1512096271461.png new file mode 100644 index 0000000000..399ec16f15 Binary files /dev/null and b/core/assets/maps/out-1512096271461.png differ diff --git a/core/assets/maps/rooms_black.png b/core/assets/maps/rooms_black.png deleted file mode 100644 index 405da33501..0000000000 Binary files a/core/assets/maps/rooms_black.png and /dev/null differ diff --git a/core/assets/maps/scorch.png b/core/assets/maps/scorch.png new file mode 100644 index 0000000000..9dfefc47d7 Binary files /dev/null and b/core/assets/maps/scorch.png differ diff --git a/core/assets/maps/spiral.png b/core/assets/maps/spiral.png new file mode 100644 index 0000000000..dbe80a5de1 Binary files /dev/null and b/core/assets/maps/spiral.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 269a5d02c0..ffc2d4d1c5 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -62,28 +62,28 @@ blocks/blackstoneblock1 index: -1 blocks/blackstoneblock2 rotate: false - xy: 317, 173 + xy: 439, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock3 rotate: false - xy: 315, 163 + xy: 451, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneedge rotate: false - xy: 263, 8 + xy: 295, 8 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/block rotate: false - xy: 397, 214 + xy: 449, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -111,105 +111,105 @@ blocks/chainturret index: -1 blocks/chainturret-icon rotate: false - xy: 358, 220 + xy: 466, 397 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/coal1 rotate: false - xy: 312, 130 + xy: 449, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 312, 120 + xy: 449, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 314, 110 + xy: 449, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 314, 100 + xy: 449, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 314, 90 + xy: 449, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 314, 80 + xy: 449, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 314, 70 + xy: 449, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 314, 60 + xy: 449, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 314, 50 + xy: 449, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 314, 40 + xy: 439, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 314, 30 + xy: 449, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 325, 209 + xy: 317, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 325, 199 + xy: 315, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 325, 189 + xy: 315, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,70 +223,70 @@ blocks/core index: -1 blocks/cross rotate: false - xy: 335, 211 + xy: 480, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 345, 211 + xy: 478, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 335, 201 + xy: 490, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 335, 191 + xy: 488, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 345, 201 + xy: 500, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 345, 191 + xy: 500, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtblock rotate: false - xy: 355, 210 + xy: 312, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtedge rotate: false - xy: 277, 8 + xy: 411, 229 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/doubleturret rotate: false - xy: 452, 411 + xy: 370, 220 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/duriumwall rotate: false - xy: 365, 210 + xy: 312, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,287 +300,287 @@ blocks/duriumwall-large index: -1 blocks/duriumwall-large-icon rotate: false - xy: 375, 210 + xy: 312, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/flameturret rotate: false - xy: 452, 399 + xy: 216, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/fluxpump rotate: false - xy: 365, 200 + xy: 314, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 375, 200 + xy: 314, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 385, 206 + xy: 314, 80 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 355, 190 + xy: 314, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock-edge-0 rotate: false - xy: 385, 196 + xy: 314, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock-edge-1 rotate: false - xy: 395, 204 + xy: 314, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock-edge-2 rotate: false - xy: 395, 194 + xy: 325, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock-edge-3 rotate: false - xy: 385, 186 + xy: 325, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock1 rotate: false - xy: 365, 190 + xy: 314, 60 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 375, 190 + xy: 314, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 411, 229 + xy: 474, 465 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/ice1 rotate: false - xy: 395, 184 + xy: 325, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice2 rotate: false - xy: 437, 351 + xy: 335, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice3 rotate: false - xy: 437, 341 + xy: 345, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iceedge rotate: false - xy: 425, 229 + xy: 456, 451 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/icerock1 rotate: false - xy: 437, 331 + xy: 335, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerock2 rotate: false - xy: 437, 321 + xy: 335, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow1 rotate: false - xy: 437, 311 + xy: 345, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow1 rotate: false - xy: 437, 311 + xy: 345, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow2 rotate: false - xy: 437, 301 + xy: 345, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow2 rotate: false - xy: 437, 301 + xy: 345, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 457, 353 + xy: 325, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 447, 333 + xy: 325, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 457, 343 + xy: 322, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 467, 353 + xy: 322, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 447, 323 + xy: 322, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 457, 333 + xy: 324, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 439, 363 + xy: 451, 371 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 467, 343 + xy: 324, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/lavaedge rotate: false - xy: 460, 465 + xy: 456, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/lavasmelter rotate: false - xy: 477, 353 + xy: 324, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquiditemjunction rotate: false - xy: 447, 313 + xy: 324, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 457, 323 + xy: 324, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 467, 333 + xy: 324, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 451, 375 + xy: 451, 359 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 451, 363 + xy: 439, 351 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 463, 375 + xy: 437, 339 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 447, 303 + xy: 324, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 447, 303 + xy: 324, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -601,7 +601,7 @@ blocks/nuclearreactor-center index: -1 blocks/nuclearreactor-icon rotate: false - xy: 467, 323 + xy: 375, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -622,308 +622,308 @@ blocks/nuclearreactor-small index: -1 blocks/oil rotate: false - xy: 477, 333 + xy: 375, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/oiledge rotate: false - xy: 474, 465 + xy: 470, 451 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/oilrefinery rotate: false - xy: 447, 293 + xy: 385, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 457, 303 + xy: 385, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 463, 363 + xy: 437, 327 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 467, 313 + xy: 375, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 477, 323 + xy: 385, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 447, 283 + xy: 332, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 457, 293 + xy: 332, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 467, 303 + xy: 332, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduit rotate: false - xy: 477, 313 + xy: 334, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduitbottom rotate: false - xy: 447, 273 + xy: 334, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduittop rotate: false - xy: 457, 283 + xy: 334, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 467, 293 + xy: 334, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 475, 375 + xy: 437, 315 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock1 rotate: false - xy: 447, 263 + xy: 334, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 457, 273 + xy: 334, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 467, 283 + xy: 334, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator rotate: false - xy: 477, 293 + xy: 334, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand1 rotate: false - xy: 447, 253 + xy: 324, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand2 rotate: false - xy: 457, 263 + xy: 334, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand3 rotate: false - xy: 467, 273 + xy: 321, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock1 rotate: false - xy: 477, 283 + xy: 331, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock2 rotate: false - xy: 457, 253 + xy: 321, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock3 rotate: false - xy: 467, 263 + xy: 331, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandedge rotate: false - xy: 456, 437 + xy: 456, 423 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/shadow rotate: false - xy: 475, 363 + xy: 437, 303 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 467, 253 + xy: 341, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 411, 217 + xy: 437, 291 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 488, 411 + xy: 466, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 488, 401 + xy: 476, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 498, 411 + xy: 486, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 423, 217 + xy: 437, 279 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/snow1 rotate: false - xy: 488, 391 + xy: 461, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow2 rotate: false - xy: 498, 401 + xy: 459, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow3 rotate: false - xy: 498, 391 + xy: 459, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock1 rotate: false - xy: 488, 381 + xy: 459, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock2 rotate: false - xy: 498, 381 + xy: 459, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock3 rotate: false - xy: 487, 371 + xy: 459, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowedge rotate: false - xy: 470, 451 + xy: 470, 423 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/sorter rotate: false - xy: 487, 361 + xy: 459, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 497, 371 + xy: 459, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 487, 351 + xy: 459, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 497, 361 + xy: 459, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -937,140 +937,140 @@ blocks/steelwall-large index: -1 blocks/steelwall-large-icon rotate: false - xy: 487, 341 + xy: 459, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone rotate: false - xy: 470, 437 + xy: 452, 409 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 497, 351 + xy: 459, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 487, 331 + xy: 459, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 497, 341 + xy: 459, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock-edge-0 rotate: false - xy: 497, 321 + xy: 337, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock-edge-1 rotate: false - xy: 487, 301 + xy: 335, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock-edge-2 rotate: false - xy: 497, 311 + xy: 464, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock-edge-3 rotate: false - xy: 487, 291 + xy: 474, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock-smooth1 rotate: false - xy: 497, 301 + xy: 484, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock1 rotate: false - xy: 487, 321 + xy: 458, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 497, 331 + xy: 498, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 487, 311 + xy: 337, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 487, 281 + xy: 463, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneedge rotate: false - xy: 456, 423 + xy: 452, 395 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stoneformer rotate: false - xy: 497, 291 + xy: 473, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 487, 271 + xy: 483, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 497, 281 + xy: 469, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 487, 261 + xy: 469, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 497, 271 + xy: 469, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1084,56 +1084,56 @@ blocks/titancannon index: -1 blocks/titancannon-icon rotate: false - xy: 385, 216 + xy: 437, 267 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 497, 261 + xy: 469, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 487, 251 + xy: 469, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 497, 251 + xy: 469, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 325, 163 + xy: 469, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 325, 153 + xy: 469, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 322, 143 + xy: 469, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 322, 133 + xy: 469, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1147,70 +1147,70 @@ blocks/titaniumwall-large index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 322, 123 + xy: 469, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 496, 421 + xy: 437, 255 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 324, 93 + xy: 468, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 324, 83 + xy: 496, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 324, 73 + xy: 347, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 324, 63 + xy: 357, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 324, 53 + xy: 347, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/wateredge rotate: false - xy: 470, 423 + xy: 466, 409 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/waveturret rotate: false - xy: 435, 217 + xy: 437, 243 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 bullet rotate: false - xy: 312, 140 + xy: 449, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1294,14 +1294,14 @@ enemies/targetenemy-t1 index: -1 enemies/enemy-t2 rotate: false - xy: 291, 8 + xy: 425, 229 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/enemy-t3 rotate: false - xy: 305, 8 + xy: 460, 465 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1392,63 +1392,63 @@ enemies/healerenemy-t3 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 282, 38 + xy: 298, 86 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 298, 102 + xy: 298, 70 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 298, 86 + xy: 298, 54 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 298, 70 + xy: 298, 38 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 298, 54 + xy: 266, 22 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 298, 38 + xy: 282, 22 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 266, 22 + xy: 298, 22 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 282, 22 + xy: 263, 6 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 298, 22 + xy: 279, 6 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1483,49 +1483,49 @@ enemyarrow index: -1 icon-coal rotate: false - xy: 437, 291 + xy: 355, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 437, 281 + xy: 365, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 437, 271 + xy: 355, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 437, 261 + xy: 365, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 437, 251 + xy: 355, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 447, 353 + xy: 365, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 447, 343 + xy: 327, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1546,35 +1546,35 @@ laserend index: -1 mechs/player rotate: false - xy: 456, 451 + xy: 470, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shell rotate: false - xy: 477, 273 + xy: 341, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 477, 263 + xy: 438, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 477, 253 + xy: 448, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 324, 113 + xy: 469, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1666,28 +1666,28 @@ ui/check-over index: -1 ui/clear rotate: false - xy: 370, 220 + xy: 358, 220 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/cursor rotate: false - xy: 484, 423 + xy: 325, 183 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 ui/icon-arrow-left rotate: false - xy: 464, 411 + xy: 484, 453 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-arrow-right rotate: false - xy: 464, 399 + xy: 484, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1729,35 +1729,35 @@ ui/icon-close-over index: -1 ui/icon-crafting rotate: false - xy: 452, 387 + xy: 484, 429 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cursor rotate: false - xy: 464, 387 + xy: 496, 457 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-defense rotate: false - xy: 476, 411 + xy: 496, 445 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-distribution rotate: false - xy: 476, 399 + xy: 496, 433 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-info rotate: false - xy: 476, 387 + xy: 452, 383 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1771,21 +1771,21 @@ ui/icon-load index: -1 ui/icon-menu rotate: false - xy: 216, 2 + xy: 484, 417 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-pause rotate: false - xy: 484, 453 + xy: 496, 421 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play rotate: false - xy: 484, 441 + xy: 309, 10 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1799,67 +1799,81 @@ ui/icon-play-2 index: -1 ui/icon-power rotate: false - xy: 484, 429 + xy: 411, 217 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-production rotate: false - xy: 496, 457 + xy: 423, 217 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-rotate +ui/icon-quit rotate: false xy: 266, 54 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-rotate-arrow +ui/icon-rotate rotate: false xy: 282, 70 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-settings - rotate: false - xy: 496, 445 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-tools +ui/icon-rotate-arrow rotate: false xy: 266, 38 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-touch - rotate: false - xy: 496, 433 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-tutorial +ui/icon-save rotate: false xy: 282, 54 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-weapon +ui/icon-settings + rotate: false + xy: 382, 216 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icon-tools + rotate: false + xy: 282, 38 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icon-touch rotate: false xy: 439, 375 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +ui/icon-tutorial + rotate: false + xy: 298, 102 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icon-weapon + rotate: false + xy: 439, 363 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 ui/logotext rotate: false xy: 359, 467 @@ -1940,7 +1954,7 @@ ui/separator index: -1 ui/slider rotate: false - xy: 382, 222 + xy: 435, 219 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2070,42 +2084,42 @@ ui/window-empty index: -1 weapons/blaster rotate: false - xy: 315, 153 + xy: 449, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/flamer rotate: false - xy: 355, 200 + xy: 314, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/mortar rotate: false - xy: 477, 343 + xy: 324, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/multigun rotate: false - xy: 457, 313 + xy: 324, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/railgun rotate: false - xy: 477, 303 + xy: 334, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 324, 103 + xy: 469, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index e74e2cf160..e716407e7c 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/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 734a962d5e..c414d658e3 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -11,8 +11,9 @@ import io.anuke.mindustry.world.World; import io.anuke.ucore.scene.ui.layout.Unit; public class Vars{ + public static final boolean testAndroid = false; //shorthand for whether or not this is running on android - public static final boolean android = (Gdx.app.getType() == ApplicationType.Android); + public static final boolean android = (Gdx.app.getType() == ApplicationType.Android) || testAndroid; //shorthand for whether or not this is running on GWT public static final boolean gwt = (Gdx.app.getType() == ApplicationType.WebGL); //how far away from the player blocks can be placed diff --git a/core/src/io/anuke/mindustry/editor/EditorControl.java b/core/src/io/anuke/mindustry/editor/EditorControl.java index 1b069383fd..0cb4046755 100644 --- a/core/src/io/anuke/mindustry/editor/EditorControl.java +++ b/core/src/io/anuke/mindustry/editor/EditorControl.java @@ -30,21 +30,24 @@ public class EditorControl extends Module{ RidgedPerlin rid = new RidgedPerlin(1, 10, 20f); RidgedPerlin rid2 = new RidgedPerlin(1, 6, 1f); RidgedPerlin rid3 = new RidgedPerlin(1, 6, 1f); - String map = "volcano"; + String map = "fortress"; ObjectMap prefs = new OrderedMap(){ { put("replace", true); put("terrain", false); + put("circle", false); put("distort", false); put("sand", false); put("grass", false); put("stone", false); put("allgrass", false); put("allsnow", false); + put("allsand", false); put("lavarock", false); put("water", false); put("oil", false); put("lavariver", false); + put("slavariver", false); put("river", false); put("iceriver", false); put("oilriver", false); @@ -102,7 +105,7 @@ public class EditorControl extends Module{ for(int x = 0; x < pixmap.getWidth(); x++){ for(int y = 0; y < pixmap.getHeight(); y++){ float dist = Vector2.dst((float) x / pixmap.getWidth(), (float) y / pixmap.getHeight(), 0.5f, 0.5f) * 2f; - double noise = sim.octaveNoise2D(5, 0.6, 1 / 150.0, x, y + 9999) + dist / 10f; + double noise = sim.octaveNoise2D(6, 0.6, 1 / 180.0, x, y + 9999) / (prefs.get("circle") ? 1.7 : 1f) + dist / 10f; if(dist > 0.8){ noise += 2 * (dist - 0.8); @@ -122,10 +125,10 @@ public class EditorControl extends Module{ int dx = 0, dy = 0; if(prefs.get("distort")){ - double intensity = 10; + double intensity = 12; double scale = 80; - double octaves = 3; - double falloff = 0.7; + double octaves = 4; + double falloff = 0.6; double nx = (sim.octaveNoise2D(octaves, falloff, 1 / scale, x, y) - 0.5f) * intensity; double ny = (sim.octaveNoise2D(octaves, falloff, 1 / scale, x, y + 99999) - 0.5f) * intensity; dx = (int) nx; @@ -148,23 +151,27 @@ public class EditorControl extends Module{ double noil = sim.octaveNoise2D(1, 1.0, 1 / 150.0, x + 9999, y) + sim.octaveNoise2D(1, 1.0, 1 / 2.0, x, y) / 290.0; if(!floor || prefs.get("replace")){ + if(prefs.get("allgrass")){ block = floor ? Blocks.grass : Blocks.grassblock; - } - - if(prefs.get("allsnow")){ + }else if(prefs.get("allsnow")){ block = floor ? Blocks.snow : Blocks.snowblock; + }else if(prefs.get("allsand")){ + block = floor ? Blocks.sand : Blocks.sandblock; + }else if(prefs.get("replace")){ + block = floor ? Blocks.stone : Blocks.stoneblock; } - + if(noise > 0.7 && prefs.get("grass")){ block = floor ? Blocks.grass : Blocks.grassblock; - }else if(noise > 0.7 && prefs.get("lavarock")){ + } + if(noise > 0.7 && prefs.get("lavarock")){ block = floor ? Blocks.blackstone : Blocks.blackstoneblock; - }else if(noise > 0.7 && prefs.get("sand")){ + } + if(noise > 0.7 && prefs.get("sand")){ block = floor ? Blocks.sand : Blocks.sandblock; - }else if(noise > 0.8 && prefs.get("stone")){ - block = floor ? Blocks.stone : Blocks.stoneblock; - }else if(prefs.get("replace") && !prefs.get("allgrass") && !prefs.get("allsnow")){ + } + if(noise > 0.8 && prefs.get("stone")){ block = floor ? Blocks.stone : Blocks.stoneblock; } } @@ -194,6 +201,16 @@ public class EditorControl extends Module{ block = Blocks.blackstone; } } + + if(floor && prefs.get("slavariver")){ + double lava = rid.getValue(x, y, 1 / 40f); + double t = 0.7; + if(lava > t){ + block = Blocks.lava; + }else if(lava > t - 0.3){ + block = Blocks.blackstone; + } + } if(floor && prefs.get("oilriver")){ double lava = rid3.getValue(x, y, 1 / 100f); diff --git a/core/src/io/anuke/mindustry/ui/LevelDialog.java b/core/src/io/anuke/mindustry/ui/LevelDialog.java index 4f90b524f6..d29c01897c 100644 --- a/core/src/io/anuke/mindustry/ui/LevelDialog.java +++ b/core/src/io/anuke/mindustry/ui/LevelDialog.java @@ -16,7 +16,7 @@ import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.scene.utils.Elements; public class LevelDialog extends FloatingDialog{ - private Map selectedMap = Map.delta; + private Map selectedMap = Map.maze; private TextureRegion region = new TextureRegion(); public LevelDialog(){ diff --git a/core/src/io/anuke/mindustry/ui/MenuDialog.java b/core/src/io/anuke/mindustry/ui/MenuDialog.java index 38a691a062..169d382e82 100644 --- a/core/src/io/anuke/mindustry/ui/MenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/MenuDialog.java @@ -8,6 +8,8 @@ import com.badlogic.gdx.Gdx; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState; import io.anuke.mindustry.core.GameState.State; +import io.anuke.ucore.scene.builders.build; +import io.anuke.ucore.scene.builders.imagebutton; import io.anuke.ucore.scene.ui.ConfirmDialog; import io.anuke.ucore.scene.ui.layout.Cell; import io.anuke.ucore.scene.ui.layout.Unit; @@ -17,58 +19,85 @@ public class MenuDialog extends FloatingDialog{ private LoadDialog load = new LoadDialog(); public boolean wasPaused = false; - public MenuDialog(){ + public MenuDialog() { super("Paused"); setup(); } - + void setup(){ - content().defaults().width(220).height(50).units(Unit.dp); - - content().addButton("Back", ()->{ - hide(); - if(!wasPaused) - GameState.set(State.playing); - }); - - shown(()->{ + shown(() -> { wasPaused = GameState.is(State.paused); GameState.set(State.paused); }); - content().row(); - content().addButton("Settings", ()->{ - ui.showPrefs(); - }); - if(!Vars.android){ - content().row(); - content().addButton("Controls", ()->{ - ui.showControls(); - }); - } - - if(Gdx.app.getType() != ApplicationType.WebGL){ - content().row(); - content().addButton("Save Game", ()->{ - save.show(); - }); - - content().row(); - content().addButton("Load Game", ()->{ - load.show(); - }); - } - - content().row(); - content().addButton("Back to menu", ()->{ - new ConfirmDialog("Confirm", "Are you sure you want to quit?", ()->{ + content().defaults().width(220).height(50).units(Unit.dp); + + content().addButton("Back", () -> { hide(); - GameState.set(State.menu); - }){{ - for(Cell cell : getButtonTable().getCells()) - cell.pad(3).size(180, 44).units(Unit.dp); - }}.show(); - }); + if(!wasPaused) + GameState.set(State.playing); + }); + + content().row(); + content().addButton("Settings", () -> { + ui.showPrefs(); + }); + + if(Gdx.app.getType() != ApplicationType.WebGL){ + content().row(); + content().addButton("Save Game", () -> { + save.show(); + }); + + content().row(); + content().addButton("Load Game", () -> { + load.show(); + }); + } + + content().row(); + content().addButton("Quit", () -> { + new ConfirmDialog("Confirm", "Are you sure you want to quit?", () -> { + hide(); + GameState.set(State.menu); + }){ + { + for(Cell cell : getButtonTable().getCells()) + cell.pad(3).size(180, 44).units(Unit.dp); + } + }.show(); + }); + + }else{ + build.begin(content()); + + content().defaults().size(120f).pad(5).units(Unit.dp); + float isize = Unit.dp.inPixels(14f*4); + + new imagebutton("icon-play-2", isize, () -> { + hide(); + if(!wasPaused) + GameState.set(State.playing); + }).text("Back").padTop(4f); + + new imagebutton("icon-tools", isize, () -> ui.showPrefs()).text("Settings").padTop(4f); + + new imagebutton("icon-save", isize, ()-> save.show()).text("Save").padTop(4f); + + new imagebutton("icon-load", isize, () -> load.show()).text("Load").padTop(4f); + + new imagebutton("icon-quit", isize, () -> { + new ConfirmDialog("Confirm", "Are you sure you want to quit?", () -> { + hide(); + GameState.set(State.menu); + }){{ + for(Cell cell : getButtonTable().getCells()) + cell.pad(3).size(180, 44).units(Unit.dp); + }}.show(); + }).text("Quit").padTop(4f); + + build.end(); + } } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index d3c556eaa0..48e2a5c79e 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -52,9 +52,7 @@ public class MenuFragment implements Fragment{ new imagebutton("icon-play-2", isize, () -> ui.showLevels()).text("Play").padTop(4f); - new imagebutton("icon-tutorial", isize, ()->{ - control.playMap(Map.tutorial); - }).text("Tutorial").padTop(4f); + new imagebutton("icon-tutorial", isize, ()-> control.playMap(Map.tutorial)).text("Tutorial").padTop(4f); new imagebutton("icon-load", isize, () -> ui.showLoadGame()).text("Load").padTop(4f); diff --git a/core/src/io/anuke/mindustry/world/Generator.java b/core/src/io/anuke/mindustry/world/Generator.java index af092a4d15..626be9cfc4 100644 --- a/core/src/io/anuke/mindustry/world/Generator.java +++ b/core/src/io/anuke/mindustry/world/Generator.java @@ -103,6 +103,10 @@ public class Generator{ floor = Blocks.snow; } + if(block == Blocks.sandblock){ + floor = Blocks.sand; + } + if(floor == Blocks.grass && Mathf.chance(0.02) && block == Blocks.air){ block = Blocks.shrub; } diff --git a/core/src/io/anuke/mindustry/world/Map.java b/core/src/io/anuke/mindustry/world/Map.java index 6bd6b63704..8dace847cb 100644 --- a/core/src/io/anuke/mindustry/world/Map.java +++ b/core/src/io/anuke/mindustry/world/Map.java @@ -3,20 +3,18 @@ package io.anuke.mindustry.world; import com.badlogic.gdx.graphics.Color; public enum Map{ - delta("Starting map."), - pit("Eck."), - canyon("the canyon"), - maze("it's okay."), - volcano("desc"), - fortress("desc", true), + maze("desc"), + fortress("desc"), sinkhole("desc"), - volcanic("desc"), - rooms("desc"), + caves("desc"), + volcano("desc", true), + caldera("desc"), + scorch("desc", Color.valueOf("e5d8bb")), desert("desc"), - grassland("desc"){{ - backgroundColor = Color.valueOf("5ab464"); - }}, + islands("desc", Color.valueOf("e5d8bb")), + grassland("desc", Color.valueOf("5ab464")), tundra("desc"), + spiral("desc", Color.valueOf("f7feff")), tutorial(false), test1(false), test2(false), @@ -43,4 +41,9 @@ public enum Map{ this.flipBase = flipBase; this.description = description; } + + private Map(String description, Color background){ + this(description); + backgroundColor = background; + } } diff --git a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java index e0d3c13d57..a864a1f224 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java @@ -10,7 +10,7 @@ public class DistributionBlocks{ conduit = new LiquidBlock("conduit"){{ fullDescription = "Basic liquid transport block. Works like a conveyor, but with liquids. " - + "Best used with pumps or other conduits."; + + "Best used with pumps or other conduits. Can be used as a bridge over liquids for enemies and players."; health = 45; }}, @@ -31,7 +31,7 @@ public class DistributionBlocks{ conveyor = new Conveyor("conveyor"){{ description = "Moves items."; fullDescription = "Basic item transport block. Moves items forward and automatically deposits them into turrets or crafters. " - + "Can be rotated."; + + "Rotatable. Can be used as a bridge over liquids for enemies and players."; }}, steelconveyor = new Conveyor("steelconveyor"){{