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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2025-04-06 11:37:07 -04:00
parent d67302ee51 cbeffef0b7
commit 1b3600a553
40 changed files with 77 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1339,7 +1339,7 @@ public class Blocks{
}};
smallHeatRedirector = new HeatConductor("small-heat-redirector"){{
requirements(Category.crafting, with(Items.surgeAlloy, 10, Items.graphite, 10));
requirements(Category.crafting, with(Items.surgeAlloy, 8, Items.graphite, 8));
researchCostMultiplier = 10f;
@@ -2827,7 +2827,7 @@ public class Blocks{
largeCliffCrusher = new WallCrafter("large-cliff-crusher"){{
requirements(Category.production, with(Items.silicon, 80, Items.surgeAlloy, 15, Items.beryllium, 100, Items.tungsten, 50));
consumePower(30 / 60f);
consumePower(1f);
drillTime = 48f;
size = 3;
@@ -2837,11 +2837,11 @@ public class Blocks{
ambientSound = Sounds.drill;
ambientSoundVolume = 0.08f;
consumeLiquid(Liquids.ozone, 1f / 60f);
consumeLiquid(Liquids.hydrogen, 1f / 60f);
itemConsumer = consumeItem(Items.tungsten).boost();
itemConsumer = consumeItem(Items.graphite).boost();
itemCapacity = 20;
boostItemUseTime = 60f * 10f;
boostItemUseTime = 60f / 0.75f;
//alternatively, boost using nitrogen:
//consumeLiquid(Liquids.nitrogen, 3f / 60f).boost();
@@ -2892,7 +2892,7 @@ public class Blocks{
blockedItem = Items.thorium;
researchCostMultiplier = 0.5f;
drillMultipliers.put(Items.beryllium, 1.95f);
drillMultipliers.put(Items.beryllium, 2f);
liquidBoostIntensity = 1.75f;
fogRadius = 4;
@@ -2923,13 +2923,13 @@ public class Blocks{
glowColor.a = 0.6f;
fogRadius = 5;
drillMultipliers.put(Items.beryllium, 1.35f);
drillMultipliers.put(Items.beryllium, 2f);
liquidBoostIntensity = 2f;
//TODO different requirements
consumePower(6f);
consumeLiquid(Liquids.hydrogen, 4f / 60f);
consumeLiquid(Liquids.cyanogen, 3f / 60f).boost();
consumeLiquid(Liquids.cyanogen, 0.75f / 60f).boost();
}};
//endregion