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){