Improved sector mission display
This commit is contained in:
@@ -5,8 +5,7 @@ import com.badlogic.gdx.utils.Array;
|
|||||||
import io.anuke.annotations.Annotations.Serialize;
|
import io.anuke.annotations.Annotations.Serialize;
|
||||||
import io.anuke.mindustry.game.Saves.SaveSlot;
|
import io.anuke.mindustry.game.Saves.SaveSlot;
|
||||||
import io.anuke.mindustry.game.SpawnGroup;
|
import io.anuke.mindustry.game.SpawnGroup;
|
||||||
import io.anuke.mindustry.maps.missions.Mission;
|
import io.anuke.mindustry.maps.missions.*;
|
||||||
import io.anuke.mindustry.maps.missions.VictoryMission;
|
|
||||||
import io.anuke.mindustry.type.ItemStack;
|
import io.anuke.mindustry.type.ItemStack;
|
||||||
import io.anuke.ucore.util.Bits;
|
import io.anuke.ucore.util.Bits;
|
||||||
|
|
||||||
@@ -41,6 +40,21 @@ public class Sector{
|
|||||||
/**Last expansion parameters.*/
|
/**Last expansion parameters.*/
|
||||||
public transient int lastExpandX, lastExpandY;
|
public transient int lastExpandX, lastExpandY;
|
||||||
|
|
||||||
|
public Mission getDominantMission(){
|
||||||
|
for(Mission mission : missions){
|
||||||
|
if(mission instanceof WaveMission || mission instanceof BattleMission){
|
||||||
|
return mission;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for(Mission mission : missions){
|
||||||
|
if(mission instanceof BlockMission){
|
||||||
|
return mission;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return missions.first();
|
||||||
|
}
|
||||||
|
|
||||||
public Mission currentMission(){
|
public Mission currentMission(){
|
||||||
return completedMissions >= missions.size ? victoryMission : missions.get(completedMissions);
|
return completedMissions >= missions.size ? victoryMission : missions.get(completedMissions);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,15 +42,13 @@ public class SectorsDialog extends FloatingDialog{
|
|||||||
+ (selected.saveID == -1 ? " " + Bundles.get("text.sector.unexplored") :
|
+ (selected.saveID == -1 ? " " + Bundles.get("text.sector.unexplored") :
|
||||||
(selected.hasSave() ? " [accent]/[white] " + Bundles.format("text.sector.time", selected.getSave().getPlayTime()) : ""))));
|
(selected.hasSave() ? " [accent]/[white] " + Bundles.format("text.sector.time", selected.getSave().getPlayTime()) : ""))));
|
||||||
content().row();
|
content().row();
|
||||||
content().label(() -> Bundles.format("text.missions", selected == null || selected.completedMissions >= selected.missions.size
|
content().label(() -> Bundles.format("text.mission", selected == null || selected.completedMissions >= selected.missions.size
|
||||||
? Bundles.get("text.none") : selected.missions.size)
|
? Bundles.get("text.none") : selected.getDominantMission().menuDisplayString()));
|
||||||
+ "[WHITE] " /*+ (selected == null ? "" : Bundles.format("text.save.difficulty", "[LIGHT_GRAY]" + selected.getDifficulty().toString()))*/);
|
|
||||||
content().row();
|
content().row();
|
||||||
content().add(new SectorView()).grow();
|
content().add(new SectorView()).grow();
|
||||||
content().row();
|
content().row();
|
||||||
buttons().addImageTextButton("$text.sector.deploy", "icon-play", 10*3, () -> {
|
buttons().addImageTextButton("$text.sector.deploy", "icon-play", 10*3, () -> {
|
||||||
hide();
|
hide();
|
||||||
|
|
||||||
ui.loadLogic(() -> world.sectors.playSector(selected));
|
ui.loadLogic(() -> world.sectors.playSector(selected));
|
||||||
}).size(210f, 64f).disabled(b -> selected == null)
|
}).size(210f, 64f).disabled(b -> selected == null)
|
||||||
.update(t -> t.setText(selected != null && selected.hasSave() ? "$text.sector.resume" : "$text.sector.deploy"));
|
.update(t -> t.setText(selected != null && selected.hasSave() ? "$text.sector.resume" : "$text.sector.deploy"));
|
||||||
|
|||||||
Reference in New Issue
Block a user