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

Added 2 new maps

Browse Source
This commit is contained in:
Anuken
2019-07-27 09:27:03 -04:00
parent e90a4eb71d
commit 7bf6099528
6 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/canyon.msav
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

3
core/src/io/anuke/mindustry/maps/Map.java
View File

@ -71,6 +71,9 @@ public class Map implements Comparable<Map>{
/** Returns the generation filters that this map uses on load.*/ /** Returns the generation filters that this map uses on load.*/
public Array<GenerateFilter> filters(){ public Array<GenerateFilter> filters(){
if(build != -1 && build < 83 && tags.get("genfilters", "").isEmpty()){
return Array.with();
}
return world.maps.readFilters(tags.get("genfilters", "")); return world.maps.readFilters(tags.get("genfilters", ""));
} }

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", "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. */ /** 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. */

5
desktop-sdl/build.gradle
View File

@ -7,6 +7,7 @@ project.ext.mainClassName = "io.anuke.mindustry.desktopsdl.DesktopLauncher"
project.ext.assetsDir = new File("../core/assets") project.ext.assetsDir = new File("../core/assets")
def IKVM_DIR = System.env.IKVM_HOME def IKVM_DIR = System.env.IKVM_HOME
def getTarget = { return project.hasProperty("target") ? project.properties["target"] : "windows" }
task run(dependsOn: classes, type: JavaExec) { task run(dependsOn: classes, type: JavaExec) {
main = project.mainClassName main = project.mainClassName
@ -35,7 +36,7 @@ task dist(type: Jar, dependsOn: classes) {
from files(project.assetsDir); from files(project.assetsDir);
//use target = all for all platforms //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 == "windows") exclude('**.so', "**.dylib")
if(target == "mac") exclude('**.so', "**.dll") if(target == "mac") exclude('**.so', "**.dll")
if(target == "linux") exclude('**.dll', "**.dylib") if(target == "linux") exclude('**.dll', "**.dylib")
@ -50,7 +51,7 @@ task ikZip(type: Zip){
def filename = "$appName-windows-${version}" def filename = "$appName-windows-${version}"
from "build/libs/$filename" from "build/libs/$filename"
archiveBaseName = "$appName-windows" archiveBaseName = "$appName-${getTarget()}"
} }
task ikdist{ task ikdist{