Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented additional lava crafting blocks

Browse Source
This commit is contained in:
Anuken
2017-11-22 16:40:38 -05:00
parent 128079071b
commit 88e4154ea3
9 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/resource/Recipe.java
View File

@@ -49,6 +49,8 @@ public enum Recipe{
coalpurifier(crafting, ProductionBlocks.coalpurifier, stack(Item.steel, 10), stack(Item.iron, 10)),
titaniumpurifier(crafting, ProductionBlocks.titaniumpurifier, stack(Item.steel, 30), stack(Item.iron, 30)),
oilrefinery(crafting, ProductionBlocks.oilrefinery, stack(Item.steel, 30), stack(Item.iron, 30)),
stoneformer(crafting, ProductionBlocks.stoneformer, stack(Item.steel, 30), stack(Item.iron, 30)),
lavasmelter(crafting, ProductionBlocks.lavasmelter, stack(Item.steel, 30), stack(Item.iron, 30)),
stonedrill(production, ProductionBlocks.stonedrill, stack(Item.stone, 12)),
irondrill(production, ProductionBlocks.irondrill, stack(Item.stone, 25)),

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

@@ -118,12 +118,11 @@ public class ProductionBlocks{
stoneformer = new LiquidCrafter("stoneformer"){
{
formalName = "stone former";
input = Item.iron;
inputAmount = 2;
input = null;
inputLiquid = Liquid.lava;
liquidAmount = 20f;
liquidAmount = 16f;
liquidCapacity = 21f;
purifyTime = 10;
purifyTime = 12;
output = Item.stone;
health = 80;
craftEffect = Fx.purifystone;
@@ -135,11 +134,13 @@ public class ProductionBlocks{
lavasmelter = new LiquidCrafter("lavasmelter"){
{
formalName = "lava smelter";
input = Item.iron;
inputAmount = 1;
inputLiquid = Liquid.lava;
liquidAmount = 40f;
liquidCapacity = 41f;
purifyTime = 30;
output = Item.stone;
output = Item.steel;
health = 80;
craftEffect = Fx.purifystone;
description = "Converts iron + lava to steel.";

7
core/src/io/anuke/mindustry/world/blocks/types/defense/RepairTurret.java
View File

@@ -13,22 +13,25 @@ import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Strings;
public class RepairTurret extends Turret{
public class RepairTurret extends PowerTurret{
public RepairTurret(String name) {
super(name);
powerUsed = 0.1f;
}
@Override
public void getStats(Array<String> list){
list.add("[health]health: " + health);
list.add("[powerinfo]Power Capacity: " + (int)powerCapacity);
list.add("[powerinfo]Power/shot: " + Strings.toFixed(powerUsed, 1));
list.add("[turretinfo]Range: " + (int)range);
list.add("[turretinfo]Repairs/Second: " + Strings.toFixed(60f/reload, 1));
}
@Override
public void postInit(){
description = "[turretinfo]Range: " + (int)range + "\n[description]Heals nearby tiles.";
description = "[turretinfo]Range: " + (int)range + "\nPower/unit: "+powerUsed+"\n[description]Heals nearby tiles.";
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/types/production/LiquidCrafter.java
View File

@@ -84,7 +84,7 @@ public class LiquidCrafter extends LiquidBlock{
float fract = (float)tile.entity.items.get(input, 0) / itemCapacity;
Vars.renderer.drawBar(Color.GREEN, tile.worldx(), tile.worldy() + 13, fract);
Vars.renderer.drawBar(Color.GREEN, tile.worldx(), tile.worldy() + 6, fract);
}
@Override