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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/type/UnitType.java
This commit is contained in:
Anuken
2021-10-01 09:41:33 -04:00
parent 5f3cef251b b265ddac03
commit 10b8a6e4a5
20 changed files with 236 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/maps/generators/PlanetGenerator.java
View File

@@ -76,7 +76,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
//sort counts in descending order
Seq<Entry<Block>> entries = floorc.entries().toArray();
entries.sort(e -> -e.value);
//remove all blocks occuring < 30 times - unimportant
//remove all blocks occurring < 30 times - unimportant
entries.removeAll(e -> e.value < 30);
Block[] floors = new Block[entries.size];
@@ -84,7 +84,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
floors[i] = entries.get(i).key;
}
//TODO bad code
//bad contains() code, but will likely never be fixed
boolean hasSnow = floors.length > 0 && (floors[0].name.contains("ice") || floors[0].name.contains("snow"));
boolean hasRain = floors.length > 0 && !hasSnow && content.contains(Liquids.water) && !floors[0].name.contains("sand");
boolean hasDesert = floors.length > 0 && !hasSnow && !hasRain && floors[0] == Blocks.sand;

146
core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
View File

@@ -14,6 +14,7 @@ import mindustry.graphics.g3d.PlanetGrid.*;
import mindustry.maps.generators.*;
import mindustry.type.*;
import mindustry.world.*;
import mindustry.world.blocks.environment.*;
import static mindustry.Vars.*;
@@ -165,14 +166,14 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
connected.add(this);
}
void con(int x1, int y1, int x2, int y2){
void join(int x1, int y1, int x2, int y2){
float nscl = rand.random(100f, 140f) * 6f;
int stroke = rand.random(3, 9);
brush(pathfind(x1, y1, x2, y2, tile -> (tile.solid() ? 50f : 0f) + noise(tile.x, tile.y, 2, 0.4f, 1f / nscl) * 500, Astar.manhattan), stroke);
}
void connect(Room to){
if(!connected.add(to)) return;
if(!connected.add(to) || to == this) return;
Vec2 midpoint = Tmp.v1.set(to.x, to.y).add(x, y).scl(0.5f);
rand.nextFloat();
@@ -188,8 +189,52 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
int mx = (int)midpoint.x, my = (int)midpoint.y;
con(x, y, mx, my);
con(mx, my, to.x, to.y);
join(x, y, mx, my);
join(mx, my, to.x, to.y);
}
void joinLiquid(int x1, int y1, int x2, int y2){
float nscl = rand.random(100f, 140f) * 6f;
int rad = rand.random(5, 10);
int avoid = 2 + rad;
var path = pathfind(x1, y1, x2, y2, tile -> (tile.solid() || !tile.floor().isLiquid ? 70f : 0f) + noise(tile.x, tile.y, 2, 0.4f, 1f / nscl) * 500, Astar.manhattan);
path.each(t -> {
//don't place liquid paths near the core
if(Mathf.dst2(t.x, t.y, x2, y2) <= avoid * avoid){
return;
}
for(int x = -rad; x <= rad; x++){
for(int y = -rad; y <= rad; y++){
int wx = t.x + x, wy = t.y + y;
if(Structs.inBounds(wx, wy, width, height) && Mathf.within(x, y, rad)){
Tile other = tiles.getn(wx, wy);
other.setBlock(Blocks.air);
if(Mathf.within(x, y, rad - 1) && !other.floor().isLiquid){
Floor floor = other.floor();
//TODO does not respect tainted floors
other.setFloor((Floor)(floor == Blocks.sand || floor == Blocks.salt ? Blocks.sandWater : Blocks.darksandTaintedWater));
}
}
}
}
});
}
void connectLiquid(Room to){
if(to == this) return;
Vec2 midpoint = Tmp.v1.set(to.x, to.y).add(x, y).scl(0.5f);
rand.nextFloat();
//add randomized offset to avoid straight lines
midpoint.add(Tmp.v2.setToRandomDirection(rand).scl(Tmp.v1.dst(x, y)));
midpoint.sub(width/2f, height/2f).limit(width / 2f / Mathf.sqrt3).add(width/2f, height/2f);
int mx = (int)midpoint.x, my = (int)midpoint.y;
joinLiquid(x, y, mx, my);
joinLiquid(mx, my, to.x, to.y);
}
}
@@ -250,10 +295,12 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
}
}
//clear radius around each room
for(Room room : roomseq){
erase(room.x, room.y, room.radius);
}
//randomly connect rooms together
int connections = rand.random(Math.max(rooms - 1, 1), rooms + 3);
for(int i = 0; i < connections; i++){
roomseq.random(rand).connect(roomseq.random(rand));
@@ -267,30 +314,27 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
cells(1);
//shoreline setup
int deepRadius = 4;
int tlen = tiles.width * tiles.height;
int total = 0, waters = 0;
pass((x, y) -> {
if(floor.asFloor().isLiquid && !floor.asFloor().isDeep()){
for(int cx = -deepRadius; cx <= deepRadius; cx++){
for(int cy = -deepRadius; cy <= deepRadius; cy++){
if((cx) * (cx) + (cy) * (cy) <= deepRadius * deepRadius){
int wx = cx + x, wy = cy + y;
Tile tile = tiles.get(wx, wy);
if(tile != null && (!tile.floor().isLiquid || tile.block() != Blocks.air)){
//found something solid, skip replacing anything
return;
}
}
}
for(int i = 0; i < tlen; i++){
Tile tile = tiles.geti(i);
if(tile.block() == Blocks.air){
total ++;
if(tile.floor().liquidDrop == Liquids.water){
waters ++;
}
floor = floor == Blocks.darksandTaintedWater ? Blocks.taintedWater : Blocks.water;
}
});
}
boolean naval = (float)waters / total >= 0.26f;
//create water pathway if the map is flooded
if(naval){
for(Room room : enemies){
room.connectLiquid(spawn);
}
}
distort(10f, 6f);
@@ -318,6 +362,56 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
}
});
//shoreline setup
pass((x, y) -> {
int deepRadius = 3;
if(floor.asFloor().isLiquid && floor.asFloor().shallow){
for(int cx = -deepRadius; cx <= deepRadius; cx++){
for(int cy = -deepRadius; cy <= deepRadius; cy++){
if((cx) * (cx) + (cy) * (cy) <= deepRadius * deepRadius){
int wx = cx + x, wy = cy + y;
Tile tile = tiles.get(wx, wy);
if(tile != null && (!tile.floor().isLiquid || tile.block() != Blocks.air)){
//found something solid, skip replacing anything
return;
}
}
}
}
floor = floor == Blocks.darksandTaintedWater ? Blocks.taintedWater : Blocks.water;
}
});
if(naval){
int deepRadius = 2;
//TODO code is very similar, but annoying to extract into a separate function
pass((x, y) -> {
if(floor.asFloor().isLiquid && !floor.asFloor().isDeep() && !floor.asFloor().shallow){
for(int cx = -deepRadius; cx <= deepRadius; cx++){
for(int cy = -deepRadius; cy <= deepRadius; cy++){
if((cx) * (cx) + (cy) * (cy) <= deepRadius * deepRadius){
int wx = cx + x, wy = cy + y;
Tile tile = tiles.get(wx, wy);
if(tile != null && (tile.floor().shallow || !tile.floor().isLiquid)){
//found something shallow, skip replacing anything
return;
}
}
}
}
floor = floor == Blocks.water ? Blocks.deepwater : Blocks.deepTaintedWater;
}
});
}
Seq<Block> ores = Seq.with(Blocks.oreCopper, Blocks.oreLead);
float poles = Math.abs(sector.tile.v.y);
float nmag = 0.5f;
@@ -555,7 +649,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
state.rules.enemyCoreBuildRadius = 600f;
//spawn air only when spawn is blocked
state.rules.spawns = Waves.generate(difficulty, new Rand(sector.id), state.rules.attackMode, state.rules.attackMode && spawner.countGroundSpawns() == 0);
state.rules.spawns = Waves.generate(difficulty, new Rand(sector.id), state.rules.attackMode, state.rules.attackMode && spawner.countGroundSpawns() == 0, naval);
}
@Override