From 6d50a747e37b3dc56b01a2eefd91516a3336bf1c Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 16 Jan 2019 20:37:43 -0500 Subject: [PATCH] Basic map shading --- core/assets/bundles/bundle.properties | 2 +- core/assets/maps/groundZero.mmap | Bin 0 -> 330325 bytes core/assets/maps/sandbox.mmap | Bin 330441 -> 0 bytes .../io/anuke/mindustry/content/Blocks.java | 7 --- .../src/io/anuke/mindustry/content/Zones.java | 6 +-- core/src/io/anuke/mindustry/core/World.java | 43 ++++++++++++++++++ .../io/anuke/mindustry/editor/MapEditor.java | 3 -- core/src/io/anuke/mindustry/maps/Maps.java | 9 +--- .../mindustry/maps/generators/Generator.java | 4 ++ .../maps/generators/MapGenerator.java | 8 +++- core/src/io/anuke/mindustry/type/Zone.java | 5 ++ .../io/anuke/mindustry/world/blocks/Rock.java | 2 + 12 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 core/assets/maps/groundZero.mmap delete mode 100644 core/assets/maps/sandbox.mmap diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 2daa533eff..900fd0f44d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -238,7 +238,7 @@ error.mapnotfound = Map file not found! error.io = Network I/O error. error.any = Unknown network error. -zone.wasteland.name = Wasteland +zone.groundZero.name = Ground Zero settings.language = Language settings.reset = Reset to Defaults diff --git a/core/assets/maps/groundZero.mmap b/core/assets/maps/groundZero.mmap new file mode 100644 index 0000000000000000000000000000000000000000..aa4cb1a03802f5fdaf23f9535d91fdb8dc5f3e77 GIT binary patch literal 330325 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 literal 0 HcmV?d00001 diff --git a/core/assets/maps/sandbox.mmap b/core/assets/maps/sandbox.mmap deleted file mode 100644 index 14e89ed3b77dc48e9e2e20eff1a55a6c9ca01405..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330441 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 map.width() || y >= map.height()){ - return; - } byte writeID = drawBlock.id; byte partID = Blocks.blockpart.id; diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index 6af98f428e..51f8b85ec6 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -63,14 +63,7 @@ public class Maps implements Disposable{ FileHandle file = Core.files.internal("maps/" + name + "." + mapExtension); try(DataInputStream ds = new DataInputStream(file.read())) { - MapMeta meta = MapIO.readMapMeta(ds); - Map map = new Map(name, meta, false, file::read); - - if (!headless){ - map.texture = new Texture(MapIO.generatePixmap(MapIO.readTileData(ds, meta, true))); - } - - return map; + return new Map(name, MapIO.readMapMeta(ds), false, file::read); }catch(IOException e){ throw new RuntimeException(e); } diff --git a/core/src/io/anuke/mindustry/maps/generators/Generator.java b/core/src/io/anuke/mindustry/maps/generators/Generator.java index 1f818fc499..dac0b08093 100644 --- a/core/src/io/anuke/mindustry/maps/generators/Generator.java +++ b/core/src/io/anuke/mindustry/maps/generators/Generator.java @@ -12,5 +12,9 @@ public abstract class Generator{ public Generator(){} + public void init(){ + + } + public abstract void generate(Tile[][] tiles); } diff --git a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java index 92c5def5f9..9d593e0e1f 100644 --- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java @@ -10,9 +10,15 @@ import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.world; public class MapGenerator extends Generator{ - private final Map map; + private Map map; + private String mapName; public MapGenerator(String mapName){ + this.mapName = mapName; + } + + @Override + public void init(){ map = world.maps.loadInternalMap(mapName); width = map.meta.width; height = map.meta.height; diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java index fe922a29f2..87a3cc45b6 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/core/src/io/anuke/mindustry/type/Zone.java @@ -21,6 +21,11 @@ public class Zone extends UnlockableContent{ this.generator = generator; } + @Override + public void init(){ + generator.init(); + } + @Override public boolean alwaysUnlocked(){ return alwaysUnlocked; diff --git a/core/src/io/anuke/mindustry/world/blocks/Rock.java b/core/src/io/anuke/mindustry/world/blocks/Rock.java index 57680e6b75..d2cca6e9cf 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Rock.java +++ b/core/src/io/anuke/mindustry/world/blocks/Rock.java @@ -19,11 +19,13 @@ public class Rock extends Block{ @Override public void draw(Tile tile){ + Draw.colorl(1f - tile.getRotation() / 4f); if(variants > 0){ Draw.rect(regions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, regions.length - 1))], tile.worldx(), tile.worldy()); }else{ Draw.rect(region, tile.worldx(), tile.worldy()); } + Draw.color(); } @Override