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

Misc bugfixes

Browse Source
This commit is contained in:
Anuken
2022-06-10 08:34:38 -04:00
parent 4c5850ae96
commit 8418a00483
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+1 -1
View File
@@ -1530,7 +1530,7 @@ liquid.slag.description = Refined in separators into constituent metals. Consume
liquid.oil.description = Used in advanced material production and as incendiary ammunition. liquid.oil.description = Used in advanced material production and as incendiary ammunition.
liquid.cryofluid.description = Used as coolant in reactors, turrets and factories. liquid.cryofluid.description = Used as coolant in reactors, turrets and factories.
block.derelict =  [lightgray]Derelict block.derelict = \uf77e [lightgray]Derelict
block.armored-conveyor.description = Moves items forward. Does not accept non-conveyor inputs from the sides. block.armored-conveyor.description = Moves items forward. Does not accept non-conveyor inputs from the sides.
block.illuminator.description = Emits light. block.illuminator.description = Emits light.
block.message.description = Stores a message for communication between allies. block.message.description = Stores a message for communication between allies.
core/src/mindustry/world/blocks/storage/CoreBlock.java
+4 -3
View File
@@ -131,15 +131,16 @@ public class CoreBlock extends StorageBlock{
if(state.isEditor()) return true; if(state.isEditor()) return true;
CoreBuild core = team.core(); CoreBuild core = team.core();
//must have all requirements
if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements, state.rules.buildCostMultiplier))) return false;
//special floor upon which cores can be placed //special floor upon which cores can be placed
tile.getLinkedTilesAs(this, tempTiles); tile.getLinkedTilesAs(this, tempTiles);
if(!tempTiles.contains(o -> !o.floor().allowCorePlacement)){ if(!tempTiles.contains(o -> !o.floor().allowCorePlacement || o.block() instanceof CoreBlock)){
return true; return true;
} }
//must have all requirements
if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements, state.rules.buildCostMultiplier))) return false;
return tile.block() instanceof CoreBlock && size > tile.block().size; return tile.block() instanceof CoreBlock && size > tile.block().size;
} }