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

Oil extractor water now needed / new liquid physics / new plastic balance

Browse Source
This commit is contained in:
Anuken
2018-03-28 20:01:47 -04:00
parent 737c63da5e
commit fbf8655ea4
26 changed files with 675 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@@ -100,27 +100,29 @@ public class CraftingBlocks {
size = 2;
}},
plasticFormer = new GenericCrafter("plasticformer") {{
plasticFormer = new PlasticFormer("plasticformer") {{
inputLiquid = Liquids.oil;
liquidUse = 0.3f;
liquidCapacity = 60f;
powerUse = 0.3f;
powerUse = 0.5f;
craftTime = 80f;
output = Items.plastic;
itemCapacity = 30;
size = 2;
health = 320;
hasPower = hasLiquids = true;
craftEffect = Fx.formsmoke;
updateEffect = Fx.plasticburn;
}},
biomatterCompressor = new Compressor("biomattercompressor") {{
input = new ItemStack(Items.biomatter, 1);
liquidCapacity = 60f;
itemCapacity = 50;
powerUse = 0.05f;
craftTime = 10f;
powerUse = 0.06f;
craftTime = 25f;
outputLiquid = Liquids.oil;
outputLiquidAmount = 0.08f;
outputLiquidAmount = 0.1f;
size = 2;
health = 320;
hasLiquids = true;

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

@@ -1,55 +1,51 @@
package io.anuke.mindustry.content.blocks;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.types.defense.RepairTurret;
import io.anuke.mindustry.world.blocks.types.defense.ShieldBlock;
import io.anuke.mindustry.world.blocks.types.distribution.Teleporter;
import io.anuke.mindustry.world.blocks.types.power.ItemPowerGenerator;
import io.anuke.mindustry.world.blocks.types.power.*;
public class PowerBlocks {
public static final Block
coalgenerator = new io.anuke.mindustry.world.blocks.types.power.ItemPowerGenerator("coalgenerator") {{
generateItem = Items.coal;
coalgenerator = new BurnerGenerator("coalgenerator") {{
//generateItem = Items.coal;
powerOutput = 0.04f;
powerCapacity = 40f;
}},
thermalgenerator = new io.anuke.mindustry.world.blocks.types.power.LiquidPowerGenerator("thermalgenerator") {{
generateLiquid = Liquids.lava;
thermalgenerator = new LiquidHeatGenerator("thermalgenerator") {{
maxLiquidGenerate = 0.5f;
powerPerLiquid = 0.08f;
powerCapacity = 40f;
generateEffect = Fx.redgeneratespark;
}},
combustiongenerator = new io.anuke.mindustry.world.blocks.types.power.LiquidPowerGenerator("combustiongenerator") {{
generateLiquid = Liquids.oil;
combustiongenerator = new LiquidBurnerGenerator("combustiongenerator") {{
maxLiquidGenerate = 0.4f;
powerPerLiquid = 0.12f;
powerCapacity = 40f;
}},
rtgenerator = new ItemPowerGenerator("rtgenerator") {{
generateItem = Items.thorium;
rtgenerator = new BurnerGenerator("rtgenerator") {{
//generateItem = Items.thorium;
powerCapacity = 40f;
powerOutput = 0.03f;
itemDuration = 240f;
}},
solarpanel = new io.anuke.mindustry.world.blocks.types.power.SolarGenerator("solarpanel") {{
solarpanel = new SolarGenerator("solarpanel") {{
generation = 0.003f;
}},
largesolarpanel = new io.anuke.mindustry.world.blocks.types.power.SolarGenerator("largesolarpanel") {{
largesolarpanel = new SolarGenerator("largesolarpanel") {{
size = 3;
generation = 0.012f;
}},
nuclearReactor = new io.anuke.mindustry.world.blocks.types.power.NuclearReactor("nuclearreactor") {{
nuclearReactor = new NuclearReactor("nuclearreactor") {{
size = 3;
health = 600;
breaktime *= 2.3f;
@@ -74,16 +70,16 @@ public class PowerBlocks {
health = 400;
}},
battery = new io.anuke.mindustry.world.blocks.types.power.PowerGenerator("battery") {{
battery = new PowerGenerator("battery") {{
powerCapacity = 320f;
}},
batteryLarge = new io.anuke.mindustry.world.blocks.types.power.PowerGenerator("batterylarge") {{
batteryLarge = new PowerGenerator("batterylarge") {{
size = 3;
powerCapacity = 2000f;
}},
powernode = new io.anuke.mindustry.world.blocks.types.power.PowerDistributor("powernode"),
powernode = new PowerDistributor("powernode"),
teleporter = new Teleporter("teleporter");
}

9
core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java
View File

@@ -3,10 +3,7 @@ package io.anuke.mindustry.content.blocks;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.types.production.Cultivator;
import io.anuke.mindustry.world.blocks.types.production.Drill;
import io.anuke.mindustry.world.blocks.types.production.GenericDrill;
import io.anuke.mindustry.world.blocks.types.production.SolidPump;
import io.anuke.mindustry.world.blocks.types.production.*;
public class ProductionBlocks {
public static final Block
@@ -86,8 +83,10 @@ public class ProductionBlocks {
liquidCapacity = 30f;
}},
oilextractor = new SolidPump("oilextractor") {{
oilextractor = new Fracker("oilextractor") {{
result = Liquids.oil;
inputLiquid = Liquids.water;
inputLiquidUse = 0.3f;
powerUse = 0.6f;
pumpAmount = 0.06f;
size = 3;