Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-03 03:31:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2026-09-05 09:41:26 -04:00
parent 71aa9230bf 666978f9e1
commit a9dfed098a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
+4
View File
@@ -6483,6 +6483,7 @@ public class Blocks{
regionSuffix = "-dark"; regionSuffix = "-dark";
size = 3; size = 3;
configurable = false;
consumePower(3f); consumePower(3f);
consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeLiquid(Liquids.hydrogen, 3f / 60f);
consumeItems(with(Items.silicon, 40, Items.tungsten, 30)); consumeItems(with(Items.silicon, 40, Items.tungsten, 30));
@@ -6500,6 +6501,7 @@ public class Blocks{
regionSuffix = "-dark"; regionSuffix = "-dark";
size = 3; size = 3;
configurable = false;
consumePower(2.5f); consumePower(2.5f);
consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeLiquid(Liquids.hydrogen, 3f / 60f);
consumeItems(with(Items.silicon, 60, Items.tungsten, 40)); consumeItems(with(Items.silicon, 60, Items.tungsten, 40));
@@ -6518,6 +6520,7 @@ public class Blocks{
regionSuffix = "-dark"; regionSuffix = "-dark";
size = 3; size = 3;
configurable = false;
consumePower(2.5f); consumePower(2.5f);
consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeLiquid(Liquids.hydrogen, 3f / 60f);
consumeItems(with(Items.silicon, 50, Items.tungsten, 40)); consumeItems(with(Items.silicon, 50, Items.tungsten, 40));
@@ -6538,6 +6541,7 @@ public class Blocks{
researchCostMultipliers.put(Items.thorium, 0.2f); researchCostMultipliers.put(Items.thorium, 0.2f);
size = 5; size = 5;
configurable = false;
consumePower(4.5f); consumePower(4.5f);
consumeLiquid(Liquids.nitrogen, 10f / 60f); consumeLiquid(Liquids.nitrogen, 10f / 60f);
consumeItems(with(Items.thorium, 80, Items.silicon, 100)); consumeItems(with(Items.thorium, 80, Items.silicon, 100));
core/src/mindustry/world/blocks/distribution/ItemBridge.java
+2 -1
View File
@@ -38,6 +38,7 @@ public class ItemBridge extends Block{
public float arrowSpacing = 4f, arrowOffset = 2f, arrowPeriod = 0.4f; public float arrowSpacing = 4f, arrowOffset = 2f, arrowPeriod = 0.4f;
public float arrowTimeScl = 6.2f; public float arrowTimeScl = 6.2f;
public float bridgeWidth = 6.5f; public float bridgeWidth = 6.5f;
/** If true, this bridge will not accept items or liquids when disabled. */
public boolean noAcceptDisabled = false; public boolean noAcceptDisabled = false;
//for autolink //for autolink
@@ -434,7 +435,7 @@ public class ItemBridge extends Block{
@Override @Override
public boolean acceptItem(Building source, Item item){ public boolean acceptItem(Building source, Item item){
return hasItems && team == source.team && items.total() < itemCapacity && checkAccept(source, world.tile(link)); return hasItems && team == source.team && items.total() < itemCapacity && checkAccept(source, world.tile(link)) && (!noAcceptDisabled || enabled);
} }
@Override @Override