diff --git a/core/assets/maps/canyon.msav b/core/assets/maps/canyon.msav index 4eec4a6598..06f5b6e064 100644 Binary files a/core/assets/maps/canyon.msav and b/core/assets/maps/canyon.msav differ diff --git a/core/assets/maps/spiral.msav b/core/assets/maps/spiral.msav new file mode 100644 index 0000000000..367b109627 Binary files /dev/null and b/core/assets/maps/spiral.msav differ diff --git a/core/assets/maps/triad.msav b/core/assets/maps/triad.msav new file mode 100644 index 0000000000..a693b02cba Binary files /dev/null and b/core/assets/maps/triad.msav differ diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java index 05878572b8..89165b14c8 100644 --- a/core/src/io/anuke/mindustry/maps/Map.java +++ b/core/src/io/anuke/mindustry/maps/Map.java @@ -71,6 +71,9 @@ public class Map implements Comparable{ /** Returns the generation filters that this map uses on load.*/ public Array filters(){ + if(build != -1 && build < 83 && tags.get("genfilters", "").isEmpty()){ + return Array.with(); + } return world.maps.readFilters(tags.get("genfilters", "")); } diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index 0bbc2defbd..533e9d53a0 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", "shattered", "wasteland", "veins", "canyon"}; + private static String[] defaultMapNames = {"fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "canyon", "spiral", "triad", "veins", "glacier"}; /** All maps stored in an ordered array. */ private Array maps = new Array<>(); /** Serializer for meta. */ diff --git a/desktop-sdl/build.gradle b/desktop-sdl/build.gradle index 14abb7c630..2b15ccc5ca 100644 --- a/desktop-sdl/build.gradle +++ b/desktop-sdl/build.gradle @@ -7,6 +7,7 @@ project.ext.mainClassName = "io.anuke.mindustry.desktopsdl.DesktopLauncher" project.ext.assetsDir = new File("../core/assets") def IKVM_DIR = System.env.IKVM_HOME +def getTarget = { return project.hasProperty("target") ? project.properties["target"] : "windows" } task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName @@ -35,7 +36,7 @@ task dist(type: Jar, dependsOn: classes) { from files(project.assetsDir); //use target = all for all platforms - def target = project.hasProperty("target") ? project.properties["target"] : "windows"; + def target = getTarget() if(target == "windows") exclude('**.so', "**.dylib") if(target == "mac") exclude('**.so', "**.dll") if(target == "linux") exclude('**.dll', "**.dylib") @@ -50,7 +51,7 @@ task ikZip(type: Zip){ def filename = "$appName-windows-${version}" from "build/libs/$filename" - archiveBaseName = "$appName-windows" + archiveBaseName = "$appName-${getTarget()}" } task ikdist{