From 289cca3bf04c477023ed118e82713e982928da7a Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 22 Mar 2020 13:16:11 -0400 Subject: [PATCH] Cleanup --- core/assets/planets/TODO.dat | Bin 18605 -> 21011 bytes core/src/mindustry/Vars.java | 20 +++++++++--------- core/src/mindustry/core/World.java | 3 ++- .../maps/planet/TODOPlanetGenerator.java | 2 ++ core/src/mindustry/type/Planet.java | 6 ++++-- core/src/mindustry/type/Sector.java | 6 ++++++ .../mindustry/tools/SectorDataGenerator.java | 4 ++-- 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index d2aaaa70b4a2e99693dadcd86881a5a017809fcd..bc38622ff597b4b6c2c309af959a9414c772a6d8 100644 GIT binary patch literal 21011 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 diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index c756c29886..12821c4bed 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -210,6 +210,16 @@ public class Vars implements Loadable{ Version.init(); + dataDirectory = Core.settings.getDataDirectory(); + screenshotDirectory = dataDirectory.child("screenshots/"); + customMapDirectory = dataDirectory.child("maps/"); + mapPreviewDirectory = dataDirectory.child("previews/"); + saveDirectory = dataDirectory.child("saves/"); + tmpDirectory = dataDirectory.child("tmp/"); + modDirectory = dataDirectory.child("mods/"); + schematicDirectory = dataDirectory.child("schematics/"); + bebuildDirectory = dataDirectory.child("be_builds/"); + if(tree == null) tree = new FileTree(); if(mods == null) mods = new Mods(); @@ -233,16 +243,6 @@ public class Vars implements Loadable{ ios = Core.app.getType() == ApplicationType.iOS; android = Core.app.getType() == ApplicationType.Android; - dataDirectory = Core.settings.getDataDirectory(); - screenshotDirectory = dataDirectory.child("screenshots/"); - customMapDirectory = dataDirectory.child("maps/"); - mapPreviewDirectory = dataDirectory.child("previews/"); - saveDirectory = dataDirectory.child("saves/"); - tmpDirectory = dataDirectory.child("tmp/"); - modDirectory = dataDirectory.child("mods/"); - schematicDirectory = dataDirectory.child("schematics/"); - bebuildDirectory = dataDirectory.child("be_builds/"); - modDirectory.mkdirs(); mods.load(); diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index 8cbc8e958d..90f9179fcb 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -26,7 +26,7 @@ import static mindustry.Vars.*; public class World{ public final Context context = new Context(); - private Map currentMap; + private Map currentMap = new Map(new StringMap()); public @NonNull Tiles tiles = new Tiles(0, 0); private boolean generating, invalidMap; @@ -214,6 +214,7 @@ public class World{ } public void loadSector(Sector sector){ + currentMap = new Map(StringMap.of("name", sector.planet.localizedName + "; Sector " + sector.id)); state.rules.sector = sector; int size = sector.getSize(); loadGenerator(size, size, tiles -> sector.planet.generator.generate(tiles, sector)); diff --git a/core/src/mindustry/maps/planet/TODOPlanetGenerator.java b/core/src/mindustry/maps/planet/TODOPlanetGenerator.java index 7828e51949..2880ddac27 100644 --- a/core/src/mindustry/maps/planet/TODOPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/TODOPlanetGenerator.java @@ -216,6 +216,8 @@ public class TODOPlanetGenerator extends PlanetGenerator{ }); schematics.placeLoadout(Loadouts.advancedShard, spawn.x, spawn.y); + + state.rules.waves = true; } } diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 42c4abc293..ec43b3362e 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -89,8 +89,10 @@ public class Planet extends UnlockableContent{ } } - //for now - sectors.each(s -> s.unlocked = true); + for(Sector sector : sectors){ + sector.unlocked = true; + sector.generate(); + } }else{ sectors = new Array<>(); } diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index 3c3c4d2f28..fa07800efd 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -4,6 +4,7 @@ import arc.math.geom.*; import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; +import arc.util.noise.*; import mindustry.*; import mindustry.ctype.*; import mindustry.game.Saves.*; @@ -38,6 +39,11 @@ public class Sector{ this.data = data; } + public void generate(){ + //TODO use simplex and a seed + hostility = Noise.snoise3(tile.v.x, tile.v.y, tile.v.z, 4f, 1f); + } + public boolean locked(){ return !unlocked; } diff --git a/tools/src/mindustry/tools/SectorDataGenerator.java b/tools/src/mindustry/tools/SectorDataGenerator.java index 7691e71748..ba1909b8f9 100644 --- a/tools/src/mindustry/tools/SectorDataGenerator.java +++ b/tools/src/mindustry/tools/SectorDataGenerator.java @@ -61,9 +61,9 @@ public class SectorDataGenerator{ continue; } - Item item = tile.floor().itemDrop; Liquid liquid = tile.floor().liquidDrop; - if(item != null) content.add(item); + if(tile.floor().itemDrop != null) content.add(tile.floor().itemDrop); + if(tile.overlay().itemDrop != null) content.add(tile.overlay().itemDrop); if(liquid != null) content.add(liquid); if(!tile.block().isStatic()){