From cf3f540df4b25845cf2141c91a0633d4f7e8416e Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 23 Oct 2020 13:31:55 -0400 Subject: [PATCH] New map --- core/assets/maps/debrisField.msav | Bin 0 -> 8368 bytes core/assets/shaders/space.frag | 2 +- core/src/mindustry/maps/Maps.java | 2 +- core/src/mindustry/maps/filters/OreFilter.java | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 core/assets/maps/debrisField.msav diff --git a/core/assets/maps/debrisField.msav b/core/assets/maps/debrisField.msav new file mode 100644 index 0000000000000000000000000000000000000000..ce13b571bf794e5fce4205b751d0f902c87c8574 GIT binary patch literal 8368 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 GG#}{)XIa+( literal 0 HcmV?d00001 diff --git a/core/assets/shaders/space.frag b/core/assets/shaders/space.frag index 4b95cf7438..3d669cabb7 100755 --- a/core/assets/shaders/space.frag +++ b/core/assets/shaders/space.frag @@ -1,6 +1,6 @@ #define HIGHP #define NSCALE 2700.0 -#define CAMSCALE (NSCALE*5.0) +#define CAMSCALE (NSCALE*10.0) uniform sampler2D u_texture; uniform sampler2D u_stars; diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java index 28e571cf72..9c79ab6cfe 100644 --- a/core/src/mindustry/maps/Maps.java +++ b/core/src/mindustry/maps/Maps.java @@ -29,7 +29,7 @@ import static mindustry.Vars.*; public class Maps{ /** List of all built-in maps. Filenames only. */ - private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "mudFlats", "moltenLake", "archipelago", "veins", "glacier"}; + private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "mudFlats", "moltenLake", "archipelago", "debrisField", "veins", "glacier"}; /** Maps tagged as PvP */ static final String[] pvpMaps = {"veins", "glacier"}; /** All maps stored in an ordered array. */ diff --git a/core/src/mindustry/maps/filters/OreFilter.java b/core/src/mindustry/maps/filters/OreFilter.java index 3d9aee7e6e..7a2ff3ed38 100644 --- a/core/src/mindustry/maps/filters/OreFilter.java +++ b/core/src/mindustry/maps/filters/OreFilter.java @@ -27,7 +27,7 @@ public class OreFilter extends GenerateFilter{ public void apply(){ float noise = noise(in.x, in.y, scl, 1f, octaves, falloff); - if(noise > threshold && in.overlay != Blocks.spawn && (target == Blocks.air || in.floor == target || in.overlay == target)){ + if(noise > threshold && in.overlay != Blocks.spawn && (target == Blocks.air || in.floor == target || in.overlay == target) && in.floor.asFloor().hasSurface()){ in.overlay = ore; } }