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

Vent condenser block

Browse Source
This commit is contained in:
Anuken
2021-12-09 17:16:32 -05:00
parent 8a2908374a
commit 57e5acdbd7
26 changed files with 222 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
core/src/mindustry/content/Blocks.java
View File

@@ -64,8 +64,8 @@ public class Blocks{
melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
//erekir
siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, slagHeater, slagIncinerator, heatReactor,
carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer,
siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, slagIncinerator,
carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor,
cellSynthesisChamber,
//sandbox
@@ -104,7 +104,7 @@ public class Blocks{
//power - erekir
//TODO rename chemicalCombustionChamber
turbineCondenser, chemicalCombustionChamber, pyrolysisGenerator,
turbineCondenser, ventCondenser, chemicalCombustionChamber, pyrolysisGenerator,
beamNode, beamTower,
//production
@@ -1055,7 +1055,7 @@ public class Blocks{
outputItem = new ItemStack(Items.oxide, 1);
consumes.liquid(Liquids.ozone, 2f / 60f);
consumes.liquid(Liquids.ozone, 1f / 60f);
consumes.item(Items.beryllium);
consumes.power(1f);
@@ -1069,15 +1069,13 @@ public class Blocks{
heatOutput = 5f;
}};
slagHeater = new HeatProducer("slag-heater"){{
electricHeater = new HeatProducer("electric-heater"){{
requirements(Category.crafting, with(Items.tungsten, 30, Items.graphite, 30));
drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.slag, 9f), new DrawHeatOutput(true));
drawer.iconOverride = new String[]{"-bottom", ""};
drawer = new DrawMulti(new DrawHeatOutput(true));
drawer.iconOverride = new String[]{""};
size = 2;
craftTime = 60f * 1f;
heatOutput = 2f;
consumes.liquid(Liquids.slag, 20f / 60f);
consumes.power(0.5f / 60f);
}};
@@ -1087,20 +1085,6 @@ public class Blocks{
consumes.liquid(Liquids.slag, 2f / 60f);
}};
heatReactor = new HeatProducer("heat-reactor"){{
//TODO gas/liquid requirement?
requirements(Category.crafting, with(Items.oxide, 70, Items.graphite, 20, Items.carbide, 10, Items.thorium, 80));
size = 3;
craftTime = 60f * 10f;
craftEffect = new RadialEffect(Fx.heatReactorSmoke, 4, 90f, 7f);
itemCapacity = 20;
consumes.item(Items.thorium, 3);
consumes.liquid(Liquids.nitrogen, 1f / 60f);
outputItem = new ItemStack(Items.fissileMatter, 1);
}};
carbideCrucible = new HeatCrafter("carbide-crucible"){{
requirements(Category.crafting, with(Items.tungsten, 90, Items.thorium, 70, Items.oxide, 50));
craftEffect = Fx.none;
@@ -1256,6 +1240,20 @@ public class Blocks{
consumes.power(8f);
}};
heatReactor = new HeatProducer("heat-reactor"){{
//TODO gas/liquid requirement?
requirements(Category.crafting, with(Items.oxide, 70, Items.graphite, 20, Items.carbide, 10, Items.thorium, 80));
size = 3;
craftTime = 60f * 10f;
craftEffect = new RadialEffect(Fx.heatReactorSmoke, 4, 90f, 7f);
itemCapacity = 20;
consumes.item(Items.thorium, 3);
consumes.liquid(Liquids.nitrogen, 1f / 60f);
outputItem = new ItemStack(Items.fissileMatter, 1);
}};
//TODO needs to be completely redone from the ground up
if(false)
cellSynthesisChamber = new LiquidConverter("cell-synthesis-chamber"){{
@@ -2017,7 +2015,7 @@ public class Blocks{
spinSpeed = 0.6f;
spinners = true;
hasLiquids = true;
liquidOutput = new LiquidStack(Liquids.water, 10f / 60f / 9f);
outputLiquid = new LiquidStack(Liquids.water, 10f / 60f / 9f);
liquidCapacity = 20f;
}};
@@ -2132,23 +2130,6 @@ public class Blocks{
consumes.liquid(Liquids.water, 0.1f).boost();
}};
//TODO should be crusher or something
impactDrill = new BurstDrill("impact-drill"){{
requirements(Category.production, with(Items.silicon, 60, Items.beryllium, 90, Items.graphite, 50));
drillTime = 60f * 12f;
size = 4;
hasPower = true;
tier = 6;
drillEffect = new MultiEffect(Fx.mineImpact, Fx.drillSteam);
shake = 4f;
itemCapacity = 40;
consumes.power(3f);
consumes.liquid(Liquids.water, 0.2f);
}};
//TODO higher tier impact drill, 5x5
waterExtractor = new SolidPump("water-extractor"){{
requirements(Category.production, with(Items.metaglass, 30, Items.graphite, 30, Items.lead, 30, Items.copper, 30));
result = Liquids.water;
@@ -2200,6 +2181,31 @@ public class Blocks{
consumes.liquid(Liquids.water, 0.15f);
}};
//TODO output heat
ventCondenser = new AttributeCrafter("vent-condenser"){{
requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 60));
attribute = Attribute.vent;
displayEfficiencyScale = 1f / 9f;
minEfficiency = 9f - 0.0001f;
displayEfficiency = false;
craftEffect = Fx.turbinegenerate;
drawer = new DrawMulti(new DrawBlock(), new DrawRegion("-rotator-blur"){{
spinSprite = true;
drawPlan = false;
rotateSpeed = 6f;
}});
drawer.iconOverride = new String[]{"", "-rotator"};
ignoreLiquidFullness = true;
craftTime = 30f;
size = 3;
ambientSound = Sounds.hum;
ambientSoundVolume = 0.06f;
hasLiquids = true;
outputLiquid = new LiquidStack(Liquids.water, 30f / 60f / 9f);
consumes.power(0.5f);
liquidCapacity = 20f;
}};
cliffCrusher = new WallCrafter("cliff-crusher"){{
requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 20));
@@ -2236,6 +2242,23 @@ public class Blocks{
consumes.liquid(Liquids.hydrogen, 2f / 60f).boost();
}};
//TODO should be crusher or something
impactDrill = new BurstDrill("impact-drill"){{
requirements(Category.production, with(Items.silicon, 60, Items.beryllium, 90, Items.graphite, 50));
drillTime = 60f * 12f;
size = 4;
hasPower = true;
tier = 6;
drillEffect = new MultiEffect(Fx.mineImpact, Fx.drillSteam);
shake = 4f;
itemCapacity = 40;
consumes.power(3f);
consumes.liquid(Liquids.water, 0.2f);
}};
//TODO higher tier impact drill, 5x5
//endregion
//region storage
@@ -2891,15 +2914,22 @@ public class Blocks{
consumes.liquid(Liquids.hydrogen, 1.5f / 60f);
shots = 1;
//TODO cool reload animation
draw = new DrawTurret("reinforced-");
draw = new DrawTurret("reinforced-"){{
parts.addAll(new RegionPart("-glow"){{
drawRegion = false;
heatColor = Color.valueOf("768a9a");
useReload = false;
useProgressHeat = true;
}});
}};
shootShake = 1f;
shootLength = 5f;
shootLength = 4f;
outlineColor = Pal.darkOutline;
size = 2;
envEnabled |= Env.space;
reloadTime = 25f;
restitution = 0.1f;
cooldown = 0.04f;
recoilAmount = 2.5f;
range = 90;
shootCone = 15f;

30
core/src/mindustry/content/ErekirTechTree.java
View File

@@ -75,27 +75,29 @@ public class ErekirTechTree{
});
});
node(siliconArcFurnace, () -> {
node(electrolyzer, () -> {
node(oxidationChamber, () -> {
node(atmosphericConcentrator, () -> {
node(cyanogenSynthesizer, () -> {
node(ventCondenser, () -> {
node(siliconArcFurnace, () -> {
node(electrolyzer, () -> {
node(oxidationChamber, () -> {
node(electricHeater, () -> {
node(atmosphericConcentrator, () -> {
node(cyanogenSynthesizer, () -> {
});
});
});
});
node(carbideCrucible, () -> {
node(surgeCrucible, () -> {
node(phaseSynthesizer, () -> {
node(carbideCrucible, () -> {
node(surgeCrucible, () -> {
node(phaseSynthesizer, () -> {
});
});
});
});
});
});
node(slagIncinerator, () -> {
//when is this actually needed?
node(slagHeater, () -> {
node(slagIncinerator, () -> {
node(slagCentrifuge, () -> {
});

8
core/src/mindustry/content/TechTree.java
View File

@@ -1,10 +1,12 @@
package mindustry.content;
import arc.*;
import arc.scene.style.*;
import arc.struct.*;
import arc.util.*;
import mindustry.ctype.*;
import mindustry.game.Objectives.*;
import mindustry.gen.*;
import mindustry.type.*;
/** Class for storing a list of TechNodes with some utility tree builder methods; context dependent. See {@link SerpuloTechTree#load} source for example usage. */
@@ -75,6 +77,8 @@ public class TechTree{
public static class TechNode{
/** Depth in tech tree. */
public int depth;
/** Icon displayed in tech tree selector. */
public @Nullable Drawable icon;
/** Name for root node - used in tech tree selector. */
public @Nullable String name;
/** Requirement node. */
@@ -111,6 +115,10 @@ public class TechTree{
all.add(this);
}
public Drawable icon(){
return icon == null ? Icon.tree : icon;
}
public String localizedName(){
return Core.bundle.get("techtree." + name);
}

2
core/src/mindustry/content/UnitTypes.java
View File

@@ -995,7 +995,7 @@ public class UnitTypes{
accel = 0.08f;
drag = 0.016f;
flying = true;
hitSize = 9f;
hitSize = 10f;
targetAir = false;
engineOffset = 7.8f;
range = 140f;