From effdaefdf3c2b5ed699faa679d24dfaea52cd701 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 2 Aug 2018 13:58:02 -0400 Subject: [PATCH] Added built-in sandbox map --- core/assets/maps/sandbox.mmap | Bin 0 -> 330359 bytes core/assets/maps/test.mmap | Bin 329594 -> 0 bytes core/src/io/anuke/mindustry/maps/Maps.java | 2 +- .../mindustry/maps/missions/WaveMission.java | 8 +++++--- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 core/assets/maps/sandbox.mmap delete mode 100644 core/assets/maps/test.mmap diff --git a/core/assets/maps/sandbox.mmap b/core/assets/maps/sandbox.mmap new file mode 100644 index 0000000000000000000000000000000000000000..3536178e03d17721cf3294dffb43f0aa652e2f25 GIT binary patch literal 330359 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 diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index f30447fe9a..5b0ce56937 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -19,7 +19,7 @@ import static io.anuke.mindustry.Vars.*; public class Maps implements Disposable{ /**List of all built-in maps.*/ - private static final String[] defaultMapNames = {}; + private static final String[] defaultMapNames = {"sandbox"}; /**Tile format version.*/ private static final int version = 0; diff --git a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java index d3f0e02b8d..18edfbca91 100644 --- a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java @@ -8,6 +8,7 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.Sector; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Floor; +import io.anuke.ucore.noise.Noise; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Mathf; @@ -23,19 +24,20 @@ public class WaveMission implements Mission{ @Override public void generate(Tile[][] tiles, Sector sector){ + Noise.setSeed(0); int coreX = tiles.length/2, coreY = tiles.length/2; float targetElevation = Math.max(tiles[coreX][coreY].getElevation(), 1); int lerpDst = 20; - for(int x = -lerpDst/2; x <= lerpDst/2; x++){ - for(int y = -lerpDst/2; y <= lerpDst/2; y++){ + for(int x = -lerpDst; x <= lerpDst; x++){ + for(int y = -lerpDst; y <= lerpDst; y++){ int wx = tiles.length/2 + x, wy = tiles[0].length/2 + y; float dst = Vector2.dst(wx, wy, coreX, coreY); float elevation = tiles[wx][wy].getElevation(); if(dst < lerpDst){ - elevation = Mathf.lerp(elevation, targetElevation, Mathf.clamp(2*(1f-(dst / lerpDst)))); + elevation = Mathf.lerp(elevation, targetElevation, Mathf.clamp(2*(1f-(dst / lerpDst))) + Noise.nnoise(wx, wy, 8f, 1f)); } if(tiles[wx][wy].floor().liquidDrop == null){