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

Added oil block, power section, more block types

Browse Source
This commit is contained in:
Anuken
2017-10-23 23:13:07 -04:00
parent 41720e2e3f
commit 03a26f74c2
26 changed files with 640 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/resource/Liquid.java
+2 -1
View File
@@ -5,7 +5,8 @@ import com.badlogic.gdx.graphics.Color;
public enum Liquid{
water(Color.ROYAL),
plasma(Color.CORAL),
lava(Color.valueOf("ed5334"));
lava(Color.valueOf("ed5334")),
oil(Color.valueOf("292929"));
public final Color color;
core/src/io/anuke/mindustry/resource/Recipe.java
+20 -21
View File
@@ -5,22 +5,20 @@ import static io.anuke.mindustry.resource.Section.*;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.ProductionBlocks;
import io.anuke.mindustry.world.blocks.WeaponBlocks;
import io.anuke.mindustry.world.blocks.*;
public enum Recipe{
stonewall(distribution, Blocks.stonewall, stack(Item.stone, 2)),
ironwall(distribution, Blocks.ironwall, stack(Item.iron, 2)),
steelwall(distribution, Blocks.steelwall, stack(Item.steel, 2)),
titaniumwall(distribution, Blocks.titaniumwall, stack(Item.titanium, 2)),
duriumwall(distribution, Blocks.diriumwall, stack(Item.dirium, 2)),
compositewall(distribution, Blocks.compositewall, stack(Item.dirium, 2), stack(Item.titanium, 2), stack(Item.steel, 2), stack(Item.iron, 2)),
titaniumshieldwall(distribution, Blocks.titaniumshieldwall, stack(Item.titanium, 2)),
conveyor(distribution, ProductionBlocks.conveyor, stack(Item.stone, 1)),
fastconveyor(distribution, ProductionBlocks.steelconveyor, stack(Item.steel, 1)),
router(distribution, ProductionBlocks.router, stack(Item.stone, 2)),
junction(distribution, ProductionBlocks.junction, stack(Item.iron, 2)),
stonewall(distribution, DefenseBlocks.stonewall, stack(Item.stone, 2)),
ironwall(distribution, DefenseBlocks.ironwall, stack(Item.iron, 2)),
steelwall(distribution, DefenseBlocks.steelwall, stack(Item.steel, 2)),
titaniumwall(distribution, DefenseBlocks.titaniumwall, stack(Item.titanium, 2)),
duriumwall(distribution, DefenseBlocks.diriumwall, stack(Item.dirium, 2)),
compositewall(distribution, DefenseBlocks.compositewall, stack(Item.dirium, 2), stack(Item.titanium, 2), stack(Item.steel, 2), stack(Item.iron, 2)),
titaniumshieldwall(distribution, DefenseBlocks.titaniumshieldwall, stack(Item.titanium, 2)),
conveyor(distribution, DistributionBlocks.conveyor, stack(Item.stone, 1)),
fastconveyor(distribution, DistributionBlocks.steelconveyor, stack(Item.steel, 1)),
router(distribution, DistributionBlocks.router, stack(Item.stone, 2)),
junction(distribution, DistributionBlocks.junction, stack(Item.iron, 2)),
turret(defense, WeaponBlocks.turret, stack(Item.stone, 4)),
dturret(defense, WeaponBlocks.doubleturret, stack(Item.stone, 7)),
@@ -33,10 +31,10 @@ public enum Recipe{
teslaturret(defense, WeaponBlocks.teslaturret, stack(Item.steel, 10), stack(Item.titanium, 15), stack(Item.dirium, 15)),
plasmaturret(defense, WeaponBlocks.plasmaturret, stack(Item.steel, 10), stack(Item.titanium, 10), stack(Item.dirium, 15)),
healturret(defense, WeaponBlocks.repairturret, stack(Item.iron, 30)),
megahealturret(defense, WeaponBlocks.megarepairturret, stack(Item.iron, 20), stack(Item.steel, 30)),
healturret(defense, DefenseBlocks.repairturret, stack(Item.iron, 30)),
megahealturret(defense, DefenseBlocks.megarepairturret, stack(Item.iron, 20), stack(Item.steel, 30)),
drill(production, ProductionBlocks.stonedrill, stack(Item.stone, 16)),
stonedrill(production, ProductionBlocks.stonedrill, stack(Item.stone, 12)),
irondrill(production, ProductionBlocks.irondrill, stack(Item.stone, 25)),
coaldrill(production, ProductionBlocks.coaldrill, stack(Item.stone, 25), stack(Item.iron, 40)),
titaniumdrill(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)),
@@ -45,11 +43,12 @@ public enum Recipe{
coalpurifier(production, ProductionBlocks.coalpurifier, stack(Item.steel, 10), stack(Item.iron, 10)),
titaniumpurifier(production, ProductionBlocks.titaniumpurifier, stack(Item.steel, 30), stack(Item.iron, 30)),
omnidrill(production, ProductionBlocks.omnidrill, stack(Item.titanium, 10), stack(Item.dirium, 10)),
coalgenerator(production, ProductionBlocks.coalgenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
shieldgenerator(production, WeaponBlocks.shieldgenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
conduit(distribution, ProductionBlocks.conduit, stack(Item.steel, 1)),
liquidrouter(distribution, ProductionBlocks.liquidrouter, stack(Item.steel, 2)),
coalgenerator(power, ProductionBlocks.coalgenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
shieldgenerator(power, DefenseBlocks.shieldgenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
conduit(distribution, DistributionBlocks.conduit, stack(Item.steel, 1)),
liquidrouter(distribution, DistributionBlocks.liquidrouter, stack(Item.steel, 2)),
pump(production, ProductionBlocks.pump, stack(Item.steel, 10));
public Block result;
core/src/io/anuke/mindustry/resource/Section.java
+1 -1
View File
@@ -1,5 +1,5 @@
package io.anuke.mindustry.resource;
public enum Section{
defense, production, distribution;
defense, production, distribution, power;
}