Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New map

Browse Source
This commit is contained in:
Anuken
2020-10-23 13:31:55 -04:00
parent 84171a8619
commit cf3f540df4
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/debrisField.msav Normal file
View File

Binary file not shown.

2
core/assets/shaders/space.frag
View File

@@ -1,6 +1,6 @@
#define HIGHP #define HIGHP
#define NSCALE 2700.0 #define NSCALE 2700.0
#define CAMSCALE (NSCALE*5.0) #define CAMSCALE (NSCALE*10.0)
uniform sampler2D u_texture; uniform sampler2D u_texture;
uniform sampler2D u_stars; uniform sampler2D u_stars;

2
core/src/mindustry/maps/Maps.java
View File

@@ -29,7 +29,7 @@ import static mindustry.Vars.*;
public class Maps{ public class Maps{
/** List of all built-in maps. Filenames only. */ /** 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 */ /** Maps tagged as PvP */
static final String[] pvpMaps = {"veins", "glacier"}; static final String[] pvpMaps = {"veins", "glacier"};
/** All maps stored in an ordered array. */ /** All maps stored in an ordered array. */

2
core/src/mindustry/maps/filters/OreFilter.java
View File

@@ -27,7 +27,7 @@ public class OreFilter extends GenerateFilter{
public void apply(){ public void apply(){
float noise = noise(in.x, in.y, scl, 1f, octaves, falloff); 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; in.overlay = ore;
} }
} }