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

Wall ore lock

Browse Source
This commit is contained in:
Anuken
2022-02-16 23:04:34 -05:00
parent 7a1b72ca2c
commit fcc26154c2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3603,7 +3603,7 @@ public class Blocks{
requirements(Category.units, with(Items.silicon, 200, Items.beryllium, 250)); requirements(Category.units, with(Items.silicon, 200, Items.beryllium, 250));
size = 3; size = 3;
configurable = false; configurable = false;
plans.add(new UnitPlan(UnitTypes.stell, 60f * 60f, with(Items.graphite, 20f, Items.silicon, 30f))); plans.add(new UnitPlan(UnitTypes.stell, 60f * 60f, with(Items.graphite, 20f, Items.silicon, 40f)));
consumePower(2f); consumePower(2f);
}}; }};

2
core/src/mindustry/editor/MapEditor.java
View File

@@ -160,8 +160,10 @@ public class MapEditor{
if(forceOverlay){ if(forceOverlay){
tile.setOverlay(drawBlock.asFloor()); tile.setOverlay(drawBlock.asFloor());
}else{ }else{
if(!(drawBlock.asFloor().wallOre && !tile.block().solid)){
tile.setFloor(drawBlock.asFloor()); tile.setFloor(drawBlock.asFloor());
} }
}
}else if(!(tile.block().isMultiblock() && !drawBlock.isMultiblock())){ }else if(!(tile.block().isMultiblock() && !drawBlock.isMultiblock())){
if(drawBlock.rotate && tile.build != null && tile.build.rotation != rotation){ if(drawBlock.rotate && tile.build != null && tile.build.rotation != rotation){
addTileOp(TileOp.get(tile.x, tile.y, (byte)OpType.rotation.ordinal(), (byte)rotation)); addTileOp(TileOp.get(tile.x, tile.y, (byte)OpType.rotation.ordinal(), (byte)rotation));