diff --git a/build.gradle b/build.gradle index 48641c6b8b..f516b4f6ef 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = 'd5f892dcf1773b0f6d47d2190d139cc6342ac75f' + uCoreVersion = '7143baa7e05e4e852e0c299d631b291ca37950b0' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 3ea05099ed..e8898e9a84 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -84,7 +84,6 @@ public class Mechs implements ContentList{ mass = 0.9f; armor = 30f; weaponOffsetX = -1; - itemCapacity = 15; weaponOffsetY = -1; weapon = Weapons.shockgun; trailColorTo = Color.valueOf("d3ddff"); diff --git a/core/src/io/anuke/mindustry/maps/SectorPresets.java b/core/src/io/anuke/mindustry/maps/SectorPresets.java index 17650a87ac..6fbe532ff2 100644 --- a/core/src/io/anuke/mindustry/maps/SectorPresets.java +++ b/core/src/io/anuke/mindustry/maps/SectorPresets.java @@ -26,7 +26,7 @@ public class SectorPresets{ //base tutorial mission add(new SectorPreset(0, 0, TutorialSector.getMissions(), - Array.with(), + Array.with(Items.copper, Items.coal, Items.lead), 1)); //command center mission @@ -63,10 +63,6 @@ public class SectorPresets{ ), Array.with(Items.copper, Items.lead, Items.coal, Items.titanium), 2)); - - //tutorial ore presets - orePresets.put(0, 0, Array.with(Items.copper)); - orePresets.put(1, 0, Array.with(Items.copper, Items.lead, Items.coal)); } public Array getOres(int x, int y){ diff --git a/core/src/io/anuke/mindustry/maps/TutorialSector.java b/core/src/io/anuke/mindustry/maps/TutorialSector.java index 9c857154a2..680bd27f63 100644 --- a/core/src/io/anuke/mindustry/maps/TutorialSector.java +++ b/core/src/io/anuke/mindustry/maps/TutorialSector.java @@ -4,16 +4,9 @@ import com.badlogic.gdx.utils.Array; 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; import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.Floor; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Timers; import io.anuke.ucore.util.Bundles; import static io.anuke.mindustry.Vars.*; @@ -41,30 +34,6 @@ public class TutorialSector{ new WaveMission(2).setMessage("$tutorial.waves"), - new ActionMission(() -> - Timers.runTask(30f, () -> { - Runnable r = () -> { - Array ores = Array.with(Items.copper, Items.coal, Items.lead); - GenResult res = new GenResult(); - for(int x = 0; x < world.width(); x++){ - for(int y = 0; y < world.height(); y++){ - Tile tile = world.tile(x, y); - world.generator.generateTile(res, 0, 0, x, y, true, null, ores); - if(!tile.hasCliffs()){ - tile.setFloor((Floor) res.floor); - } - } - } - Events.fire(new WorldLoadEvent()); - }; - - if(!headless){ - ui.loadLogic(r); - }else{ - threads.run(r); - } - })), - new ItemMission(Items.lead, 150).setMessage("$tutorial.lead"), new ItemMission(Items.copper, 250).setMessage("$tutorial.morecopper"),