From 6be49f898c6fbcbfc1f1a8b099b512d3a163e897 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 19 Oct 2018 23:20:04 -0400 Subject: [PATCH] Removed onFirstBegin() --- core/src/io/anuke/mindustry/core/Logic.java | 1 - core/src/io/anuke/mindustry/editor/MapEditor.java | 5 ----- core/src/io/anuke/mindustry/maps/TutorialSector.java | 3 +-- core/src/io/anuke/mindustry/maps/missions/BattleMission.java | 4 +--- core/src/io/anuke/mindustry/maps/missions/Mission.java | 4 ---- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 175fde0dca..57d3b88704 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -112,7 +112,6 @@ public class Logic extends Module{ world.getSector().completedMissions ++; state.mode = world.getSector().currentMission().getMode(); - world.getSector().currentMission().onFirstBegin(); world.getSector().currentMission().onBegin(); world.sectors.save(); } diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index e997a0e272..532e720622 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/core/src/io/anuke/mindustry/editor/MapEditor.java @@ -15,7 +15,6 @@ import io.anuke.ucore.util.Bits; import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.content; public class MapEditor{ - public static final int minMapSize = 128, maxMapSize = 512; public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15}; private MapTileData map; @@ -28,10 +27,6 @@ public class MapEditor{ private Block drawBlock = Blocks.stone; private Team drawTeam = Team.blue; - public MapEditor(){ - - } - public MapTileData getMap(){ return map; } diff --git a/core/src/io/anuke/mindustry/maps/TutorialSector.java b/core/src/io/anuke/mindustry/maps/TutorialSector.java index f578f46bb1..91db10fa26 100644 --- a/core/src/io/anuke/mindustry/maps/TutorialSector.java +++ b/core/src/io/anuke/mindustry/maps/TutorialSector.java @@ -93,7 +93,6 @@ public class TutorialSector{ new ActionMission(TutorialSector::generateBase), new BattleMission(){ public void generate(Generation gen){} //no - public void onFirstBegin(){} //also no }.setMessage("$tutorial.battle") ); @@ -113,7 +112,7 @@ public class TutorialSector{ } private static void generateBase(){ - int x = sectorSize/2 + sectorSize, y = sectorSize/2; + int x = sectorSize - 50, y = sectorSize - 50; world.setBlock(world.tile(x, y), StorageBlocks.core, waveTeam); world.setBlock(world.tile(x - 1, y + 2), UnitBlocks.daggerFactory, waveTeam); world.setBlock(world.tile(x - 1, y - 3), UnitBlocks.daggerFactory, waveTeam); diff --git a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java index 83978971a2..848a80de9d 100644 --- a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java @@ -7,7 +7,6 @@ import io.anuke.mindustry.maps.generation.FortressGenerator; import io.anuke.mindustry.maps.generation.Generation; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.SeedRandom; import static io.anuke.mindustry.Vars.*; @@ -25,12 +24,11 @@ public class BattleMission extends Mission{ } @Override - public void onFirstBegin(){ + public void generate(Generation gen){ if(state.teams.get(defaultTeam).cores.size == 0){ return; } Tile core = state.teams.get(defaultTeam).cores.first(); - Generation gen = new Generation(world.getSector(), world.getTiles(), world.width(), world.height(), new SeedRandom(world.getSector().getSeed()-1)); int enx = world.width() - 1 - spacing; int eny = world.height() - 1 - spacing; new FortressGenerator().generate(gen, Team.red, core.x, core.y, enx, eny); diff --git a/core/src/io/anuke/mindustry/maps/missions/Mission.java b/core/src/io/anuke/mindustry/maps/missions/Mission.java index d024e02fa7..6f9de67d1d 100644 --- a/core/src/io/anuke/mindustry/maps/missions/Mission.java +++ b/core/src/io/anuke/mindustry/maps/missions/Mission.java @@ -62,10 +62,6 @@ public abstract class Mission{ } - public void onFirstBegin(){ - - } - /**Shows the unique sector message.*/ public void showMessage(){ if(!headless && extraMessage != null){