mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-10 02:37:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Blend filter parameters / New map

Browse Source
This commit is contained in:
Anuken 2019-07-26 20:46:06 -04:00
parent c4157d2ec8
commit 7b83406ee4
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@ -271,6 +271,7 @@ filter.ore = Ore
filter.rivernoise = River Noise filter.rivernoise = River Noise
filter.mirror = Mirror filter.mirror = Mirror
filter.clear = Clear filter.clear = Clear
filter.option.ignore = Ignore
filter.scatter = Scatter filter.scatter = Scatter
filter.terrain = Terrain filter.terrain = Terrain
filter.option.scale = Scale filter.option.scale = Scale

BIN
core/assets/cursors/cursor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
core/assets/maps/shattered.msav Normal file
View File

Binary file not shown.

BIN
core/assets/maps/wasteland.msav Normal file
View File

Binary file not shown.

2
core/src/io/anuke/mindustry/maps/Maps.java
View File

@ -20,7 +20,7 @@ import static io.anuke.mindustry.Vars.*;
public class Maps implements Disposable{ public class Maps implements Disposable{
/** List of all built-in maps. Filenames only. */ /** 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. */ /** All maps stored in an ordered array. */
private Array<Map> maps = new Array<>(); private Array<Map> maps = new Array<>();
/** Serializer for meta. */ /** Serializer for meta. */

11
core/src/io/anuke/mindustry/maps/filters/BlendFilter.java
View File

@ -11,20 +11,21 @@ import static io.anuke.mindustry.maps.filters.FilterOption.*;
public class BlendFilter extends GenerateFilter{ public class BlendFilter extends GenerateFilter{
float radius = 2f; float radius = 2f;
Block block = Blocks.stone, floor = Blocks.ice; Block block = Blocks.stone, floor = Blocks.ice, ignore = Blocks.air;
{ {
buffered = true; buffered = true;
options( options(
new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f), new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f),
new BlockOption("block", () -> block, b -> block = b, anyOptional), new BlockOption("block", () -> block, b -> block = b, anyOptional),
new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly) new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
new BlockOption("ignore", () -> ignore, b -> ignore = b, floorsOptional)
); );
} }
@Override @Override
public void apply(){ 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; int rad = (int)radius;
boolean found = false; boolean found = false;