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

Minor sound tweaks / Limited launches to not-in-progress sectors

Browse Source
This commit is contained in:
Anuken
2025-12-15 21:17:22 -05:00
parent a0fdf07f1e
commit 2c6a650856
19 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,25 +69,24 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
}
//currently played (selected) sector has all the resources
if(selected != null && selected.planet == destination.planet && selected.hasBase() && selected.items().has(tmpItems)){
if(selected != null && selected.planet == destination.planet && selected.hasBase() && selected.items().has(tmpItems) && !selected.isAttacked()){
return selected;
}else{
//find the closest sector that has resources (ranked by distance, not item quantity)
return destination.planet.sectors.min(s -> s.hasBase() && s.items().has(tmpItems), s -> s.tile.v.dst(destination.tile.v));
return destination.planet.sectors.min(s -> s.hasBase() && !s.isAttacked() && s.items().has(tmpItems), s -> s.tile.v.dst(destination.tile.v));
}
}else{
Sector launchSector = selected != null && selected.planet == destination.planet && selected.hasBase() ? selected : null;
Sector launchSector = selected != null && selected.planet == destination.planet && selected.hasBase() && !selected.isAttacked() ? selected : null;
//directly nearby.
if(destination.near().contains(launchSector)) return launchSector;
Sector launchFrom = launchSector;
if(launchFrom == null || destination.preset == null){
//TODO pick one with the most resources
launchFrom = destination.near().find(Sector::hasBase);
launchFrom = destination.near().find(s -> s.hasBase() && !s.isAttacked());
if(launchFrom == null && destination.preset != null){
if(launchSector != null) return launchSector;
launchFrom = destination.planet.sectors.min(s -> !s.hasBase() ? Float.MAX_VALUE : s.tile.v.dst2(destination.tile.v));
if(!launchFrom.hasBase()) launchFrom = null;
launchFrom = destination.planet.sectors.min(s -> s.hasBase() && !s.isAttacked(), s -> s.tile.v.dst2(destination.tile.v));
}
}