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

Added longer-range power nodes / Resprite of some generators

Browse Source
This commit is contained in:
Anuken
2018-03-31 17:20:48 -04:00
parent eab226f04d
commit 06dcc875bd
20 changed files with 429 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/io/anuke/mindustry/content/Recipes.java
View File

@@ -86,16 +86,17 @@ public class Recipes {
new Recipe(production, ProductionBlocks.waterextractor, stack(Items.titanium, 40), stack(Items.densealloy, 40)),
new Recipe(production, ProductionBlocks.oilextractor, stack(Items.titanium, 40), stack(Items.densealloy, 40)),
new Recipe(power, PowerBlocks.coalgenerator, stack(Items.iron, 30)),
new Recipe(power, PowerBlocks.thermalgenerator, stack(Items.steel, 30)),
new Recipe(power, PowerBlocks.combustiongenerator, stack(Items.iron, 30)),
new Recipe(power, PowerBlocks.solarpanel, stack(Items.iron, 30), stack(Items.silicon, 20)),
new Recipe(power, PowerBlocks.largesolarpanel, stack(Items.iron, 30), stack(Items.silicon, 20)),
new Recipe(power, PowerBlocks.rtgenerator, stack(Items.titanium, 20), stack(Items.steel, 20)),
new Recipe(power, PowerBlocks.nuclearReactor, stack(Items.titanium, 40), stack(Items.densealloy, 40), stack(Items.steel, 50)),
new Recipe(power, PowerBlocks.powernode, stack(Items.steel, 3), stack(Items.iron, 3)),
new Recipe(power, PowerBlocks.powernodelarge, stack(Items.steel, 3), stack(Items.iron, 3)),
new Recipe(power, PowerBlocks.battery, stack(Items.steel, 5), stack(Items.iron, 5)),
new Recipe(power, PowerBlocks.batteryLarge, stack(Items.steel, 5), stack(Items.iron, 5)),
new Recipe(power, PowerBlocks.combustiongenerator, stack(Items.iron, 30)),
new Recipe(power, PowerBlocks.liquidcombustiongenerator, stack(Items.iron, 30)),
new Recipe(power, PowerBlocks.thermalgenerator, stack(Items.steel, 30)),
new Recipe(power, PowerBlocks.rtgenerator, stack(Items.titanium, 20), stack(Items.steel, 20)),
new Recipe(power, PowerBlocks.solarpanel, stack(Items.iron, 30), stack(Items.silicon, 20)),
new Recipe(power, PowerBlocks.largesolarpanel, stack(Items.iron, 30), stack(Items.silicon, 20)),
new Recipe(power, PowerBlocks.nuclearReactor, stack(Items.titanium, 40), stack(Items.densealloy, 40), stack(Items.steel, 50)),
new Recipe(power, PowerBlocks.shieldgenerator, stack(Items.titanium, 30), stack(Items.densealloy, 30)),

21
core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
View File

@@ -10,8 +10,7 @@ import io.anuke.mindustry.world.blocks.types.power.*;
public class PowerBlocks {
public static final Block
coalgenerator = new BurnerGenerator("coalgenerator") {{
//generateItem = Items.coal;
combustiongenerator = new BurnerGenerator("combustiongenerator") {{
powerOutput = 0.04f;
powerCapacity = 40f;
}},
@@ -23,17 +22,16 @@ public class PowerBlocks {
generateEffect = BlockFx.redgeneratespark;
}},
combustiongenerator = new LiquidBurnerGenerator("combustiongenerator") {{
liquidcombustiongenerator = new LiquidBurnerGenerator("liquidcombustiongenerator") {{
maxLiquidGenerate = 0.4f;
powerPerLiquid = 0.12f;
powerCapacity = 40f;
}},
rtgenerator = new BurnerGenerator("rtgenerator") {{
//generateItem = Items.thorium;
rtgenerator = new DecayGenerator("rtgenerator") {{
powerCapacity = 40f;
powerOutput = 0.03f;
itemDuration = 240f;
powerOutput = 0.02f;
itemDuration = 500f;
}},
solarpanel = new SolarGenerator("solarpanel") {{
@@ -72,14 +70,23 @@ public class PowerBlocks {
battery = new PowerGenerator("battery") {{
powerCapacity = 320f;
hasInventory = false;
}},
batteryLarge = new PowerGenerator("batterylarge") {{
size = 3;
powerCapacity = 2000f;
hasInventory = false;
}},
powernode = new PowerDistributor("powernode"),
powernodelarge = new PowerDistributor("powernodelarge"){{
size = 2;
powerSpeed = 1f;
maxNodes = 5;
laserRange = 6.5f;
}},
teleporter = new Teleporter("teleporter");
}