Final tutorial fixes

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

@@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.entities.units.BaseUnit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
@@ -132,6 +133,13 @@ public class Sectors{
         for(EntityGroup<?> group : Entities.getAllGroups()){
             for(Entity entity : group.all()){
                 entity.set(entity.getX() + shiftX * tilesize, entity.getY() + shiftY * tilesize);
+
+                if(entity instanceof BaseUnit){
+                    Tile spawner = ((BaseUnit) entity).getSpawner();
+                    if(spawner == null) continue;
+                    int i = spawner.packedPosition();
+                    ((BaseUnit) entity).setIntSpawner(world.transform(i, world.width(), world.height(), sector.width*sectorSize, shiftX, shiftY));
+                }
             }
         }
 

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

@@ -5,6 +5,7 @@ import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.UnitTypes;
 import io.anuke.mindustry.content.blocks.*;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
+import io.anuke.mindustry.maps.generation.Generation;
 import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
 import io.anuke.mindustry.maps.missions.*;
 import io.anuke.mindustry.type.Item;
@@ -66,7 +67,7 @@ public class TutorialSector{
                 });
             }),
 
-            new ItemMission(Items.lead, 90).setMessage("$tutorial.lead"),
+            new ItemMission(Items.lead, 150).setMessage("$tutorial.lead"),
             new ItemMission(Items.copper, 250).setMessage("$tutorial.morecopper"),
 
             new BlockLocMission(CraftingBlocks.smelter, 58, 69).setMessage("$tutorial.smelter"),
@@ -129,7 +130,9 @@ public class TutorialSector{
                     generateBase();
                 }
             },
-            new BattleMission().setMessage("$tutorial.battle")
+            new BattleMission(){
+                public void generate(Generation gen){} //no
+            }.setMessage("$tutorial.battle")
         );
 
         //find drone marker mission

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

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.maps.missions;
 
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.game.GameMode;
 import io.anuke.ucore.util.Bundles;
 
 import static io.anuke.mindustry.Vars.threads;
@@ -31,9 +29,4 @@ public class ActionMission extends Mission{
     public String displayString(){
         return Bundles.get("text.loading");
     }
-
-    @Override
-    public GameMode getMode(){
-        return Vars.state.mode;
-    }
 }

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

@@ -2,7 +2,6 @@ package io.anuke.mindustry.maps.missions;
 
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.TileEntity;
-import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.util.Bundles;
@@ -19,11 +18,6 @@ public class ItemMission extends Mission{
         this.amount = amount;
     }
 
-    @Override
-    public GameMode getMode(){
-        return GameMode.waves;
-    }
-
     @Override
     public boolean isComplete(){
         for(Tile tile : state.teams.get(Vars.defaultTeam).cores){

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

@@ -3,7 +3,6 @@ package io.anuke.mindustry.maps.missions;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.units.BaseUnit;
 import io.anuke.mindustry.entities.units.UnitType;
-import io.anuke.mindustry.game.GameMode;
 import io.anuke.ucore.util.Bundles;
 
 public class UnitMission extends Mission{
@@ -27,9 +26,4 @@ public class UnitMission extends Mission{
     public String displayString(){
         return Bundles.format("text.mission.unit", type.localizedName());
     }
-
-    @Override
-    public GameMode getMode(){
-        return GameMode.noWaves;
-    }
 }

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

@@ -48,7 +48,10 @@ public class WaveMission extends Mission{
     @Override
     public String displayString(){
         return state.wave > target ?
-        Bundles.format("text.mission.wave.enemies", state.wave, target, Vars.unitGroups[Vars.waveTeam.ordinal()].size()) :
+        Bundles.format(
+            Vars.unitGroups[Vars.waveTeam.ordinal()].size() > 1 ?
+            "text.mission.wave.enemies" :
+            "text.mission.wave.enemy", target, target, Vars.unitGroups[Vars.waveTeam.ordinal()].size()) :
         Bundles.format("text.mission.wave", state.wave, target, (int)(state.wavetime/60));
     }