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

Light coverage based on player structures

Browse Source
This commit is contained in:
Anuken
2025-05-29 14:19:33 -04:00
parent 8f0ca13ace
commit d4d8e6d42c
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/game/SectorInfo.java
View File

@@ -73,6 +73,8 @@ public class SectorInfo{
public float secondsPassed; public float secondsPassed;
/** How many minutes this sector has been captured. */ /** How many minutes this sector has been captured. */
public float minutesCaptured; public float minutesCaptured;
/** Light coverage in terms of radius. */
public float lightCoverage;
/** Display name. */ /** Display name. */
public @Nullable String name; public @Nullable String name;
/** Displayed icon. */ /** Displayed icon. */
@@ -180,6 +182,15 @@ public class SectorInfo{
winWave = state.rules.sector.preset.captureWave; winWave = state.rules.sector.preset.captureWave;
} }
lightCoverage = 0f;
for(var build : state.rules.defaultTeam.data().buildings){
if(build.block.emitLight){
lightCoverage += build.block.lightRadius * build.efficiency;
}
}
lightCoverage += state.rules.defaultTeam.data().units.sumf(u -> u.type.lightRadius/2f);
state.wave = wave; state.wave = wave;
state.rules.waves = waves; state.rules.waves = waves;
state.rules.waveSpacing = waveSpacing; state.rules.waveSpacing = waveSpacing;

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

@@ -114,24 +114,31 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
@Override @Override
public Color getEmissiveColor(Vec3 position){ public Color getEmissiveColor(Vec3 position){
float dst = 999f, captureDst = 999f; float dst = 999f, captureDst = 999f, lightScl = 0f;
for(Sector sector : Planets.serpulo.sectors){ for(Sector sector : Planets.serpulo.sectors){
if(sector.hasEnemyBase() && !sector.isCaptured()){ if(sector.hasEnemyBase() && !sector.isCaptured()){
dst = Math.min(dst, position.dst(sector.tile.v) - (sector.preset != null ? sector.preset.difficulty/10f * 0.03f - 0.03f : 0f)); dst = Math.min(dst, position.dst(sector.tile.v) - (sector.preset != null ? sector.preset.difficulty/10f * 0.03f - 0.03f : 0f));
}else if(sector.hasBase()){ }else if(sector.hasBase()){
captureDst = Math.min(captureDst, position.dst(sector.tile.v)); float cdst = position.dst(sector.tile.v);
if(cdst < captureDst){
captureDst = cdst;
lightScl = sector.info.lightCoverage;
}
} }
} }
lightScl = Math.min(lightScl / 50000f, 1.3f);
if(lightScl < 1f) lightScl = Interp.pow5Out.apply(lightScl);
float freq = 0.05f; float freq = 0.05f;
if(position.dst(basePos) < 0.55f ? if(position.dst(basePos) < 0.55f ?
dst*metalDstScl + Simplex.noise3d(seed, 3, 0.4, 5.5f, position.x, position.y + 200f, position.z)*0.08f + ((basePos.dst(position) + 0.00f) % freq < freq/2f ? 1f : 0f) * 0.07f < 0.08f : dst*metalDstScl + Simplex.noise3d(seed, 3, 0.4, 5.5f, position.x, position.y + 200f, position.z)*0.08f + ((basePos.dst(position) + 0.00f) % freq < freq/2f ? 1f : 0f) * 0.07f < 0.08f :
dst*metalDstScl + Simplex.noise3d(seed, 3, 0.4, 6f, position.x, position.y + 370f, position.z)*0.06f < 0.045){ dst*metalDstScl + Simplex.noise3d(seed, 3, 0.4, 9f, position.x, position.y + 370f, position.z)*0.06f < 0.045){
return Tmp.c1.set(Team.crux.color).mul(0.8f + Simplex.noise3d(seed, 1, 1, 9f, position.x, position.y + 99f, position.z) * 0.4f) return Tmp.c1.set(Team.crux.color).mul(0.8f + Simplex.noise3d(seed, 1, 1, 9f, position.x, position.y + 99f, position.z) * 0.4f)
.lerp(Team.sharded.color, 0.2f*Simplex.noise3d(seed, 1, 1, 9f, position.x, position.y + 999f, position.z)); .lerp(Team.sharded.color, 0.2f*Simplex.noise3d(seed, 1, 1, 9f, position.x, position.y + 999f, position.z));
}else if(captureDst*metalDstScl + Simplex.noise3d(seed, 3, 0.4, 6f, position.x, position.y + 600f, position.z)*0.07f < 0.05){ }else if(captureDst*metalDstScl + Simplex.noise3d(seed, 3, 0.4, 9f, position.x, position.y + 600f, position.z)*0.07f < 0.05 * lightScl){
return Tmp.c1.set(Team.sharded.color).mul(0.7f + Simplex.noise3d(seed, 1, 1, 9f, position.x, position.y + 99f, position.z) * 0.4f) return Tmp.c1.set(Team.sharded.color).mul(0.7f + Simplex.noise3d(seed, 1, 1, 9f, position.x, position.y + 99f, position.z) * 0.4f)
.lerp(Team.crux.color, 0.3f*Simplex.noise3d(seed, 1, 1, 9f, position.x, position.y + 999f, position.z)); .lerp(Team.crux.color, 0.3f*Simplex.noise3d(seed, 1, 1, 9f, position.x, position.y + 999f, position.z));
} }