From 7bf6099528e2d04d3842fdd6e6fd3c4abbb01c69 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 27 Jul 2019 09:27:03 -0400 Subject: [PATCH] Added 2 new maps --- core/assets/maps/canyon.msav | Bin 14454 -> 15309 bytes core/assets/maps/spiral.msav | Bin 0 -> 15143 bytes core/assets/maps/triad.msav | Bin 0 -> 7092 bytes core/src/io/anuke/mindustry/maps/Map.java | 3 +++ core/src/io/anuke/mindustry/maps/Maps.java | 2 +- desktop-sdl/build.gradle | 5 +++-- 6 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 core/assets/maps/spiral.msav create mode 100644 core/assets/maps/triad.msav diff --git a/core/assets/maps/canyon.msav b/core/assets/maps/canyon.msav index 4eec4a6598e7ef96c16e234688a296e3cefc315a..06f5b6e064e019450534a3e0e758a1bd6dba87e3 100644 GIT binary patch literal 15309 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

-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]~bFMLe4JQnC?R1N1WU)vp(E~hiv-oD&J~o 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 I0b?KXoRzI-A^-pY diff --git a/core/assets/maps/spiral.msav b/core/assets/maps/spiral.msav new file mode 100644 index 0000000000000000000000000000000000000000..367b109627c4122ab74b8b70b91fb0895dfe5742 GIT binary patch literal 15143 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 VSBk&{=Q~NrXmq*f{{Z9^oZ)xwwqXDO literal 0 HcmV?d00001 diff --git a/core/assets/maps/triad.msav b/core/assets/maps/triad.msav new file mode 100644 index 0000000000000000000000000000000000000000..a693b02cba33c763c9c553e10465c92fdf98d047 GIT binary patch literal 7092 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


Up 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 /** 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{