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

Removed sound assets / Fixed text wrap / Proper screen clear

Browse Source
This commit is contained in:
Anuken
2018-07-19 11:06:10 -04:00
parent 091f591ffb
commit 56fc40a64d
40 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/maps/Sectors.java
View File

@@ -117,7 +117,7 @@ public class Sectors{
int toX = x * sectorSize / sectorImageSize;
int toY = y * sectorSize / sectorImageSize;
GenResult result = world.generator().generateTile(sector.x, sector.y, toX, toY);
GenResult result = world.generator().generateTile(sector.x, sector.y, toX, toY, false);
int color = ColorMapper.colorFor(result.floor, result.wall, Team.none, result.elevation);
pixmap.drawPixel(x, pixmap.getHeight() - 1 - y, color);

8
core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
View File

@@ -206,6 +206,10 @@ public class WorldGenerator{
}
public GenResult generateTile(int sectorX, int sectorY, int localX, int localY){
return generateTile(sectorX, sectorY, localX, localY, true);
}
public GenResult generateTile(int sectorX, int sectorY, int localX, int localY, boolean detailed){
int x = sectorX * sectorSize + localX;
int y = sectorY * sectorSize + localY;
@@ -243,7 +247,7 @@ public class WorldGenerator{
if(dst < elevDip){
elevation -= (elevDip - dst) / elevDip * 3.0;
}else if(r > 0.9){
}else if(detailed && r > 0.9){
floor = Blocks.water;
elevation = 0;
@@ -252,7 +256,7 @@ public class WorldGenerator{
}
}
if(wall == Blocks.air && decoration.containsKey(floor) && random.chance(0.03)){
if(detailed && wall == Blocks.air && decoration.containsKey(floor) && random.chance(0.03)){
wall = decoration.get(floor);
}