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

Allowed enemy spawns on water

Browse Source
This commit is contained in:
Anuken
2020-10-22 09:43:21 -04:00
parent f2dd5ba113
commit a732237005
10 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/editor/EditorTile.java
View File

@@ -26,7 +26,7 @@ public class EditorTile extends Tile{
if(type instanceof OverlayFloor){
//don't place on liquids
if(floor.hasSurface()){
if(floor.hasSurface() || !type.needsSurface){
setOverlayID(type.id);
}
return;
@@ -75,7 +75,7 @@ public class EditorTile extends Tile{
return;
}
if(floor.isLiquid) return;
if(!floor.hasSurface() && overlay.asFloor().needsSurface) return;
if(overlay() == overlay) return;
op(OpType.overlay, this.overlay.id);
super.setOverlay(overlay);

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

@@ -118,7 +118,7 @@ public enum EditorTool{
if(editor.drawBlock.isOverlay()){
Block dest = tile.overlay();
if(dest == editor.drawBlock) return;
tester = t -> t.overlay() == dest && t.floor().hasSurface();
tester = t -> t.overlay() == dest && (t.floor().hasSurface() || !t.floor().needsSurface);
setter = t -> t.setOverlay(editor.drawBlock);
}else if(editor.drawBlock.isFloor()){
Block dest = tile.floor();

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

@@ -417,7 +417,7 @@ public class MapGenerateDialog extends BaseDialog{
public void set(Block floor, Block wall, Block ore, Team team){
this.floor = floor.id;
this.block = wall.id;
this.ore = !floor.asFloor().hasSurface() ? 0 : ore.id;
this.ore = (!floor.asFloor().hasSurface() && ore.asFloor().needsSurface) ? 0 : ore.id;
this.team = (byte)team.id;
}