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

Server sector commands / World data compression / Snapshot sent w/ world

Browse Source
This commit is contained in:
Anuken
2018-08-15 17:25:19 -04:00
parent 8dbd0a6130
commit d4d9d59fe4
5 changed files with 169 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -38,13 +38,16 @@ import static io.anuke.ucore.util.Log.*;
public class ServerControl extends Module{
private final CommandHandler handler = new CommandHandler("");
private ShuffleMode mode;
//consecutive sector losses
private int gameOvers;
public ServerControl(String[] args){
Settings.defaultList(
"shufflemode", "normal",
"bans", "",
"admins", "",
"sectorid", 0
"sector_x", 0,
"sector_y", 1
);
mode = ShuffleMode.valueOf(Settings.getString("shufflemode"));
@@ -105,7 +108,14 @@ public class ServerControl extends Module{
state.set(State.playing);
}
}else{
info("Re-trying sector map.");
if(gameOvers >= 2){
info("Two consecutive game-overs detected, shifting sector Y.");
Settings.putInt("sector_x", Settings.getInt("sector_x") - 1);
Settings.putInt("sector_y", Settings.getInt("sector_y") + 1);
Settings.save();
}
info("Re-trying sector map: {0} {1}", Settings.getInt("sector_x"), Settings.getInt("sector_y"));
gameOvers ++;
playSectorMap();
}
}else{
@@ -183,7 +193,7 @@ public class ServerControl extends Module{
logic.play();
}else{
Log.info("&ly&fiNo map specified. Loading sector {0}, {1}.", Settings.getInt("sectorid"), 0);
Log.info("&ly&fiNo map specified. Loading sector {0}, {1}.", Settings.getInt("sector_x"), Settings.getInt("sector_y"));
playSectorMap();
}
@@ -259,6 +269,17 @@ public class ServerControl extends Module{
}
});
handler.register("setsector <x> <y>", "Sets the next sector to be played. Does not affect current game.", arg -> {
//TODO
try{
Settings.putInt("sector_x", Integer.parseInt(arg[0]));
Settings.putInt("sector_y", Integer.parseInt(arg[1]));
Settings.save();
}catch(NumberFormatException e){
err("Invalid coordinates.");
}
});
handler.register("fillitems", "Fill the core with 2000 items.", arg -> {
if(!state.is(State.playing)){
err("Not playing. Host first.");
@@ -623,9 +644,8 @@ public class ServerControl extends Module{
return;
}
info("&lyCore destroyed.");
Events.fire(GameOverEvent.class);
info("Core destroyed.");
});
handler.register("debuginfo", "Print debug info", arg -> {
@@ -825,7 +845,11 @@ public class ServerControl extends Module{
}
private void playSectorMap(){
world.loadSector(world.sectors().get(Settings.getInt("sectorid"), 0));
int x = Settings.getInt("sector_x"), y = Settings.getInt("sector_y");
if(world.sectors().get(x, y) == null){
world.sectors().createSector(x, y);
}
world.loadSector(world.sectors().get(x, y));
logic.play();
}
@@ -846,7 +870,9 @@ public class ServerControl extends Module{
if(world.getSector().completedMissions >= world.getSector().missions.size){
world.sectors().completeSector(world.getSector().x, world.getSector().y);
world.sectors().save();
Settings.putInt("sectorid", world.getSector().x + world.getSector().size);
gameOvers = 0;
Settings.putInt("sector_x", world.getSector().x + world.getSector().size);
Settings.save();
netServer.kickAll(KickReason.sectorComplete);