WIP animated gas

This commit is contained in:
Anuken
2021-11-26 21:35:58 -05:00
parent 616fa8748f
commit 77b3a83826
43 changed files with 194 additions and 18 deletions

View File

@@ -60,7 +60,9 @@ public class Blocks implements ContentList{
//crafting
siliconSmelter, siliconCrucible, siliconArcFurnace, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
electrolyzer, oxidationChamber, slagHeater, slagIncinerator, heatReactor, carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer,
//erekir
electrolyzer, oxidationChamber, atmosphericConcentrator, slagHeater, slagIncinerator, heatReactor, carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer,
cellSynthesisChamber,
//sandbox
@@ -987,6 +989,20 @@ public class Blocks implements ContentList{
liquidOutputDirections = new int[]{1, 3};
}};
if(false)
atmosphericConcentrator = new HeatCrafter("atmospheric-concentrator"){{
requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
size = 3;
craftTime = 60f;
liquidCapacity = 50f;
consumes.power(2f);
heatRequirement = 5f;
outputLiquid = new LiquidStack(Liquids.nitrogen, 4f / 60f);
}};
oxidationChamber = new HeatProducer("oxidation-chamber"){{
requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
size = 3;
@@ -1627,12 +1643,14 @@ public class Blocks implements ContentList{
liquidRouter = new LiquidRouter("liquid-router"){{
requirements(Category.liquid, with(Items.graphite, 4, Items.metaglass, 2));
liquidCapacity = 20f;
newDrawing = true;
}};
liquidContainer = new LiquidRouter("liquid-container"){{
requirements(Category.liquid, with(Items.titanium, 10, Items.metaglass, 15));
liquidCapacity = 700f;
size = 2;
newDrawing = true;
}};
liquidTank = new LiquidRouter("liquid-tank"){{
@@ -1640,6 +1658,7 @@ public class Blocks implements ContentList{
size = 3;
liquidCapacity = 1800f;
health = 500;
newDrawing = true;
}};
liquidJunction = new LiquidJunction("liquid-junction"){{
@@ -1705,18 +1724,24 @@ public class Blocks implements ContentList{
reinforcedLiquidRouter = new LiquidRouter("reinforced-liquid-router"){{
requirements(Category.liquid, with(Items.graphite, 4, Items.beryllium, 2));
liquidCapacity = 30f;
newDrawing = true;
liquidPadding = 3f/4f;
}};
reinforcedLiquidContainer = new LiquidRouter("reinforced-liquid-container"){{
requirements(Category.liquid, with(Items.graphite, 10, Items.beryllium, 15));
liquidCapacity = 1000f;
size = 2;
newDrawing = true;
liquidPadding = 6f/4f;
}};
reinforcedLiquidTank = new LiquidRouter("reinforced-liquid-tank"){{
requirements(Category.liquid, with(Items.tungsten, 30, Items.beryllium, 40));
size = 3;
liquidCapacity = 2700f;
newDrawing = true;
liquidPadding = 2f;
}};
//endregion
@@ -1958,6 +1983,8 @@ public class Blocks implements ContentList{
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;

View File

@@ -7,7 +7,7 @@ import mindustry.type.*;
public class Liquids implements ContentList{
public static Liquid water, slag, oil, cryofluid, neoplasm,
gallium,
ozone, hydrogen, cyanogen;
ozone, hydrogen, nitrogen, cyanogen;
@Override
public void load(){
@@ -64,7 +64,7 @@ public class Liquids implements ContentList{
}};
//TODO reactivity, etc
ozone = new Liquid("ozone", Color.valueOf("f099da")){{
ozone = new Liquid("ozone", Color.valueOf("fc81dd")){{
gas = true;
barColor = Color.valueOf("d699f0");
explosiveness = 1f;
@@ -78,9 +78,12 @@ public class Liquids implements ContentList{
flammability = 1f;
}};
nitrogen = new Liquid("nitrogen", Color.valueOf("e2cffa")){{
gas = true;
}};
cyanogen = new Liquid("cyanogen", Color.valueOf("89e8b6")){{
gas = true;
barColor = color;
flammability = 2f;
}};