mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-04 15:27:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed tutorial ore post-generation / Updated uCore

Browse Source
This commit is contained in:
Anuken
2018-10-16 19:31:06 -04:00
parent c318f05cfd
commit a2c29c0937
4 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -27,7 +27,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = 'd5f892dcf1773b0f6d47d2190d139cc6342ac75f' uCoreVersion = '7143baa7e05e4e852e0c299d631b291ca37950b0'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

1
core/src/io/anuke/mindustry/content/Mechs.java
View File

@ -84,7 +84,6 @@ public class Mechs implements ContentList{
mass = 0.9f; mass = 0.9f;
armor = 30f; armor = 30f;
weaponOffsetX = -1; weaponOffsetX = -1;
itemCapacity = 15;
weaponOffsetY = -1; weaponOffsetY = -1;
weapon = Weapons.shockgun; weapon = Weapons.shockgun;
trailColorTo = Color.valueOf("d3ddff"); trailColorTo = Color.valueOf("d3ddff");

6
core/src/io/anuke/mindustry/maps/SectorPresets.java
View File

@ -26,7 +26,7 @@ public class SectorPresets{
//base tutorial mission //base tutorial mission
add(new SectorPreset(0, 0, add(new SectorPreset(0, 0,
TutorialSector.getMissions(), TutorialSector.getMissions(),
Array.with(), Array.with(Items.copper, Items.coal, Items.lead),
1)); 1));
//command center mission //command center mission
@ -63,10 +63,6 @@ public class SectorPresets{
), ),
Array.with(Items.copper, Items.lead, Items.coal, Items.titanium), Array.with(Items.copper, Items.lead, Items.coal, Items.titanium),
2)); 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<Item> getOres(int x, int y){ public Array<Item> getOres(int x, int y){

31
core/src/io/anuke/mindustry/maps/TutorialSector.java
View File

@ -4,16 +4,9 @@ import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.UnitTypes; import io.anuke.mindustry.content.UnitTypes;
import io.anuke.mindustry.content.blocks.*; 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.Generation;
import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
import io.anuke.mindustry.maps.missions.*; import io.anuke.mindustry.maps.missions.*;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Block; 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 io.anuke.ucore.util.Bundles;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@ -41,30 +34,6 @@ public class TutorialSector{
new WaveMission(2).setMessage("$tutorial.waves"), new WaveMission(2).setMessage("$tutorial.waves"),
new ActionMission(() ->
Timers.runTask(30f, () -> {
Runnable r = () -> {
Array<Item> 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.lead, 150).setMessage("$tutorial.lead"),
new ItemMission(Items.copper, 250).setMessage("$tutorial.morecopper"), new ItemMission(Items.copper, 250).setMessage("$tutorial.morecopper"),