diff --git a/core/assets-raw/sprites/blank.png b/core/assets-raw/sprites/blank.png new file mode 100644 index 0000000000..65099a7b1d Binary files /dev/null and b/core/assets-raw/sprites/blank.png differ diff --git a/core/assets-raw/sprites/blocks/cross.png b/core/assets-raw/sprites/blocks/cross.png new file mode 100644 index 0000000000..c3350ae4e2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/cross.png differ diff --git a/core/assets-raw/ui/logotext.png b/core/assets-raw/ui/logotext.png index 75be1b6335..bc872e39bb 100644 Binary files a/core/assets-raw/ui/logotext.png and b/core/assets-raw/ui/logotext.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 985ce3aee5..92751af94f 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -4,6 +4,13 @@ size: 512,32 format: RGBA8888 filter: Nearest,Nearest repeat: none +blank + rotate: false + xy: 13, 10 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 blocks/block rotate: false xy: 199, 23 @@ -88,48 +95,55 @@ blocks/core orig: 8, 8 offset: 0, 0 index: -1 -blocks/crucible +blocks/cross rotate: false xy: 329, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -blocks/deepwater +blocks/crucible rotate: false xy: 339, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -blocks/dirt1 +blocks/deepwater rotate: false xy: 349, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -blocks/dirt2 +blocks/dirt1 rotate: false xy: 359, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -blocks/dirt3 +blocks/dirt2 rotate: false xy: 369, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -blocks/dirtblock +blocks/dirt3 rotate: false xy: 379, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +blocks/dirtblock + rotate: false + xy: 389, 23 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 blocks/dirtedge rotate: false xy: 37, 19 @@ -146,7 +160,7 @@ blocks/doubleturret index: -1 blocks/drill rotate: false - xy: 389, 23 + xy: 399, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -160,35 +174,35 @@ blocks/flameturret index: -1 blocks/grass1 rotate: false - xy: 409, 23 + xy: 419, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 419, 23 + xy: 429, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 429, 23 + xy: 439, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock rotate: false - xy: 439, 23 + xy: 449, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 449, 23 + xy: 459, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -202,42 +216,42 @@ blocks/grassedge index: -1 blocks/iron1 rotate: false - xy: 80, 1 + xy: 90, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 90, 11 + xy: 90, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 90, 1 + xy: 100, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 100, 11 + xy: 100, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 100, 1 + xy: 110, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 110, 11 + xy: 110, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -272,28 +286,28 @@ blocks/mortarturret index: -1 blocks/mossblock rotate: false - xy: 120, 11 + xy: 120, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 120, 11 + xy: 120, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 120, 1 + xy: 130, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 130, 1 + xy: 140, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,35 +321,35 @@ blocks/repairturret index: -1 blocks/rock rotate: false - xy: 140, 11 + xy: 140, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 140, 1 + xy: 150, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2shadow rotate: false - xy: 150, 11 + xy: 150, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow rotate: false - xy: 150, 1 + xy: 160, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 160, 11 + xy: 160, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,21 +370,21 @@ blocks/shotgunturret index: -1 blocks/shrub rotate: false - xy: 160, 1 + xy: 170, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 170, 11 + xy: 170, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 170, 1 + xy: 180, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -384,21 +398,21 @@ blocks/sniperturret index: -1 blocks/steelconveyor rotate: false - xy: 180, 11 + xy: 180, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 180, 1 + xy: 190, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 190, 11 + xy: 190, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -412,49 +426,49 @@ blocks/stone index: -1 blocks/stone1 rotate: false - xy: 190, 1 + xy: 200, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 200, 13 + xy: 200, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 200, 3 + xy: 210, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock rotate: false - xy: 210, 13 + xy: 210, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 210, 3 + xy: 220, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 220, 13 + xy: 220, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 220, 3 + xy: 230, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -468,42 +482,42 @@ blocks/stoneedge index: -1 blocks/stonewall rotate: false - xy: 230, 13 + xy: 230, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 230, 3 + xy: 240, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 240, 13 + xy: 240, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 240, 3 + xy: 250, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 250, 13 + xy: 250, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 250, 3 + xy: 260, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -517,7 +531,7 @@ blocks/turret index: -1 blocks/water rotate: false - xy: 260, 13 + xy: 260, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -552,7 +566,7 @@ enemies/bossmech index: -1 enemies/fastmech rotate: false - xy: 399, 23 + xy: 409, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -566,49 +580,49 @@ enemies/firemech index: -1 enemies/mech1 rotate: false - xy: 110, 1 + xy: 120, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-coal rotate: false - xy: 459, 23 + xy: 469, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 469, 23 + xy: 479, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 479, 23 + xy: 489, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 489, 23 + xy: 499, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 499, 23 + xy: 80, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 80, 11 + xy: 80, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -629,35 +643,35 @@ laserend index: -1 player rotate: false - xy: 130, 11 + xy: 130, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapon-blaster rotate: false - xy: 260, 3 + xy: 270, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapon-flamethrower rotate: false - xy: 270, 13 + xy: 270, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapon-multigun rotate: false - xy: 270, 3 + xy: 280, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapon-trishot rotate: false - xy: 280, 13 + xy: 280, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index bdb3b321ee..4c81b14174 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/ui/uiskin.png b/core/assets/ui/uiskin.png index 21017983ae..a8a3fc5905 100644 Binary files a/core/assets/ui/uiskin.png and b/core/assets/ui/uiskin.png differ diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java index 592a22d392..2820bdc537 100644 --- a/core/src/io/anuke/mindustry/Control.java +++ b/core/src/io/anuke/mindustry/Control.java @@ -392,11 +392,6 @@ public class Control extends ControlModule{ drawDefault(); - batch.setProjectionMatrix(control.camera.combined); - batch.begin(); - Renderer.renderOverlay(); - batch.end(); - camera.position.set(lastx - deltax, lasty - deltay, 0); if(Vars.debug){ diff --git a/core/src/io/anuke/mindustry/Renderer.java b/core/src/io/anuke/mindustry/Renderer.java index 4b6500b57e..5faa7487e6 100644 --- a/core/src/io/anuke/mindustry/Renderer.java +++ b/core/src/io/anuke/mindustry/Renderer.java @@ -201,16 +201,6 @@ public class Renderer{ } } - public static void renderOverlay(){ - - Tile tile = World.cursorTile(); - - if(tile != null && tile.block() != Blocks.air){ - tile.block().drawOverlay(tile); - } - - } - public static void drawHealth(float x, float y, float health, float maxhealth){ drawBar(Color.RED, x, y, health/maxhealth); } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/Drill.java b/core/src/io/anuke/mindustry/world/blocks/types/Drill.java index 1930c61156..11b26a2113 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/Drill.java @@ -1,16 +1,12 @@ package io.anuke.mindustry.world.blocks.types; -import static io.anuke.mindustry.Vars.tilesize; - -import com.badlogic.gdx.graphics.Color; - -import io.anuke.mindustry.Vars; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.core.Draw; import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Timers; +import io.anuke.ucore.util.Mathf; public class Drill extends Block{ protected Block resource; @@ -42,15 +38,13 @@ public class Drill extends Block{ } @Override - public void drawOverlay(Tile tile){ + public void drawOver(Tile tile){ if(tile.floor() != resource && resource != null){ - Draw.tcolor(Color.SCARLET); - Draw.tscl(1 / 8f); - Draw.text("Not on " + resource.name + " block!", tile.worldx(), tile.worldy() + tilesize); + Draw.colorl(0.85f + Mathf.absin(Timers.time(), 6f, 0.15f)); + Draw.rect("cross", tile.worldx(), tile.worldy()); + Draw.color(); } - - Draw.tscl(Vars.fontscale); } } diff --git a/desktop/gifexport/recording1505946101.gif b/desktop/gifexport/recording1505946101.gif new file mode 100644 index 0000000000..e373982a3f Binary files /dev/null and b/desktop/gifexport/recording1505946101.gif differ