diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 0b7a116d49..fe92fb9a3b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -271,6 +271,7 @@ filter.ore = Ore filter.rivernoise = River Noise filter.mirror = Mirror filter.clear = Clear +filter.option.ignore = Ignore filter.scatter = Scatter filter.terrain = Terrain filter.option.scale = Scale diff --git a/core/assets/cursors/cursor.png b/core/assets/cursors/cursor.png index d8487b7fa1..86f4632037 100644 Binary files a/core/assets/cursors/cursor.png and b/core/assets/cursors/cursor.png differ diff --git a/core/assets/maps/shattered.msav b/core/assets/maps/shattered.msav new file mode 100644 index 0000000000..3164e82223 Binary files /dev/null and b/core/assets/maps/shattered.msav differ diff --git a/core/assets/maps/wasteland.msav b/core/assets/maps/wasteland.msav new file mode 100644 index 0000000000..f7bb73595e Binary files /dev/null and b/core/assets/maps/wasteland.msav differ diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index cc04a792d6..8059329566 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -20,7 +20,7 @@ import static io.anuke.mindustry.Vars.*; public class Maps implements Disposable{ /** List of all built-in maps. Filenames only. */ - private static String[] defaultMapNames = {"fortress", "labyrinth", "islands", "tendrils", "caldera", "glacier", "veins", "canyon"}; + private static String[] defaultMapNames = {"fortress", "labyrinth", "islands", "tendrils", "caldera", "glacier", "veins", "canyon", "shattered", "wasteland"}; /** All maps stored in an ordered array. */ private Array maps = new Array<>(); /** Serializer for meta. */ diff --git a/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java b/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java index cda996e31b..cbb62f46eb 100644 --- a/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java @@ -11,20 +11,21 @@ import static io.anuke.mindustry.maps.filters.FilterOption.*; public class BlendFilter extends GenerateFilter{ float radius = 2f; - Block block = Blocks.stone, floor = Blocks.ice; + Block block = Blocks.stone, floor = Blocks.ice, ignore = Blocks.air; { buffered = true; options( - new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f), - new BlockOption("block", () -> block, b -> block = b, anyOptional), - new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly) + new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f), + new BlockOption("block", () -> block, b -> block = b, anyOptional), + new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly), + new BlockOption("ignore", () -> ignore, b -> ignore = b, floorsOptional) ); } @Override public void apply(){ - if(in.floor == block || block == Blocks.air) return; + if(in.floor == block || block == Blocks.air || in.floor == ignore) return; int rad = (int)radius; boolean found = false;