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

New map / Unit stat tweaks / FileChooser keyboard input

Browse Source
This commit is contained in:
Anuken
2020-10-21 20:32:35 -04:00
parent a80d0cc457
commit f0d74e2705
12 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ import static mindustry.Vars.*;
public class Maps{
/** List of all built-in maps. Filenames only. */
private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "mudFlats", "veins", "glacier"};
private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "mudFlats", "moltenLake", "veins", "glacier"};
/** Maps tagged as PvP */
static final String[] pvpMaps = {"veins", "glacier"};
/** All maps stored in an ordered array. */

4
core/src/mindustry/maps/filters/NoiseFilter.java
View File

@@ -19,7 +19,7 @@ public class NoiseFilter extends GenerateFilter{
new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
new BlockOption("wall", () -> block, b -> block = b, wallsOnly)
new BlockOption("wall", () -> block, b -> block = b, wallsOptional)
);
}
@@ -29,7 +29,7 @@ public class NoiseFilter extends GenerateFilter{
if(noise > threshold){
in.floor = floor;
if(wallsOnly.get(in.block)) in.block = block;
if(in.block != Blocks.air) in.block = block;
}
}
}