Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-11-11 14:56:10 +03:00
Code Issues Projects Releases Wiki Activity

Added health and ammo to block descriptions

Browse Source
This commit is contained in:
Anuken 2017-08-13 14:36:02 -04:00
parent 4da9d730bf
commit 04e4377ee4
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/lib/ucore.jar
View File

Binary file not shown.

4
core/src/io/anuke/mindustry/UI.java
View File

@ -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));
};

3
core/src/io/anuke/mindustry/ai/MHueristic.java
View File

@ -18,7 +18,8 @@ public class MHueristic implements Heuristic<Tile>{
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;

17
core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
View File

@ -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;

6
core/src/io/anuke/mindustry/world/blocks/Turret.java
View File

@ -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