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

Fixed saves not loading / Increased biomatter compressor output

Browse Source
This commit is contained in:
Anuken 2018-07-14 16:06:38 -04:00
parent d35f736548
commit dfed36748c
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@ -212,7 +212,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
itemCapacity = 50; itemCapacity = 50;
craftTime = 25f; craftTime = 25f;
outputLiquid = Liquids.oil; outputLiquid = Liquids.oil;
outputLiquidAmount = 0.14f; outputLiquidAmount = 0.9f;
size = 2; size = 2;
health = 320; health = 320;
hasLiquids = true; hasLiquids = true;

9
core/src/io/anuke/mindustry/core/World.java
View File

@ -15,6 +15,7 @@ import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.io.MapIO; import io.anuke.mindustry.io.MapIO;
import io.anuke.mindustry.maps.MapMeta; import io.anuke.mindustry.maps.MapMeta;
import io.anuke.mindustry.maps.Maps; import io.anuke.mindustry.maps.Maps;
import io.anuke.mindustry.maps.Sectors;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.mapgen.WorldGenerator; import io.anuke.mindustry.world.mapgen.WorldGenerator;
@ -37,12 +38,14 @@ public class World extends Module{
private Pathfinder pathfinder = new Pathfinder(); private Pathfinder pathfinder = new Pathfinder();
private BlockIndexer indexer = new BlockIndexer(); private BlockIndexer indexer = new BlockIndexer();
private Maps maps = new Maps(); private Maps maps = new Maps();
private Sectors sectors = new Sectors();
private Array<Tile> tempTiles = new ThreadArray<>(); private Array<Tile> tempTiles = new ThreadArray<>();
private boolean generating, invalidMap; private boolean generating, invalidMap;
public World(){ public World(){
maps.load(); maps.load();
sectors.load();
} }
@Override @Override
@ -50,6 +53,10 @@ public class World extends Module{
maps.dispose(); maps.dispose();
} }
public Sectors sectors(){
return sectors;
}
public Maps maps(){ public Maps maps(){
return maps; return maps;
} }
@ -208,7 +215,7 @@ public class World extends Module{
beginMapLoad(); beginMapLoad();
int width = 400, height = 400; int width = 250, height = 250;
Tile[][] tiles = createTiles(width, height); Tile[][] tiles = createTiles(width, height);

6
core/src/io/anuke/mindustry/io/versions/Save16.java
View File

@ -36,8 +36,8 @@ public class Save16 extends SaveFileVersion{
@Override @Override
public void read(DataInputStream stream) throws IOException{ public void read(DataInputStream stream) throws IOException{
/*long loadTime = */ stream.readLong(); //time
stream.readLong(); stream.readInt(); //build
//general state //general state
byte mode = stream.readByte(); byte mode = stream.readByte();
@ -154,7 +154,7 @@ public class Save16 extends SaveFileVersion{
//--META-- //--META--
stream.writeInt(version); //version id stream.writeInt(version); //version id
stream.writeLong(TimeUtils.millis()); //last saved stream.writeLong(TimeUtils.millis()); //last saved
stream.writeInt(Version.build); stream.writeInt(Version.build); //build
//--GENERAL STATE-- //--GENERAL STATE--
stream.writeByte(state.mode.ordinal()); //gamemode stream.writeByte(state.mode.ordinal()); //gamemode