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

Tile cleanup

Browse Source
This commit is contained in:
Anuken
2019-02-01 09:22:08 -05:00
parent f670ade2ee
commit 87b489a541
14 changed files with 1382 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
View File

@@ -15,6 +15,7 @@ import io.anuke.mindustry.maps.MapTileData.TileDataMarker;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.OreBlock;
import io.anuke.mindustry.world.blocks.StaticWall;
import io.anuke.mindustry.world.blocks.storage.CoreBlock;
@@ -46,7 +47,7 @@ public class MapGenerator extends Generator{
}
public MapGenerator decor(Decoration... decor){
this.decorations = Array.with(decor);
this.decorations.addAll(decor);
return this;
}
@@ -118,8 +119,10 @@ public class MapGenerator extends Generator{
}
for(Decoration decor : decorations){
if(tile.block() == Blocks.air && tile.floor() == decor.floor && Mathf.chance(decor.chance)){
if(tile.block() == Blocks.air && !(decor.wall instanceof Floor) && tile.floor() == decor.floor && Mathf.chance(decor.chance)){
tile.setBlock(decor.wall);
}else if(tile.floor() == decor.floor && decor.wall instanceof Floor && Mathf.chance(decor.chance)){
tile.setFloor((Floor)decor.wall);
}
}