diff --git a/core/lib/ucore.jar b/core/lib/ucore.jar index be896cc29f..407d15d559 100644 Binary files a/core/lib/ucore.jar and b/core/lib/ucore.jar differ diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java index 8c8ad8e315..9c01275344 100644 --- a/core/src/io/anuke/mindustry/UI.java +++ b/core/src/io/anuke/mindustry/UI.java @@ -261,6 +261,10 @@ public class UI extends SceneModule{ tiptable.row(); tiptable.add().size(10).units(Unit.px); tiptable.row(); + tiptable.add("[scarlet]Health: " + r.result.health).left(); + tiptable.row(); + tiptable.add().size(6).units(Unit.px); + tiptable.row(); tiptable.add("[ORANGE]" + description).left(); tiptable.pad(Unit.dp.inPixels(10f)); }; diff --git a/core/src/io/anuke/mindustry/ai/MHueristic.java b/core/src/io/anuke/mindustry/ai/MHueristic.java index d69b91904f..a55e07ced1 100644 --- a/core/src/io/anuke/mindustry/ai/MHueristic.java +++ b/core/src/io/anuke/mindustry/ai/MHueristic.java @@ -18,7 +18,8 @@ public class MHueristic implements Heuristic{ if(other.breakable() && other.block().solid) cost += Vars.tilesize*multiplier; for(Tile tile : node.getNearby()){ if(tile != null && tile.solid()){ - cost += Vars.tilesize*2; + //don't go near solid tiles! + cost += Vars.tilesize*3; } } return cost; diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index df18e8ac3c..a60fb05ae5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -92,11 +92,18 @@ public class ProductionBlocks{ } }, - smelter = new Crafter("smelter"){{ - health = 70; - requirements = new Item[]{Item.coal, Item.iron}; - result = Item.steel; - }}, + smelter = new Crafter("smelter"){ + { + health = 70; + requirements = new Item[]{Item.coal, Item.iron}; + result = Item.steel; + } + + @Override + public String description(){ + return "Takes in coal + iron, outputs steel."; + } + }, stonedrill = new Drill("stonedrill"){{ resource = Blocks.stone; diff --git a/core/src/io/anuke/mindustry/world/blocks/Turret.java b/core/src/io/anuke/mindustry/world/blocks/Turret.java index 4cfd5dd403..21eb5ae77d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/Turret.java @@ -5,7 +5,9 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.MathUtils; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.entities.*; +import io.anuke.mindustry.entities.Bullet; +import io.anuke.mindustry.entities.BulletType; +import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.enemies.Enemy; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.Block; @@ -72,7 +74,7 @@ public class Turret extends Block{ @Override public String description(){ - return "Shoots things."; + return "[green]Ammo: "+(ammo==null ? "N/A" : ammo.name())+"\n[]Shoots things."; } @Override