Added sector mission display and generation

core/src/io/anuke/mindustry/maps/Sector.java

@@ -28,6 +28,8 @@ public class Sector{
     public transient Array<SpawnGroup> spawns = new Array<>();
     /**Ores that appear in this sector.*/
     public transient Array<Item> ores = new Array<>();
+    /**Difficulty of the sector, measured by calculating distance from origin.*/
+    public transient int difficulty;
 
     public int getSeed(){
         return Bits.packInt(x, y);

core/src/io/anuke/mindustry/maps/Sectors.java

@@ -10,6 +10,7 @@ import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
 import io.anuke.mindustry.maps.missions.BattleMission;
+import io.anuke.mindustry.maps.missions.WaveMission;
 import io.anuke.mindustry.world.ColorMapper;
 import io.anuke.mindustry.world.Edges;
 import io.anuke.ucore.core.Settings;
@@ -130,15 +131,23 @@ public class Sectors{
     }
 
     private void initSector(Sector sector){
-        sector.mission = new BattleMission();
+        sector.difficulty = (int)(Mathf.dst(sector.x, sector.y)/2);
+
+        if(sector.difficulty < 1){
+            sector.mission = new WaveMission(30);
+        }else{
+            sector.mission = Mathf.choose(
+                new BattleMission(sector.difficulty),
+                new WaveMission(30 + sector.difficulty*5 + Mathf.randomSeed(sector.getSeed(), 0, 5)*5)
+            );
+        }
+
         //add all ores for now since material differences aren't well handled yet
         sector.ores.addAll(Items.tungsten, Items.coal, Items.lead, Items.thorium, Items.titanium);
     }
 
     private int round2(int i){
-        if(i < 0){
-            i --;
-        }
+        if(i < 0) i --;
         return i/2*2;
     }
 

core/src/io/anuke/mindustry/maps/missions/BattleMission.java

@@ -5,8 +5,19 @@ import io.anuke.mindustry.content.blocks.StorageBlocks;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.maps.Sector;
 import io.anuke.mindustry.world.Tile;
+import io.anuke.ucore.util.Bundles;
 
 public class BattleMission implements Mission{
+    private final int difficulty;
+
+    public BattleMission(int difficulty){
+        this.difficulty = difficulty;
+    }
+
+    @Override
+    public String displayString(){
+        return Bundles.get("text.mission.battle");
+    }
 
     @Override
     public void generate(Tile[][] tiles, Sector sector){

core/src/io/anuke/mindustry/maps/missions/Mission.java

@@ -5,6 +5,7 @@ import io.anuke.mindustry.world.Tile;
 
 public interface Mission{
     boolean isComplete();
+    String displayString();
 
     default void generate(Tile[][] tiles, Sector sector){}
 }

core/src/io/anuke/mindustry/maps/missions/WaveMission.java

@@ -1,5 +1,7 @@
 package io.anuke.mindustry.maps.missions;
 
+import io.anuke.ucore.util.Bundles;
+
 import static io.anuke.mindustry.Vars.*;
 
 public class WaveMission implements Mission{
@@ -9,6 +11,11 @@ public class WaveMission implements Mission{
         this.target = target;
     }
 
+    @Override
+    public String displayString(){
+        return Bundles.format("text.mission.wave", target);
+    }
+
     @Override
     public boolean isComplete(){
         return state.wave >= target;