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

even less broken

Browse Source
This commit is contained in:
Anuken
2019-05-05 22:09:02 -04:00
parent bf073a84c8
commit 20fbe2fbbe
16 changed files with 343 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java
View File

@@ -156,8 +156,7 @@ public abstract class BasicGenerator extends RandomGenerator{
block = tiles[x][y].block();
ore = tiles[x][y].overlay();
r.accept(x, y);
tiles[x][y] = new Tile(x, y, floor.id, block.id);
tiles[x][y].setOverlay(ore);
tiles[x][y] = new Tile(x, y, floor.id, ore.id, block.id);
}
}
}

21
core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
View File

@@ -12,8 +12,7 @@ import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Loadout;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.StaticWall;
import io.anuke.mindustry.world.blocks.*;
import io.anuke.mindustry.world.blocks.storage.CoreBlock;
import io.anuke.mindustry.world.blocks.storage.StorageBlock;
@@ -88,12 +87,12 @@ public class MapGenerator extends Generator{
tiles[x][y].setBlock(Blocks.air);
}
if(tiles[x][y].block() == Blocks.spawn && enemySpawns != -1){
if(tiles[x][y].overlay() == Blocks.spawn && enemySpawns != -1){
enemies.add(new Point2(x, y));
tiles[x][y].setBlock(Blocks.air);
tiles[x][y].setOverlay(Blocks.air);
}
if(tiles[x][y].block() == Blocks.part){
if(tiles[x][y].block() instanceof BlockPart){
tiles[x][y].setBlock(Blocks.air);
}
}
@@ -111,13 +110,15 @@ public class MapGenerator extends Generator{
if(((tile.block() instanceof StaticWall
&& tiles[newX][newY].block() instanceof StaticWall)
|| (tile.block() == Blocks.air && !tiles[newX][newY].block().synthetic())
|| (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall)) && tiles[newX][newY].block() != Blocks.spawn && tile.block() != Blocks.spawn){
|| (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall))){
tile.setBlock(tiles[newX][newY].block());
}
if(distortFloor){
tile.setFloor(tiles[newX][newY].floor());
tile.setOverlay(tiles[newX][newY].overlay());
if(tiles[newX][newY].overlay() != Blocks.spawn && tile.overlay() != Blocks.spawn){
tile.setOverlay(tiles[newX][newY].overlay());
}
}
for(Decoration decor : decorations){
@@ -150,7 +151,7 @@ public class MapGenerator extends Generator{
enemies.shuffle();
for(int i = 0; i < enemySpawns; i++){
Point2 point = enemies.get(i);
tiles[point.x][point.y].setBlock(Blocks.spawn);
tiles[point.x][point.y].setOverlay(Blocks.spawn);
int rad = 10, frad = 12;
@@ -160,7 +161,9 @@ public class MapGenerator extends Generator{
double dst = Mathf.dst(x, y);
if(dst < frad && Structs.inBounds(wx, wy, tiles) && (dst <= rad || Mathf.chance(0.5))){
Tile tile = tiles[wx][wy];
tile.clearOverlay();
if(tile.overlay() != Blocks.spawn){
tile.clearOverlay();
}
}
}
}

3
core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java
View File

@@ -26,8 +26,7 @@ public abstract class RandomGenerator extends Generator{
block = Blocks.air;
ore = Blocks.air;
generate(x, y);
tiles[x][y] = new Tile(x, y, floor.id, block.id);
tiles[x][y].setOverlay(ore);
tiles[x][y] = new Tile(x, y, floor.id, ore.id, block.id);
}
}

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

@@ -41,7 +41,7 @@ public class DesertWastesGenerator extends BasicGenerator{
overlay(tiles, Blocks.sand, Blocks.pebbles, 0.15f, 5, 0.8f, 30f, 0.62f);
//scatter(tiles, Blocks.sandRocks, Blocks.creeptree, 1f);
tiles[endX][endY].setBlock(Blocks.spawn);
tiles[endX][endY].setOverlay(Blocks.spawn);
loadout.setup(spawnX, spawnY);
}
}

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

@@ -37,7 +37,7 @@ public class OvergrowthGenerator extends BasicGenerator{
noise(tiles, Blocks.darksandTaintedWater, Blocks.duneRocks, 4, 0.7f, 120f, 0.64f);
//scatter(tiles, Blocks.sporePine, Blocks.whiteTreeDead, 1f);
tiles[endX][endY].setBlock(Blocks.spawn);
tiles[endX][endY].setOverlay(Blocks.spawn);
loadout.setup(spawnX, spawnY);
}
}