This commit is contained in:
Anuken
2023-01-07 13:15:56 -05:00
parent 54a9955e30
commit 246591eab4
4 changed files with 19 additions and 7 deletions

View File

@@ -292,6 +292,7 @@ server.invalidport = Invalid port number!
server.error = [scarlet]Error hosting server. server.error = [scarlet]Error hosting server.
save.new = New Save save.new = New Save
save.overwrite = Are you sure you want to overwrite\nthis save slot? save.overwrite = Are you sure you want to overwrite\nthis save slot?
save.nocampaign = Individual save files from the campaign cannot be imported.
overwrite = Overwrite overwrite = Overwrite
save.none = No saves found! save.none = No saves found!
savefail = Failed to save game! savefail = Failed to save game!

View File

@@ -656,6 +656,11 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
public void postGenerate(Tiles tiles){ public void postGenerate(Tiles tiles){
if(sector.hasEnemyBase()){ if(sector.hasEnemyBase()){
basegen.postGenerate(); basegen.postGenerate();
//spawn air enemies
if(spawner.countGroundSpawns() == 0){
state.rules.spawns = Waves.generate(sector.threat, new Rand(sector.id), state.rules.attackMode, true, false);
}
} }
} }
} }

View File

@@ -264,7 +264,7 @@ public class ArcNetProvider implements NetProvider{
callback.get(host); callback.get(host);
foundAddresses.add(packet.getAddress()); foundAddresses.add(packet.getAddress());
}catch(Exception e){ }catch(Exception e){
//don't crash when there's an error pinging a a server or parsing data //don't crash when there's an error pinging a server or parsing data
e.printStackTrace(); e.printStackTrace();
} }
} }

View File

@@ -192,6 +192,11 @@ public class LoadDialog extends BaseDialog{
buttons.button("@save.import", Icon.add, () -> { buttons.button("@save.import", Icon.add, () -> {
platform.showFileChooser(true, saveExtension, file -> { platform.showFileChooser(true, saveExtension, file -> {
if(SaveIO.isSaveValid(file)){ if(SaveIO.isSaveValid(file)){
var meta = SaveIO.getMeta(file);
if(meta.rules.sector != null){
ui.showErrorMessage("@save.nocampaign");
}else{
try{ try{
control.saves.importSave(file); control.saves.importSave(file);
rebuild(); rebuild();
@@ -199,6 +204,7 @@ public class LoadDialog extends BaseDialog{
e.printStackTrace(); e.printStackTrace();
ui.showException("@save.import.fail", e); ui.showException("@save.import.fail", e);
} }
}
}else{ }else{
ui.showErrorMessage("@save.import.invalid"); ui.showErrorMessage("@save.import.invalid");
} }