Added battle misson / Team block colors / Mission worldgen

This commit is contained in:
Anuken
2018-07-23 20:44:33 -04:00
parent ecf9a3cbc9
commit 7448eb32cc
18 changed files with 146 additions and 103 deletions
@@ -1,6 +1,5 @@
package io.anuke.mindustry.io.versions;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.content.blocks.StorageBlocks;
@@ -12,7 +11,6 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.io.SaveFileVersion;
import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.BlockPart;
import io.anuke.ucore.core.Timers;
@@ -41,6 +39,7 @@ public class Save16 extends SaveFileVersion{
int sector = stream.readInt(); //sector ID
//general state
byte mode = stream.readByte();
String mapname = stream.readUTF();
Map map = world.maps().getByName(mapname);
@@ -59,19 +58,6 @@ public class Save16 extends SaveFileVersion{
state.spawner.read(stream);
//block header
int blocksize = stream.readInt();
IntMap<Block> blockMap = new IntMap<>();
for(int i = 0; i < blocksize; i++){
String name = stream.readUTF();
int id = stream.readShort();
blockMap.put(id, Block.getByName(name));
}
//entities
byte groups = stream.readByte();
@@ -171,16 +157,6 @@ public class Save16 extends SaveFileVersion{
state.spawner.write(stream);
//--BLOCK HEADER--
stream.writeInt(Block.all().size);
for(int i = 0; i < Block.all().size; i++){
Block block = Block.all().get(i);
stream.writeUTF(block.name);
stream.writeShort(block.id);
}
//--ENTITIES--
int groups = 0;