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

Fixed some ores not loading in correctly / Conflict check

Browse Source
This commit is contained in:
Anuken
2019-03-12 13:42:20 -04:00
parent 41f734b04d
commit aa69af64fb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/io/MapIO.java
View File

@@ -9,6 +9,7 @@ import io.anuke.arc.graphics.Pixmap;
import io.anuke.arc.graphics.Pixmap.Format; import io.anuke.arc.graphics.Pixmap.Format;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Pack; import io.anuke.arc.util.Pack;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Structs; import io.anuke.arc.util.Structs;
import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.game.MappableContent; import io.anuke.mindustry.game.MappableContent;
@@ -26,6 +27,7 @@ import io.anuke.mindustry.world.blocks.BlockPart;
import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.Floor;
import java.io.*; import java.io.*;
import java.util.Arrays;
import java.util.zip.DeflaterOutputStream; import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream; import java.util.zip.InflaterInputStream;
@@ -390,10 +392,10 @@ public class MapIO{
block = missingBlocks.get(name); block = missingBlocks.get(name);
}else if(name.startsWith("ore-")){ //an ore floor combination }else if(name.startsWith("ore-")){ //an ore floor combination
String[] split = name.split("-"); String[] split = name.split("-");
String itemName = split[1], floorName = split[2]; String itemName = split[1], floorName = Strings.join("-", Arrays.copyOfRange(split, 2, split.length));
Item item = content.getByName(ContentType.item, itemName); Item item = content.getByName(ContentType.item, itemName);
Block oreBlock = item == null ? null : content.getByName(ContentType.block, "ore-" + item.name); Block oreBlock = item == null ? null : content.getByName(ContentType.block, "ore-" + item.name);
Block floor = content.getByName(ContentType.block, floorName); Block floor = missingBlocks.get(floorName, content.getByName(ContentType.block, floorName));
if(oreBlock != null && floor != null){ if(oreBlock != null && floor != null){
oreMap.put(id, oreBlock.id); oreMap.put(id, oreBlock.id);
block = floor; block = floor;

3
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -32,8 +32,7 @@ public class MapsDialog extends FloatingDialog{
Map map = MapIO.readMap(file, true); Map map = MapIO.readMap(file, true);
String name = map.tags.get("name", file.nameWithoutExtension()); String name = map.tags.get("name", file.nameWithoutExtension());
//TODO filename conflict, erasure Map conflict = world.maps.all().find(m -> m.fileName().equals(file.nameWithoutExtension()) || m.name().equals(file.name()));
Map conflict = world.maps.byName(name);
if(conflict != null && !conflict.custom){ if(conflict != null && !conflict.custom){
ui.showError(Core.bundle.format("editor.import.exists", name)); ui.showError(Core.bundle.format("editor.import.exists", name));