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

WIP liquid blocks

Browse Source
This commit is contained in:
Anuken
2021-11-08 08:56:12 -05:00
parent 07d9feeb09
commit d72de24942
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ public class Blocks implements ContentList{
//liquid //liquid
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit, mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
reinforcedConduit, reinforcedConduit, reinforcedLiquidRouter, reinforcedLiquidContainer, reinforcedLiquidTank,
//power //power
combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor, combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
@@ -1437,6 +1437,23 @@ public class Blocks implements ContentList{
health = 250; health = 250;
}}; }};
reinforcedLiquidRouter = new LiquidRouter("reinforced-liquid-router"){{
requirements(Category.liquid, with(Items.graphite, 4, Items.beryllium, 2));
liquidCapacity = 30f;
}};
reinforcedLiquidContainer = new LiquidRouter("reinforced-liquid-container"){{
requirements(Category.liquid, with(Items.graphite, 10, Items.beryllium, 15));
liquidCapacity = 1000f;
size = 2;
}};
reinforcedLiquidTank = new LiquidRouter("einforced-liquid-tank"){{
requirements(Category.liquid, with(Items.tungsten, 30, Items.beryllium, 40));
size = 3;
liquidCapacity = 2700f;
}};
//endregion //endregion
//region power //region power

2
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
View File

@@ -182,7 +182,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
} }
} }
if(empty && noise(x + 150, y + x*2 + 100, 4, 0.8f, 42f, 1f) > 0.73f/* && floor == Blocks.yellowStone*/){ if(empty && noise(x + 150, y + x*2 + 100, 4, 0.8f, 40f, 1f) > 0.71f/* && floor == Blocks.yellowStone*/){
ore = Blocks.oreTungsten; ore = Blocks.oreTungsten;
} }
} }

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=f8d38a3dd1efa587d3ac08c3b765223935ddffa2 archash=5e7ddf887d6632c9ca7bd3fa1ef9fef748a3a84e