diff --git a/core/src/io/anuke/mindustry/content/Planets.java b/core/src/io/anuke/mindustry/content/Planets.java
index a17c2ccda1..f4f2c7bc0a 100644
--- a/core/src/io/anuke/mindustry/content/Planets.java
+++ b/core/src/io/anuke/mindustry/content/Planets.java
@@ -9,6 +9,8 @@ public class Planets implements ContentList{
@Override
public void load(){
+ starter = new Planet("//TODO"){{
+ }};
}
}
diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 49bee9921b..adeeed4f55 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -22,7 +22,7 @@ public class Zones implements ContentList{
@Override
public void load(){
- groundZero = new Zone("groundZero", starter, new MapGenerator("groundZero", 1)){{
+ groundZero = new Zone("groundZero", starter, new MapGenerator("groundZero")){{
baseLaunchCost = list(copper, -60);
startingItems = list(copper, 60);
alwaysUnlocked = true;
@@ -98,8 +98,7 @@ public class Zones implements ContentList{
);
}};
- frozenForest = new Zone("frozenForest", starter, new MapGenerator("frozenForest", 1)
- .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{
+ frozenForest = new Zone("frozenForest", starter, new MapGenerator("frozenForest")){{
loadout = Loadouts.basicFoundation;
startingItems = list(copper, 250);
conditionWave = 10;
@@ -111,7 +110,7 @@ public class Zones implements ContentList{
);
}};
- craters = new Zone("craters", starter, new MapGenerator("craters", 1).decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.004))){{
+ craters = new Zone("craters", starter, new MapGenerator("craters")){{
startingItems = list(copper, 100);
conditionWave = 10;
resources = with(copper, lead, coal, sand, scrap);
@@ -122,7 +121,7 @@ public class Zones implements ContentList{
);
}};
- ruinousShores = new Zone("ruinousShores", starter, new MapGenerator("ruinousShores", 1)){{
+ ruinousShores = new Zone("ruinousShores", starter, new MapGenerator("ruinousShores")){{
loadout = Loadouts.basicFoundation;
startingItems = list(copper, 140, lead, 50);
conditionWave = 20;
@@ -138,8 +137,7 @@ public class Zones implements ContentList{
);
}};
- stainedMountains = new Zone("stainedMountains", starter, new MapGenerator("stainedMountains", 2)
- .decor(new Decoration(Blocks.shale, Blocks.shaleBoulder, 0.02))){{
+ stainedMountains = new Zone("stainedMountains", starter, new MapGenerator("stainedMountains")){{
loadout = Loadouts.basicFoundation;
startingItems = list(copper, 200, lead, 50);
conditionWave = 10;
@@ -183,8 +181,7 @@ public class Zones implements ContentList{
);
}};
- tarFields = new Zone("tarFields", starter, new MapGenerator("tarFields")
- .decor(new Decoration(Blocks.shale, Blocks.shaleBoulder, 0.02))){{
+ tarFields = new Zone("tarFields", starter, new MapGenerator("tarFields")){{
loadout = Loadouts.basicFoundation;
startingItems = list(copper, 250, lead, 100);
conditionWave = 15;
@@ -223,8 +220,7 @@ public class Zones implements ContentList{
resources = Array.with(Items.copper, Items.scrap, Items.lead, Items.coal, Items.sand};
}};*/
- nuclearComplex = new Zone("nuclearComplex", starter, new MapGenerator("nuclearProductionComplex", 1)
- .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.01))){{
+ nuclearComplex = new Zone("nuclearComplex", starter, new MapGenerator("nuclearProductionComplex")){{
loadout = Loadouts.basicNucleus;
startingItems = list(copper, 1250, lead, 1500, Items.silicon, 400, Items.metaglass, 250);
conditionWave = 30;
diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java
index bc4d0dac81..3a99031a13 100644
--- a/core/src/io/anuke/mindustry/core/ContentLoader.java
+++ b/core/src/io/anuke/mindustry/core/ContentLoader.java
@@ -36,6 +36,8 @@ public class ContentLoader{
new Blocks(),
new Loadouts(),
new TechTree(),
+ new Weathers(),
+ new Planets(),
new Zones(),
new TypeIDs(),
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index b38cc63297..2a9d4a751a 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -276,8 +276,8 @@ public class Control implements ApplicationListener, Loadable{
world.beginMapLoad();
- world.createTiles(zone.generator.width, zone.generator.height);
- zone.generator.generate(world.getTiles());
+ world.resize(zone.generator.width, zone.generator.height);
+ zone.generator.generate(world.tiles);
Tile coreb = null;
diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java
index 869338ffc7..6d63201f5d 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/io/anuke/mindustry/core/World.java
@@ -4,8 +4,8 @@ import io.anuke.arc.*;
import io.anuke.arc.collection.*;
import io.anuke.arc.math.*;
import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
import io.anuke.arc.util.ArcAnnotate.*;
+import io.anuke.arc.util.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.game.EventType.*;
@@ -25,7 +25,7 @@ public class World{
public final Context context = new Context();
private Map currentMap;
- private Tile[][] tiles;
+ public @NonNull Tiles tiles = new Tiles(0, 0);
private boolean generating, invalidMap;
@@ -67,11 +67,11 @@ public class World{
}
public int width(){
- return tiles == null ? 0 : tiles.length;
+ return tiles.width();
}
public int height(){
- return tiles == null ? 0 : tiles[0].length;
+ return tiles.height();
}
public int unitWidth(){
@@ -88,11 +88,7 @@ public class World{
}
public @Nullable Tile tile(int x, int y){
- if(tiles == null){
- return null;
- }
- if(!Structs.inBounds(x, y, tiles)) return null;
- return tiles[x][y];
+ return tiles.get(x, y);
}
public @Nullable Tile ltile(int x, int y){
@@ -102,7 +98,7 @@ public class World{
}
public Tile rawTile(int x, int y){
- return tiles[x][y];
+ return tiles.getn(x, y);
}
public @Nullable Tile tileWorld(float x, float y){
@@ -117,16 +113,10 @@ public class World{
return Math.round(coord / tilesize);
}
- public Tile[][] getTiles(){
- return tiles;
- }
-
private void clearTileEntities(){
- for(int x = 0; x < tiles.length; x++){
- for(int y = 0; y < tiles[0].length; y++){
- if(tiles[x][y] != null && tiles[x][y].entity != null){
- tiles[x][y].entity.remove();
- }
+ for(Tile tile : tiles){
+ if(tile != null && tile.entity != null){
+ tile.entity.remove();
}
}
}
@@ -135,15 +125,11 @@ public class World{
* Resizes the tile array to the specified size and returns the resulting tile array.
* Only use for loading saves!
*/
- public Tile[][] createTiles(int width, int height){
- if(tiles != null){
- clearTileEntities();
+ public Tiles resize(int width, int height){
+ clearTileEntities();
- if(tiles.length != width || tiles[0].length != height){
- tiles = new Tile[width][height];
- }
- }else{
- tiles = new Tile[width][height];
+ if(tiles.width() != width || tiles.height() != height){
+ tiles = new Tiles(width, height);
}
return tiles;
@@ -164,14 +150,11 @@ public class World{
public void endMapLoad(){
prepareTiles(tiles);
- for(int x = 0; x < tiles.length; x++){
- for(int y = 0; y < tiles[0].length; y++){
- Tile tile = tiles[x][y];
- tile.updateOcclusion();
+ for(Tile tile : tiles){
+ tile.updateOcclusion();
- if(tile.entity != null){
- tile.entity.updateProximity();
- }
+ if(tile.entity != null){
+ tile.entity.updateProximity();
}
}
@@ -179,7 +162,7 @@ public class World{
addDarkness(tiles);
}
- entities.all().each(group -> group.resize(-finalWorldBounds, -finalWorldBounds, tiles.length * tilesize + finalWorldBounds * 2, tiles[0].length * tilesize + finalWorldBounds * 2));
+ entities.all().each(group -> group.resize(-finalWorldBounds, -finalWorldBounds, tiles.width() * tilesize + finalWorldBounds * 2, tiles.height() * tilesize + finalWorldBounds * 2));
generating = false;
Events.fire(new WorldLoadEvent());
@@ -204,7 +187,7 @@ public class World{
public void loadGenerator(Generator generator){
beginMapLoad();
- createTiles(generator.width, generator.height);
+ resize(generator.width, generator.height);
generator.generate(tiles);
endMapLoad();
@@ -338,58 +321,56 @@ public class World{
}
}
- public void addDarkness(Tile[][] tiles){
- byte[][] dark = new byte[tiles.length][tiles[0].length];
- byte[][] writeBuffer = new byte[tiles.length][tiles[0].length];
+ public void addDarkness(Tiles tiles){
+ byte[] dark = new byte[tiles.width() * tiles.height()];
+ byte[] writeBuffer = new byte[tiles.width() * tiles.height()];
byte darkIterations = 4;
- for(int x = 0; x < tiles.length; x++){
- for(int y = 0; y < tiles[0].length; y++){
- Tile tile = tiles[x][y];
- if(tile.isDarkened()){
- dark[x][y] = darkIterations;
- }
+
+ for(int i = 0; i < dark.length; i++){
+ Tile tile = tiles.geti(i);
+ if(tile.isDarkened()){
+ dark[i] = darkIterations;
}
}
for(int i = 0; i < darkIterations; i++){
- for(int x = 0; x < tiles.length; x++){
- for(int y = 0; y < tiles[0].length; y++){
- boolean min = false;
- for(Point2 point : Geometry.d4){
- int newX = x + point.x, newY = y + point.y;
- if(Structs.inBounds(newX, newY, tiles) && dark[newX][newY] < dark[x][y]){
- min = true;
- break;
- }
+ for(Tile tile : tiles){
+ int idx = tile.y * tiles.width() + tile.x;
+ boolean min = false;
+ for(Point2 point : Geometry.d4){
+ int newX = tile.x + point.x, newY = tile.y + point.y;
+ int nidx = newY * tiles.width() + newX;
+ if(tiles.in(newX, newY) && dark[nidx] < dark[idx]){
+ min = true;
+ break;
}
- writeBuffer[x][y] = (byte)Math.max(0, dark[x][y] - Mathf.num(min));
}
+ writeBuffer[idx] = (byte)Math.max(0, dark[idx] - Mathf.num(min));
}
- for(int x = 0; x < tiles.length; x++){
- System.arraycopy(writeBuffer[x], 0, dark[x], 0, tiles[0].length);
- }
+ System.arraycopy(writeBuffer, 0, dark, 0, writeBuffer.length);
}
- for(int x = 0; x < tiles.length; x++){
- for(int y = 0; y < tiles[0].length; y++){
- Tile tile = tiles[x][y];
- if(tile.isDarkened()){
- tiles[x][y].rotation(dark[x][y]);
- }
- if(dark[x][y] == 4){
- boolean full = true;
- for(Point2 p : Geometry.d4){
- int px = p.x + x, py = p.y + y;
- if(Structs.inBounds(px, py, tiles) && !(tiles[px][py].isDarkened() && dark[px][py] == 4)){
- full = false;
- break;
- }
- }
+ for(Tile tile : tiles){
+ int idx = tile.y * tiles.width() + tile.x;
- if(full) tiles[x][y].rotation(5);
+ if(tile.isDarkened()){
+ tile.rotation(dark[idx]);
+ }
+
+ if(dark[idx] == 4){
+ boolean full = true;
+ for(Point2 p : Geometry.d4){
+ int px = p.x + tile.x, py = p.y + tile.y;
+ int nidx = py * tiles.width() + px;
+ if(tiles.in(px, py) && !(tile.isDarkened() && dark[nidx] == 4)){
+ full = false;
+ break;
+ }
}
+
+ if(full) tile.rotation(5);
}
}
}
@@ -400,18 +381,13 @@ public class World{
* - updating occlusion
* Usually used before placing structures on a tile array.
*/
- public void prepareTiles(Tile[][] tiles){
+ public void prepareTiles(Tiles tiles){
//find multiblocks
IntArray multiblocks = new IntArray();
-
- for(int x = 0; x < tiles.length; x++){
- for(int y = 0; y < tiles[0].length; y++){
- Tile tile = tiles[x][y];
-
- if(tile.block().isMultiblock()){
- multiblocks.add(tile.pos());
- }
+ for(Tile tile : tiles){
+ if(tile.block().isMultiblock()){
+ multiblocks.add(tile.pos());
}
}
@@ -421,9 +397,10 @@ public class World{
int x = Pos.x(pos);
int y = Pos.y(pos);
+ Tile tile = tiles.getn(x, y);
- Block result = tiles[x][y].block();
- Team team = tiles[x][y].getTeam();
+ Block result = tile.block();
+ Team team = tile.getTeam();
int offsetx = -(result.size - 1) / 2;
int offsety = -(result.size - 1) / 2;
@@ -450,17 +427,19 @@ public class World{
private class Context implements WorldContext{
@Override
public Tile tile(int x, int y){
- return tiles[x][y];
+ return tiles.get(x, y);
}
@Override
public void resize(int width, int height){
- createTiles(width, height);
+ World.this.resize(width, height);
}
@Override
public Tile create(int x, int y, int floorID, int overlayID, int wallID){
- return (tiles[x][y] = new Tile(x, y, floorID, overlayID, wallID));
+ Tile tile = new Tile(x, y, floorID, overlayID, wallID);
+ tiles.set(x, y, tile);
+ return tile;
}
@Override
@@ -495,23 +474,8 @@ public class World{
GenerateInput input = new GenerateInput();
for(GenerateFilter filter : filters){
- input.begin(filter, width(), height(), (x, y) -> tiles[x][y]);
-
- //actually apply the filter
- for(int x = 0; x < width(); x++){
- for(int y = 0; y < height(); y++){
- Tile tile = rawTile(x, y);
- input.apply(x, y, tile.floor(), tile.block(), tile.overlay());
- filter.apply(input);
-
- tile.setFloor((Floor)input.floor);
- tile.setOverlay(input.ore);
-
- if(!tile.block().synthetic() && !input.block.synthetic()){
- tile.setBlock(input.block);
- }
- }
- }
+ input.begin(filter, width(), height(), (x, y) -> tiles.getn(x, y));
+ filter.apply(tiles, input);
}
}
diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java
index d8e8d60206..20978c3f18 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditor.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditor.java
@@ -70,25 +70,23 @@ public class MapEditor{
}
//adds missing blockparts
+ //TODO remove, may not be necessary with blockpart refactor later
public void checkLinkedTiles(){
- Tile[][] tiles = world.getTiles();
+ Tiles tiles = world.tiles;
- //clear block parts first
- for(int x = 0; x < width(); x++){
- for(int y = 0; y < height(); y++){
- if(tiles[x][y].block() instanceof BlockPart){
- tiles[x][y].setBlock(Blocks.air);
- }
+ //clear old parts
+ for(Tile tile : tiles){
+ if(tile.block() instanceof BlockPart){
+ tile.setBlock(Blocks.air);
}
}
- //set up missing blockparts
- for(int x = 0; x < width(); x++){
- for(int y = 0; y < height(); y++){
- if(tiles[x][y].block().isMultiblock()){
- world.setBlock(tiles[x][y], tiles[x][y].block(), tiles[x][y].getTeam());
- }
+ //re-add them
+ for(Tile tile : tiles){
+ if(tile.block().isMultiblock()){
+ world.setBlock(tile, tile.block(), tile.getTeam());
}
+
}
}
@@ -100,11 +98,11 @@ public class MapEditor{
/** Creates a 2-D array of EditorTiles with stone as the floor block. */
private void createTiles(int width, int height){
- Tile[][] tiles = world.createTiles(width, height);
+ Tiles tiles = world.resize(width, height);
for(int x = 0; x < width; x++){
for(int y = 0; y < height; y++){
- tiles[x][y] = new EditorTile(x, y, Blocks.stone.id, (short)0, (short)0);
+ tiles.set(x, y, new EditorTile(x, y, Blocks.stone.id, (short)0, (short)0));
}
}
}
@@ -120,8 +118,8 @@ public class MapEditor{
tags = new StringMap();
}
- public Tile[][] tiles(){
- return world.getTiles();
+ public Tiles tiles(){
+ return world.tiles;
}
public Tile tile(int x, int y){
@@ -246,20 +244,20 @@ public class MapEditor{
public void resize(int width, int height){
clearOp();
- Tile[][] previous = world.getTiles();
+ Tiles previous = world.tiles;
int offsetX = -(width - width()) / 2, offsetY = -(height - height()) / 2;
loading = true;
- Tile[][] tiles = world.createTiles(width, height);
+ Tiles tiles = world.resize(width, height);
for(int x = 0; x < width; x++){
for(int y = 0; y < height; y++){
int px = offsetX + x, py = offsetY + y;
- if(Structs.inBounds(px, py, previous.length, previous[0].length)){
- tiles[x][y] = previous[px][py];
- tiles[x][y].x = (short)x;
- tiles[x][y].y = (short)y;
+ if(previous.in(px, py)){
+ tiles.set(x, y, previous.getn(px, py));
+ tiles.getn(x, y).x = (short)x;
+ tiles.getn(x, y).y = (short)y;
}else{
- tiles[x][y] = new EditorTile(x, y, Blocks.stone.id, (short)0, (short)0);
+ tiles.set(x, y, new EditorTile(x, y, Blocks.stone.id, (short)0, (short)0));
}
}
}
@@ -315,12 +313,14 @@ public class MapEditor{
@Override
public void resize(int width, int height){
- world.createTiles(width, height);
+ world.resize(width, height);
}
@Override
public Tile create(int x, int y, int floorID, int overlayID, int wallID){
- return (tiles()[x][y] = new EditorTile(x, y, floorID, overlayID, wallID));
+ Tile tile = new EditorTile(x, y, floorID, overlayID, wallID);
+ tiles().set(x, y, tile);
+ return tile;
}
@Override
diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
index 5195d746b4..d8e6aaaa94 100644
--- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
@@ -263,7 +263,7 @@ public class MapGenerateDialog extends FloatingDialog{
//all the options
c.table(f -> {
f.left().top();
- for(FilterOption option : filter.options){
+ for(FilterOption option : filter.options()){
option.changed = this::update;
f.table(t -> {
@@ -292,7 +292,7 @@ public class MapGenerateDialog extends FloatingDialog{
for(Prov gen : filterTypes){
GenerateFilter filter = gen.get();
- if(!applied && filter.buffered) continue;
+ if(!applied && filter.isBuffered()) continue;
selection.cont.addButton(filter.name(), () -> {
filters.add(filter);
@@ -360,21 +360,17 @@ public class MapGenerateDialog extends FloatingDialog{
for(GenerateFilter filter : copy){
input.begin(filter, editor.width(), editor.height(), (x, y) -> buffer1[Mathf.clamp(x / scaling, 0, pixmap.getWidth()-1)][Mathf.clamp(y / scaling, 0, pixmap.getHeight()-1)].tile());
+
//read from buffer1 and write to buffer2
- for(int px = 0; px < pixmap.getWidth(); px++){
- for(int py = 0; py < pixmap.getHeight(); py++){
- int x = px * scaling, y = py * scaling;
- GenTile tile = buffer1[px][py];
- input.apply(x, y, content.block(tile.floor), content.block(tile.block), content.block(tile.ore));
- filter.apply(input);
- buffer2[px][py].set(input.floor, input.block, input.ore, Team.all[tile.team], tile.rotation);
- }
- }
- for(int px = 0; px < pixmap.getWidth(); px++){
- for(int py = 0; py < pixmap.getHeight(); py++){
- buffer1[px][py].set(buffer2[px][py]);
- }
- }
+ pixmap.each((px, py) -> {
+ int x = px * scaling, y = py * scaling;
+ GenTile tile = buffer1[px][py];
+ input.apply(x, y, content.block(tile.floor), content.block(tile.block), content.block(tile.ore));
+ filter.apply(input);
+ buffer2[px][py].set(input.floor, input.block, input.ore, Team.all[tile.team], tile.rotation);
+ });
+
+ pixmap.each((px, py) -> buffer1[px][py].set(buffer2[px][py]));
}
for(int px = 0; px < pixmap.getWidth(); px++){
diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java
index 27994abcdc..1f38fec0a1 100644
--- a/core/src/io/anuke/mindustry/editor/MapRenderer.java
+++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java
@@ -109,7 +109,7 @@ public class MapRenderer implements Disposable{
private void render(int wx, int wy){
int x = wx / chunkSize, y = wy / chunkSize;
IndexedRenderer mesh = chunks[x][y];
- Tile tile = editor.tiles()[wx][wy];
+ Tile tile = editor.tiles().getn(wx, wy);
Team team = tile.getTeam();
Block floor = tile.floor();
diff --git a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java
index 89078c92e9..f4238df598 100644
--- a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java
@@ -44,7 +44,7 @@ public class MenuRenderer implements Disposable{
}
private void generate(){
- Tile[][] tiles = world.createTiles(width, height);
+ Tiles tiles = world.resize(width, height);
Array ores = content.blocks().select(b -> b instanceof OreBlock);
shadows = new FrameBuffer(width, height);
int offset = Mathf.random(100000);
@@ -155,7 +155,7 @@ public class MenuRenderer implements Disposable{
}
Tile tile;
- tiles[x][y] = (tile = new CachedTile());
+ tiles.set(x, y, (tile = new CachedTile()));
tile.x = (short)x;
tile.y = (short)y;
tile.setFloor((Floor) floor);
diff --git a/core/src/io/anuke/mindustry/io/LegacyMapIO.java b/core/src/io/anuke/mindustry/io/LegacyMapIO.java
index 4d62f6b63d..4379c6297f 100644
--- a/core/src/io/anuke/mindustry/io/LegacyMapIO.java
+++ b/core/src/io/anuke/mindustry/io/LegacyMapIO.java
@@ -25,26 +25,6 @@ public class LegacyMapIO{
private static final ObjectMap fallback = ObjectMap.of("alpha-dart-mech-pad", "dart-mech-pad");
private static final Json json = new Json();
- /* Convert a map from the old format to the new format. */
- public static void convertMap(FileHandle in, FileHandle out) throws IOException{
- Map map = readMap(in, true);
-
- String waves = map.tags.get("waves", "[]");
- Array groups = new Array<>(json.fromJson(SpawnGroup[].class, waves));
-
- Tile[][] tiles = world.createTiles(map.width, map.height);
- for(int x = 0; x < map.width; x++){
- for(int y = 0; y < map.height; y++){
- tiles[x][y] = new CachedTile();
- tiles[x][y].x = (short)x;
- tiles[x][y].y = (short)y;
- }
- }
- state.rules.spawns = groups;
- readTiles(map, tiles);
- MapIO.writeMap(out, map);
- }
-
public static Map readMap(FileHandle file, boolean custom) throws IOException{
try(DataInputStream stream = new DataInputStream(file.read(1024))){
StringMap tags = new StringMap();
@@ -191,12 +171,12 @@ public class LegacyMapIO{
}
/** Reads a pixmap in the 3.5 pixmap format. */
- public static void readPixmap(Pixmap pixmap, Tile[][] tiles){
+ public static void readPixmap(Pixmap pixmap, Tiles tiles){
for(int x = 0; x < pixmap.getWidth(); x++){
for(int y = 0; y < pixmap.getHeight(); y++){
int color = pixmap.getPixel(x, pixmap.getHeight() - 1 - y);
LegacyBlock block = LegacyColorMapper.get(color);
- Tile tile = tiles[x][y];
+ Tile tile = tiles.getn(x, y);
tile.setFloor(block.floor);
tile.setBlock(block.wall);
diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java
index da24c1d8d7..20a6603bbc 100644
--- a/core/src/io/anuke/mindustry/io/MapIO.java
+++ b/core/src/io/anuke/mindustry/io/MapIO.java
@@ -132,11 +132,11 @@ public class MapIO{
}
}
- public static Pixmap generatePreview(Tile[][] tiles){
- Pixmap pixmap = new Pixmap(tiles.length, tiles[0].length, Format.RGBA8888);
+ public static Pixmap generatePreview(Tiles tiles){
+ Pixmap pixmap = new Pixmap(tiles.width(), tiles.height(), Format.RGBA8888);
for(int x = 0; x < pixmap.getWidth(); x++){
for(int y = 0; y < pixmap.getHeight(); y++){
- Tile tile = tiles[x][y];
+ Tile tile = tiles.getn(x, y);
pixmap.draw(x, pixmap.getHeight() - 1 - y, colorFor(tile.floor(), tile.block(), tile.overlay(), tile.getTeam()));
}
}
diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java
index beceeb1382..86d4a75b58 100644
--- a/core/src/io/anuke/mindustry/maps/Maps.java
+++ b/core/src/io/anuke/mindustry/maps/Maps.java
@@ -166,7 +166,7 @@ public class Maps{
for(int x = 0; x < map.width; x++){
for(int y = 0; y < map.height; y++){
- Tile tile = world.getTiles()[x][y];
+ Tile tile = world.rawTile(x, y);
if(tile.block() instanceof CoreBlock){
map.teams.add(tile.getTeamID());
@@ -182,7 +182,7 @@ public class Maps{
Core.assets.unload(map.previewFile().path() + "." + mapExtension);
}
- Pixmap pix = MapIO.generatePreview(world.getTiles());
+ Pixmap pix = MapIO.generatePreview(world.tiles);
executor.submit(() -> map.previewFile().writePNG(pix));
writeCache(map);
diff --git a/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java b/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java
index f1f16e7800..829bfe47f6 100644
--- a/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java
@@ -1,6 +1,7 @@
package io.anuke.mindustry.maps.filters;
import io.anuke.arc.math.*;
+import io.anuke.arc.util.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.maps.filters.FilterOption.*;
import io.anuke.mindustry.world.*;
@@ -11,16 +12,21 @@ public class BlendFilter extends GenerateFilter{
float radius = 2f;
Block block = Blocks.stone, floor = Blocks.ice, ignore = Blocks.air;
- {
- buffered = true;
- options(
- new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f),
- new BlockOption("block", () -> block, b -> block = b, anyOptional),
- new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
- new BlockOption("ignore", () -> ignore, b -> ignore = b, floorsOptional)
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
+ new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f),
+ new BlockOption("block", () -> block, b -> block = b, anyOptional),
+ new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
+ new BlockOption("ignore", () -> ignore, b -> ignore = b, floorsOptional)
);
}
+ @Override
+ public boolean isBuffered(){
+ return true;
+ }
+
@Override
public void apply(){
if(in.floor == block || block == Blocks.air || in.floor == ignore) return;
@@ -31,7 +37,7 @@ public class BlendFilter extends GenerateFilter{
outer:
for(int x = -rad; x <= rad; x++){
for(int y = -rad; y <= rad; y++){
- if(Mathf.dst2(x, y) > rad*rad) continue;
+ if(Mathf.within(x, y, rad)) continue;
Tile tile = in.tile(in.x + x, in.y + y);
if(tile.floor() == block || tile.block() == block || tile.overlay() == block){
diff --git a/core/src/io/anuke/mindustry/maps/filters/ClearFilter.java b/core/src/io/anuke/mindustry/maps/filters/ClearFilter.java
index 418f99bebc..df4e384926 100644
--- a/core/src/io/anuke/mindustry/maps/filters/ClearFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/ClearFilter.java
@@ -1,5 +1,6 @@
package io.anuke.mindustry.maps.filters;
+import io.anuke.arc.util.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.world.*;
@@ -8,10 +9,9 @@ import static io.anuke.mindustry.maps.filters.FilterOption.*;
public class ClearFilter extends GenerateFilter{
protected Block block = Blocks.air;
- {
- options(
- new BlockOption("block", () -> block, b -> block = b, wallsOnly)
- );
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(new BlockOption("block", () -> block, b -> block = b, wallsOnly));
}
@Override
diff --git a/core/src/io/anuke/mindustry/maps/filters/CoreSpawnFilter.java b/core/src/io/anuke/mindustry/maps/filters/CoreSpawnFilter.java
new file mode 100644
index 0000000000..1c62f285c2
--- /dev/null
+++ b/core/src/io/anuke/mindustry/maps/filters/CoreSpawnFilter.java
@@ -0,0 +1,44 @@
+package io.anuke.mindustry.maps.filters;
+
+import io.anuke.arc.collection.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.filters.FilterOption.*;
+import io.anuke.mindustry.world.*;
+
+import static io.anuke.mindustry.Vars.defaultTeam;
+
+/** Selects X spawns from the core spawn pool.*/
+public class CoreSpawnFilter extends GenerateFilter{
+ int amount = 1;
+
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
+ new SliderOption("amount", () -> amount, f -> amount = (int)f, 1, 10)
+ );
+ }
+
+ @Override
+ public void apply(Tiles tiles, GenerateInput in){
+ IntArray spawns = new IntArray();
+ for(Tile tile : tiles){
+ if(tile.getTeam() == defaultTeam){
+ spawns.add(tile.pos());
+ }
+ }
+
+ spawns.shuffle();
+
+ int used = Math.min(spawns.size, amount);
+ for(int i = used; i < spawns.size; i++){
+ Tile tile = tiles.getp(spawns.get(i));
+ tile.setBlock(Blocks.air);
+ }
+ }
+
+ @Override
+ public boolean isPost(){
+ return true;
+ }
+}
diff --git a/core/src/io/anuke/mindustry/maps/filters/DistortFilter.java b/core/src/io/anuke/mindustry/maps/filters/DistortFilter.java
index 7c9cdf1c5f..66abd8008d 100644
--- a/core/src/io/anuke/mindustry/maps/filters/DistortFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/DistortFilter.java
@@ -1,5 +1,6 @@
package io.anuke.mindustry.maps.filters;
+import io.anuke.arc.util.*;
import io.anuke.mindustry.maps.filters.FilterOption.*;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*;
@@ -7,14 +8,19 @@ import io.anuke.mindustry.world.blocks.*;
public class DistortFilter extends GenerateFilter{
float scl = 40, mag = 5;
- {
- buffered = true;
- options(
- new SliderOption("scale", () -> scl, f -> scl = f, 1f, 200f),
- new SliderOption("mag", () -> mag, f -> mag = f, 0.5f, 100f)
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
+ new SliderOption("scale", () -> scl, f -> scl = f, 1f, 200f),
+ new SliderOption("mag", () -> mag, f -> mag = f, 0.5f, 100f)
);
}
+ @Override
+ public boolean isBuffered(){
+ return true;
+ }
+
@Override
public void apply(){
Tile tile = in.tile(in.x + noise(in.x, in.y, scl, mag) - mag / 2f, in.y + noise(in.x, in.y + o, scl, mag) - mag / 2f);
diff --git a/core/src/io/anuke/mindustry/maps/filters/EnemySpawnFilter.java b/core/src/io/anuke/mindustry/maps/filters/EnemySpawnFilter.java
new file mode 100644
index 0000000000..1f9cd76326
--- /dev/null
+++ b/core/src/io/anuke/mindustry/maps/filters/EnemySpawnFilter.java
@@ -0,0 +1,42 @@
+package io.anuke.mindustry.maps.filters;
+
+import io.anuke.arc.collection.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.filters.FilterOption.*;
+import io.anuke.mindustry.world.*;
+
+/** Selects X spawns from the spawn pool.*/
+public class EnemySpawnFilter extends GenerateFilter{
+ int amount = 1;
+
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
+ new SliderOption("amount", () -> amount, f -> amount = (int)f, 1, 10)
+ );
+ }
+
+ @Override
+ public void apply(Tiles tiles, GenerateInput in){
+ IntArray spawns = new IntArray();
+ for(Tile tile : tiles){
+ if(tile.overlay() == Blocks.spawn){
+ spawns.add(tile.pos());
+ }
+ }
+
+ spawns.shuffle();
+
+ int used = Math.min(spawns.size, amount);
+ for(int i = used; i < spawns.size; i++){
+ Tile tile = tiles.getp(spawns.get(i));
+ tile.clearOverlay();
+ }
+ }
+
+ @Override
+ public boolean isPost(){
+ return true;
+ }
+}
diff --git a/core/src/io/anuke/mindustry/maps/filters/GenerateFilter.java b/core/src/io/anuke/mindustry/maps/filters/GenerateFilter.java
index e3f1c2ccf4..294ff8c61b 100644
--- a/core/src/io/anuke/mindustry/maps/filters/GenerateFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/GenerateFilter.java
@@ -5,34 +5,38 @@ import io.anuke.arc.math.*;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.util.*;
import io.anuke.arc.util.noise.*;
-import io.anuke.mindustry.content.*;
import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
public abstract class GenerateFilter{
protected transient float o = (float)(Math.random() * 10000000.0);
protected transient long seed;
protected transient GenerateInput in;
- public transient boolean buffered = false;
- public transient FilterOption[] options;
+ public void apply(Tiles tiles, GenerateInput in){
+ this.in = in;
+ for(Tile tile : tiles){
+ in.apply(tile.x, tile.y, tile.floor(), tile.block(), tile.overlay());
+ apply();
+
+ tile.setFloor(in.floor.asFloor());
+ tile.setOverlay(in.ore);
+
+ if(!tile.block().synthetic() && !in.block.synthetic()){
+ tile.setBlock(in.block);
+ }
+ }
+ }
public final void apply(GenerateInput in){
this.in = in;
apply();
- //remove extra ores on liquids
- if(((Floor)in.floor).isLiquid){
- in.ore = Blocks.air;
- }
}
- /** sets up the options; this is necessary since the constructor can't access subclass variables. */
- protected void options(FilterOption... options){
- this.options = options;
- }
+ /** @return a new array of options for configuring this filter */
+ public abstract FilterOption[] options();
/** apply the actual filter on the input */
- protected abstract void apply();
+ protected void apply(){}
/** draw any additional guides */
public void draw(Image image){}
@@ -47,6 +51,16 @@ public abstract class GenerateFilter{
seed = Mathf.random(99999999);
}
+ /** @return whether this filter needs a read/write buffer (e.g. not a 1:1 tile mapping). */
+ public boolean isBuffered(){
+ return false;
+ }
+
+ /** @return whether this filter can *only* be used while generating the map, e.g. is not undoable. */
+ public boolean isPost(){
+ return false;
+ }
+
//utility generation functions
protected float noise(float x, float y, float scl, float mag){
diff --git a/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java b/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java
index 9cc4606d20..c0bef49804 100644
--- a/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java
@@ -2,6 +2,7 @@ package io.anuke.mindustry.maps.filters;
import io.anuke.arc.collection.*;
import io.anuke.arc.math.*;
+import io.anuke.arc.util.*;
import io.anuke.mindustry.maps.filters.FilterOption.*;
import io.anuke.mindustry.world.*;
@@ -12,14 +13,19 @@ public class MedianFilter extends GenerateFilter{
float percentile = 0.5f;
IntArray blocks = new IntArray(), floors = new IntArray();
- {
- buffered = true;
- options(
- new SliderOption("radius", () -> radius, f -> radius = f, 1f, 12f),
- new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f)
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
+ new SliderOption("radius", () -> radius, f -> radius = f, 1f, 12f),
+ new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f)
);
}
+ @Override
+ public boolean isBuffered(){
+ return true;
+ }
+
@Override
public void apply(){
int rad = (int)radius;
diff --git a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java
index 673d825cc0..6bfb7afb5e 100644
--- a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java
@@ -15,8 +15,11 @@ public class MirrorFilter extends GenerateFilter{
int angle = 45;
- {
- options(new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45));
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
+ new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45)
+ );
}
@Override
diff --git a/core/src/io/anuke/mindustry/maps/filters/NoiseFilter.java b/core/src/io/anuke/mindustry/maps/filters/NoiseFilter.java
index 25aaeae3b1..c32b45bd76 100644
--- a/core/src/io/anuke/mindustry/maps/filters/NoiseFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/NoiseFilter.java
@@ -1,19 +1,19 @@
package io.anuke.mindustry.maps.filters;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.maps.filters.FilterOption.BlockOption;
-import io.anuke.mindustry.maps.filters.FilterOption.SliderOption;
-import io.anuke.mindustry.world.Block;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.filters.FilterOption.*;
+import io.anuke.mindustry.world.*;
-import static io.anuke.mindustry.maps.filters.FilterOption.floorsOnly;
-import static io.anuke.mindustry.maps.filters.FilterOption.wallsOnly;
+import static io.anuke.mindustry.maps.filters.FilterOption.*;
public class NoiseFilter extends GenerateFilter{
float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f;
Block floor = Blocks.stone, block = Blocks.rocks;
- {
- options(
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
diff --git a/core/src/io/anuke/mindustry/maps/filters/OreFilter.java b/core/src/io/anuke/mindustry/maps/filters/OreFilter.java
index d1ebce2f7d..d07891c692 100644
--- a/core/src/io/anuke/mindustry/maps/filters/OreFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/OreFilter.java
@@ -1,23 +1,24 @@
package io.anuke.mindustry.maps.filters;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.maps.filters.FilterOption.SliderOption;
-import io.anuke.mindustry.world.Block;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.filters.FilterOption.*;
+import io.anuke.mindustry.world.*;
-import static io.anuke.mindustry.maps.filters.FilterOption.BlockOption;
-import static io.anuke.mindustry.maps.filters.FilterOption.oresOnly;
+import static io.anuke.mindustry.maps.filters.FilterOption.*;
public class OreFilter extends GenerateFilter{
public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f;
public Block ore = Blocks.oreCopper;
- {
- options(
- new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
- new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
- new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
- new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
- new BlockOption("ore", () -> ore, b -> ore = b, oresOnly)
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
+ new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
+ new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
+ new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
+ new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
+ new BlockOption("ore", () -> ore, b -> ore = b, oresOnly)
);
}
diff --git a/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java b/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java
index 8080b49699..56bc2d5975 100644
--- a/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java
@@ -2,6 +2,7 @@ package io.anuke.mindustry.maps.filters;
import io.anuke.arc.collection.*;
import io.anuke.arc.math.*;
+import io.anuke.arc.util.*;
import io.anuke.mindustry.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.maps.filters.FilterOption.*;
@@ -13,14 +14,19 @@ public class OreMedianFilter extends GenerateFilter{
private IntArray blocks = new IntArray();
- {
- buffered = true;
- options(
- new SliderOption("radius", () -> radius, f -> radius = f, 1f, 12f),
- new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f)
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
+ new SliderOption("radius", () -> radius, f -> radius = f, 1f, 12f),
+ new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f)
);
}
+ @Override
+ public boolean isBuffered(){
+ return true;
+ }
+
@Override
public void apply(){
if(in.ore == Blocks.spawn) return;
diff --git a/core/src/io/anuke/mindustry/maps/filters/RandomItemFilter.java b/core/src/io/anuke/mindustry/maps/filters/RandomItemFilter.java
new file mode 100644
index 0000000000..1c08d562bd
--- /dev/null
+++ b/core/src/io/anuke/mindustry/maps/filters/RandomItemFilter.java
@@ -0,0 +1,35 @@
+package io.anuke.mindustry.maps.filters;
+
+import io.anuke.arc.collection.*;
+import io.anuke.arc.math.*;
+import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.storage.*;
+
+public class RandomItemFilter extends GenerateFilter{
+ public Array drops = new Array<>();
+ public float chance = 0.3f;
+
+ @Override
+ public FilterOption[] options(){
+ return new FilterOption[0];
+ }
+
+ @Override
+ public void apply(Tiles tiles, GenerateInput in){
+ for(Tile tile : tiles){
+ if(tile.block() instanceof StorageBlock && !(tile.block() instanceof CoreBlock)){
+ for(ItemStack stack : drops){
+ if(Mathf.chance(chance)){
+ tile.entity.items.add(stack.item, Math.min(Mathf.random(stack.amount), tile.block().itemCapacity));
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean isPost(){
+ return true;
+ }
+}
diff --git a/core/src/io/anuke/mindustry/maps/filters/RiverNoiseFilter.java b/core/src/io/anuke/mindustry/maps/filters/RiverNoiseFilter.java
index 1af7165157..82cc0bba7b 100644
--- a/core/src/io/anuke/mindustry/maps/filters/RiverNoiseFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/RiverNoiseFilter.java
@@ -1,19 +1,19 @@
package io.anuke.mindustry.maps.filters;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.maps.filters.FilterOption.BlockOption;
-import io.anuke.mindustry.maps.filters.FilterOption.SliderOption;
-import io.anuke.mindustry.world.Block;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.filters.FilterOption.*;
+import io.anuke.mindustry.world.*;
-import static io.anuke.mindustry.maps.filters.FilterOption.floorsOnly;
-import static io.anuke.mindustry.maps.filters.FilterOption.wallsOnly;
+import static io.anuke.mindustry.maps.filters.FilterOption.*;
public class RiverNoiseFilter extends GenerateFilter{
float scl = 40, threshold = 0f, threshold2 = 0.1f;
Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandRocks;
- {
- options(
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
new SliderOption("threshold", () -> threshold, f -> threshold = f, -1f, 0.3f),
new SliderOption("threshold2", () -> threshold2, f -> threshold2 = f, -1f, 0.3f),
diff --git a/core/src/io/anuke/mindustry/maps/filters/ScatterFilter.java b/core/src/io/anuke/mindustry/maps/filters/ScatterFilter.java
index 3c00823075..db9ffcdb15 100644
--- a/core/src/io/anuke/mindustry/maps/filters/ScatterFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/ScatterFilter.java
@@ -1,9 +1,9 @@
package io.anuke.mindustry.maps.filters;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.maps.filters.FilterOption.BlockOption;
-import io.anuke.mindustry.maps.filters.FilterOption.SliderOption;
-import io.anuke.mindustry.world.Block;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.filters.FilterOption.*;
+import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.maps.filters.FilterOption.*;
@@ -11,8 +11,9 @@ public class ScatterFilter extends GenerateFilter{
protected float chance = 0.014f;
protected Block flooronto = Blocks.air, floor = Blocks.air, block = Blocks.air;
- {
- options(
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
new SliderOption("chance", () -> chance, f -> chance = f, 0f, 1f),
new BlockOption("flooronto", () -> flooronto, b -> flooronto = b, floorsOptional),
new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
diff --git a/core/src/io/anuke/mindustry/maps/filters/TerrainFilter.java b/core/src/io/anuke/mindustry/maps/filters/TerrainFilter.java
index 6082616494..ef8e109e05 100644
--- a/core/src/io/anuke/mindustry/maps/filters/TerrainFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/TerrainFilter.java
@@ -1,20 +1,20 @@
package io.anuke.mindustry.maps.filters;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.maps.filters.FilterOption.BlockOption;
-import io.anuke.mindustry.maps.filters.FilterOption.SliderOption;
-import io.anuke.mindustry.world.Block;
+import io.anuke.arc.math.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.filters.FilterOption.*;
+import io.anuke.mindustry.world.*;
-import static io.anuke.mindustry.maps.filters.FilterOption.floorsOnly;
-import static io.anuke.mindustry.maps.filters.FilterOption.wallsOnly;
+import static io.anuke.mindustry.maps.filters.FilterOption.*;
public class TerrainFilter extends GenerateFilter{
float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f;
Block floor = Blocks.stone, block = Blocks.rocks;
- {
- options(
+ @Override
+ public FilterOption[] options(){
+ return Structs.arr(
new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
new SliderOption("mag", () -> magnitude, f -> magnitude = f, 0f, 2f),
new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
diff --git a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java b/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java
index 40911d31f6..dcff53d5f3 100644
--- a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java
@@ -26,14 +26,14 @@ public abstract class BasicGenerator extends RandomGenerator{
}
@Override
- public void generate(Tile[][] tiles){
+ public void generate(Tiles tiles){
int seed = Mathf.random(99999999);
sim.setSeed(seed);
sim2.setSeed(seed + 1);
super.generate(tiles);
}
- public void ores(Tile[][] tiles){
+ public void ores(Tiles tiles){
pass(tiles, (x, y) -> {
if(ores != null){
int offsetX = x - 4, offsetY = y + 23;
@@ -49,7 +49,7 @@ public abstract class BasicGenerator extends RandomGenerator{
});
}
- public void terrain(Tile[][] tiles, Block dst, float scl, float mag, float cmag){
+ public void terrain(Tiles tiles, Block dst, float scl, float mag, float cmag){
pass(tiles, (x, y) -> {
double rocks = sim.octaveNoise2D(5, 0.5, 1f / scl, x, y) * mag
+ Mathf.dst((float)x / width, (float)y / height, 0.5f, 0.5f) * cmag;
@@ -66,11 +66,11 @@ public abstract class BasicGenerator extends RandomGenerator{
});
}
- public void noise(Tile[][] tiles, Block floor, Block block, int octaves, float falloff, float scl, float threshold){
+ public void noise(Tiles tiles, Block floor, Block block, int octaves, float falloff, float scl, float threshold){
sim.setSeed(Mathf.random(99999));
pass(tiles, (x, y) -> {
if(sim.octaveNoise2D(octaves, falloff, 1f / scl, x, y) > threshold){
- Tile tile = tiles[x][y];
+ Tile tile = tiles.getn(x, y);
this.floor = floor;
if(tile.block().solid){
this.block = block;
@@ -79,16 +79,16 @@ public abstract class BasicGenerator extends RandomGenerator{
});
}
- public void overlay(Tile[][] tiles, Block floor, Block block, float chance, int octaves, float falloff, float scl, float threshold){
+ public void overlay(Tiles tiles, Block floor, Block block, float chance, int octaves, float falloff, float scl, float threshold){
sim.setSeed(Mathf.random(99999));
pass(tiles, (x, y) -> {
- if(sim.octaveNoise2D(octaves, falloff, 1f / scl, x, y) > threshold && Mathf.chance(chance) && tiles[x][y].floor() == floor){
+ if(sim.octaveNoise2D(octaves, falloff, 1f / scl, x, y) > threshold && Mathf.chance(chance) && tiles.getn(x, y).floor() == floor){
ore = block;
}
});
}
- public void tech(Tile[][] tiles){
+ public void tech(Tiles tiles){
Block[] blocks = {Blocks.darkPanel3};
int secSize = 20;
pass(tiles, (x, y) -> {
@@ -109,13 +109,13 @@ public abstract class BasicGenerator extends RandomGenerator{
});
}
- public void distort(Tile[][] tiles, float scl, float mag){
+ public void distort(Tiles tiles, float scl, float mag){
Block[][] blocks = new Block[width][height];
Floor[][] floors = new Floor[width][height];
each((x, y) -> {
float cx = x + noise(x, y, scl, mag) - mag / 2f, cy = y + noise(x, y + 1525215f, scl, mag) - mag / 2f;
- Tile other = tiles[Mathf.clamp((int)cx, 0, width-1)][Mathf.clamp((int)cy, 0, height-1)];
+ Tile other = tiles.getn(Mathf.clamp((int)cx, 0, width-1), Mathf.clamp((int)cy, 0, height-1));
blocks[x][y] = other.block();
floors[x][y] = other.floor();
});
@@ -126,7 +126,7 @@ public abstract class BasicGenerator extends RandomGenerator{
});
}
- public void scatter(Tile[][] tiles, Block target, Block dst, float chance){
+ public void scatter(Tiles tiles, Block target, Block dst, float chance){
pass(tiles, (x, y) -> {
if(!Mathf.chance(chance)) return;
if(floor == target){
@@ -149,40 +149,40 @@ public abstract class BasicGenerator extends RandomGenerator{
return (float)sim2.octaveNoise2D(1f, 0f, 1f / scl, x + 0x361266f, y + 0x251259f) * mag;
}
- public void pass(Tile[][] tiles, Intc2 r){
+ public void pass(Tiles tiles, Intc2 r){
for(int x = 0; x < width; x++){
for(int y = 0; y < height; y++){
- floor = tiles[x][y].floor();
- block = tiles[x][y].block();
- ore = tiles[x][y].overlay();
+ floor = tiles.getn(x, y).floor();
+ block = tiles.getn(x, y).block();
+ ore = tiles.getn(x, y).overlay();
r.get(x, y);
- tiles[x][y] = new Tile(x, y, floor.id, ore.id, block.id);
+ tiles.set(x, y, new Tile(x, y, floor.id, ore.id, block.id));
}
}
}
- public void brush(Tile[][] tiles, Array path, int rad){
+ public void brush(Tiles tiles, Array path, int rad){
path.each(tile -> erase(tiles, tile.x, tile.y, rad));
}
- public void erase(Tile[][] tiles, int cx, int cy, int rad){
+ public void erase(Tiles tiles, int cx, int cy, int rad){
for(int x = -rad; x <= rad; x++){
for(int y = -rad; y <= rad; y++){
int wx = cx + x, wy = cy + y;
if(Structs.inBounds(wx, wy, width, height) && Mathf.dst(x, y, 0, 0) <= rad){
- Tile other = tiles[wx][wy];
+ Tile other = tiles.getn(wx, wy);
other.setBlock(Blocks.air);
}
}
}
}
- public Array pathfind(Tile[][] tiles, int startX, int startY, int endX, int endY, TileHueristic th, DistanceHeuristic dh){
- Tile start = tiles[startX][startY];
- Tile end = tiles[endX][endY];
+ public Array pathfind(Tiles tiles, int startX, int startY, int endX, int endY, TileHueristic th, DistanceHeuristic dh){
+ Tile start = tiles.getn(startX, startY);
+ Tile end = tiles.getn(endX, endY);
GridBits closed = new GridBits(width, height);
IntFloatMap costs = new IntFloatMap();
- PriorityQueue queue = new PriorityQueue<>(tiles.length * tiles[0].length / 2, (a, b) -> Float.compare(costs.get(a.pos(), 0f) + dh.cost(a.x, a.y, end.x, end.y), costs.get(b.pos(), 0f) + dh.cost(b.x, b.y, end.x, end.y)));
+ PriorityQueue queue = new PriorityQueue<>(tiles.width() * tiles.height()/4, (a, b) -> Float.compare(costs.get(a.pos(), 0f) + dh.cost(a.x, a.y, end.x, end.y), costs.get(b.pos(), 0f) + dh.cost(b.x, b.y, end.x, end.y)));
queue.add(start);
boolean found = false;
while(!queue.isEmpty()){
@@ -196,7 +196,7 @@ public abstract class BasicGenerator extends RandomGenerator{
for(Point2 point : Geometry.d4){
int newx = next.x + point.x, newy = next.y + point.y;
if(Structs.inBounds(newx, newy, width, height)){
- Tile child = tiles[newx][newy];
+ Tile child = tiles.getn(newx, newy);
if(!closed.get(child.x, child.y)){
closed.set(child.x, child.y);
child.rotation(child.relativeTo(next.x, next.y));
@@ -215,7 +215,7 @@ public abstract class BasicGenerator extends RandomGenerator{
while(current != start){
out.add(current);
Point2 p = Geometry.d4(current.rotation());
- current = tiles[current.x + p.x][current.y + p.y];
+ current = tiles.getn(current.x + p.x, current.y + p.y);
}
out.reverse();
@@ -223,17 +223,17 @@ public abstract class BasicGenerator extends RandomGenerator{
return out;
}
- public void inverseFloodFill(Tile[][] tiles, Tile start, Block block){
+ public void inverseFloodFill(Tiles tiles, Tile start, Block block){
IntArray arr = new IntArray();
arr.add(start.pos());
while(!arr.isEmpty()){
int i = arr.pop();
int x = Pos.x(i), y = Pos.y(i);
- tiles[x][y].cost = 2;
+ tiles.getn(x, y).cost = 2;
for(Point2 point : Geometry.d4){
int newx = x + point.x, newy = y + point.y;
- if(Structs.inBounds(newx, newy, width, height)){
- Tile child = tiles[newx][newy];
+ if(tiles.in(newx, newy)){
+ Tile child = tiles.getn(newx, newy);
if(child.block() == Blocks.air && child.cost != 2){
child.cost = 2;
arr.add(child.pos());
@@ -244,7 +244,7 @@ public abstract class BasicGenerator extends RandomGenerator{
for(int x = 0; x < width; x ++){
for(int y = 0; y < height; y++){
- Tile tile = tiles[x][y];
+ Tile tile = tiles.getn(x, y);
if(tile.cost != 2 && tile.block() == Blocks.air){
tile.setBlock(block);
}
diff --git a/core/src/io/anuke/mindustry/maps/generators/Generator.java b/core/src/io/anuke/mindustry/maps/generators/Generator.java
index 0b64a067de..85aecaec75 100644
--- a/core/src/io/anuke/mindustry/maps/generators/Generator.java
+++ b/core/src/io/anuke/mindustry/maps/generators/Generator.java
@@ -19,5 +19,5 @@ public abstract class Generator{
this.loadout = loadout;
}
- public abstract void generate(Tile[][] tiles);
+ public abstract void generate(Tiles tiles);
}
diff --git a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
index 559ff5a4cb..9dc0e314d6 100644
--- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
@@ -1,16 +1,13 @@
package io.anuke.mindustry.maps.generators;
-import io.anuke.arc.collection.*;
import io.anuke.arc.math.*;
import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.io.*;
import io.anuke.mindustry.maps.*;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
import io.anuke.mindustry.world.blocks.storage.*;
import static io.anuke.mindustry.Vars.*;
@@ -44,97 +41,43 @@ public class MapGenerator extends Generator{
}
@Override
- public void generate(Tile[][] tiles){
- for(int x = 0; x < width; x++){
- for(int y = 0; y < height; y++){
- tiles[x][y] = new Tile(x, y);
- }
- }
+ public void generate(Tiles tiles){
+ tiles.fill();
SaveIO.load(map.file);
- Array players = new Array<>();
- Array enemies = new Array<>();
- for(int x = 0; x < width; x++){
- for(int y = 0; y < height; y++){
- if(tiles[x][y].block() instanceof CoreBlock && tiles[x][y].getTeam() == defaultTeam){
- players.add(new Point2(x, y));
- tiles[x][y].setBlock(Blocks.air);
- }
-
- if(tiles[x][y].overlay() == Blocks.spawn && enemySpawns != -1){
- enemies.add(new Point2(x, y));
- tiles[x][y].setOverlay(Blocks.air);
- }
-
- if(tiles[x][y].block() instanceof BlockPart){
- tiles[x][y].setBlock(Blocks.air);
- }
- }
- }
-
- for(int x = 0; x < width; x++){
- for(int y = 0; y < height; y++){
- Tile tile = tiles[x][y];
-
- for(Decoration decor : decorations){
- if(x > 0 && y > 0 && (tiles[x - 1][y].block() == decor.wall || tiles[x][y - 1].block() == decor.wall)){
- continue;
- }
-
- if(tile.block() == Blocks.air && !(decor.wall instanceof Floor) && tile.floor() == decor.floor && Mathf.chance(decor.chance)){
- tile.setBlock(decor.wall);
- }else if(tile.floor() == decor.floor && decor.wall.isOverlay() && Mathf.chance(decor.chance)){
- tile.setOverlay(decor.wall);
- }else if(tile.floor() == decor.floor && decor.wall.isFloor() && !decor.wall.isOverlay() && Mathf.chance(decor.chance)){
- tile.setFloor((Floor)decor.wall);
- }
- }
-
- if(tile.block() instanceof StorageBlock && !(tile.block() instanceof CoreBlock) && world.getZone() != null){
- for(Item item : world.getZone().resources){
- if(Mathf.chance(0.3)){
- tile.entity.items.add(item, Math.min(Mathf.random(500), tile.block().itemCapacity));
- }
+ for(Tile tile : tiles){
+ if(tile.block() instanceof StorageBlock && !(tile.block() instanceof CoreBlock) && world.getZone() != null){
+ for(Item item : world.getZone().resources){
+ if(Mathf.chance(0.3)){
+ tile.entity.items.add(item, Math.min(Mathf.random(500), tile.block().itemCapacity));
}
}
}
}
- if(enemySpawns != -1){
- if(enemySpawns > enemies.size){
- throw new IllegalArgumentException("Enemy spawn pool greater than map spawn number for map: " + mapName);
+ boolean anyCores = false;
+
+ for(Tile tile : tiles){
+ if(tile.overlay() == Blocks.spawn){
+ int rad = 10;
+ Geometry.circle(tile.x, tile.y, tiles.width(), tiles.height(), rad, (wx, wy) -> {
+ if(tile.overlay().itemDrop != null){
+ tile.clearOverlay();
+ }
+ });
}
- enemies.shuffle();
- for(int i = 0; i < enemySpawns; i++){
- Point2 point = enemies.get(i);
- tiles[point.x][point.y].setOverlay(Blocks.spawn);
-
- int rad = 10, frad = 12;
-
- for(int x = -rad; x <= rad; x++){
- for(int y = -rad; y <= rad; y++){
- int wx = x + point.x, wy = y + point.y;
- double dst = Mathf.dst(x, y);
- if(dst < frad && Structs.inBounds(wx, wy, tiles) && (dst <= rad || Mathf.chance(0.5))){
- Tile tile = tiles[wx][wy];
- if(tile.overlay() != Blocks.spawn){
- tile.clearOverlay();
- }
- }
- }
- }
+ if(tile.block() instanceof CoreBlock && tile.getTeam() == defaultTeam){
+ schematics.placeLoadout(loadout, tile.x, tile.y);
+ anyCores = true;
}
}
- Point2 core = players.random();
- if(core == null){
+ if(!anyCores){
throw new IllegalArgumentException("All zone maps must have a core.");
}
- schematics.placeLoadout(loadout, core.x, core.y);
-
world.prepareTiles(tiles);
world.setMap(map);
}
diff --git a/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java b/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java
index 23591e86df..f600b9b306 100644
--- a/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java
@@ -1,10 +1,9 @@
package io.anuke.mindustry.maps.generators;
-import io.anuke.arc.collection.StringMap;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.arc.collection.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Vars.world;
@@ -18,14 +17,14 @@ public abstract class RandomGenerator extends Generator{
}
@Override
- public void generate(Tile[][] tiles){
+ public void generate(Tiles tiles){
for(int x = 0; x < width; x++){
for(int y = 0; y < height; y++){
floor = Blocks.air;
block = Blocks.air;
ore = Blocks.air;
generate(x, y);
- tiles[x][y] = new Tile(x, y, floor.id, ore.id, block.id);
+ tiles.set(x, y, new Tile(x, y, floor.id, ore.id, block.id));
}
}
@@ -34,7 +33,7 @@ public abstract class RandomGenerator extends Generator{
world.setMap(new Map(new StringMap()));
}
- public abstract void decorate(Tile[][] tiles);
+ public abstract void decorate(Tiles tiles);
/**
* Sets {@link #floor} and {@link #block} to the correct values as output.
diff --git a/core/src/io/anuke/mindustry/maps/zonegen/DesertWastesGenerator.java b/core/src/io/anuke/mindustry/maps/zonegen/DesertWastesGenerator.java
index a82b121c31..e1bba700fc 100644
--- a/core/src/io/anuke/mindustry/maps/zonegen/DesertWastesGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/zonegen/DesertWastesGenerator.java
@@ -1,9 +1,9 @@
package io.anuke.mindustry.maps.zonegen;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.maps.generators.BasicGenerator;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.arc.math.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.generators.*;
+import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Vars.schematics;
@@ -19,7 +19,7 @@ public class DesertWastesGenerator extends BasicGenerator{
}
@Override
- public void decorate(Tile[][] tiles){
+ public void decorate(Tiles tiles){
ores(tiles);
terrain(tiles, Blocks.sandRocks, 60f, 1.5f, 0.9f);
@@ -34,7 +34,7 @@ public class DesertWastesGenerator extends BasicGenerator{
erase(tiles, endX, endY, 10);
erase(tiles, spawnX, spawnY, 20);
distort(tiles, 20f, 4f);
- inverseFloodFill(tiles, tiles[spawnX][spawnY], Blocks.sandRocks);
+ inverseFloodFill(tiles, tiles.getn(spawnX, spawnY), Blocks.sandRocks);
noise(tiles, Blocks.salt, Blocks.saltRocks, 5, 0.6f, 200f, 0.55f);
noise(tiles, Blocks.darksand, Blocks.duneRocks, 5, 0.7f, 120f, 0.5f);
@@ -43,7 +43,7 @@ public class DesertWastesGenerator extends BasicGenerator{
overlay(tiles, Blocks.sand, Blocks.pebbles, 0.15f, 5, 0.8f, 30f, 0.62f);
//scatter(tiles, Blocks.sandRocks, Blocks.creeptree, 1f);
- tiles[endX][endY].setOverlay(Blocks.spawn);
+ tiles.getn(endX, endY).setOverlay(Blocks.spawn);
schematics.placeLoadout(loadout, spawnX, spawnY);
}
}
diff --git a/core/src/io/anuke/mindustry/maps/zonegen/OvergrowthGenerator.java b/core/src/io/anuke/mindustry/maps/zonegen/OvergrowthGenerator.java
index 527eab7d0d..569c2697ee 100644
--- a/core/src/io/anuke/mindustry/maps/zonegen/OvergrowthGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/zonegen/OvergrowthGenerator.java
@@ -1,9 +1,9 @@
package io.anuke.mindustry.maps.zonegen;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.maps.generators.BasicGenerator;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.arc.math.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.maps.generators.*;
+import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Vars.schematics;
@@ -19,7 +19,7 @@ public class OvergrowthGenerator extends BasicGenerator{
}
@Override
- public void decorate(Tile[][] tiles){
+ public void decorate(Tiles tiles){
ores(tiles);
terrain(tiles, Blocks.sporePine, 70f, 1.4f, 1f);
@@ -34,12 +34,12 @@ public class OvergrowthGenerator extends BasicGenerator{
erase(tiles, endX, endY, 10);
erase(tiles, spawnX, spawnY, 20);
distort(tiles, 20f, 4f);
- inverseFloodFill(tiles, tiles[spawnX][spawnY], Blocks.sporerocks);
+ inverseFloodFill(tiles, tiles.getn(spawnX, spawnY), Blocks.sporerocks);
noise(tiles, Blocks.darksandTaintedWater, Blocks.duneRocks, 4, 0.7f, 120f, 0.64f);
//scatter(tiles, Blocks.sporePine, Blocks.whiteTreeDead, 1f);
- tiles[endX][endY].setOverlay(Blocks.spawn);
+ tiles.getn(endX, endY).setOverlay(Blocks.spawn);
schematics.placeLoadout(loadout, spawnX, spawnY);
}
}
diff --git a/core/src/io/anuke/mindustry/world/Tiles.java b/core/src/io/anuke/mindustry/world/Tiles.java
new file mode 100644
index 0000000000..c9f58d7b3d
--- /dev/null
+++ b/core/src/io/anuke/mindustry/world/Tiles.java
@@ -0,0 +1,84 @@
+package io.anuke.mindustry.world;
+
+import io.anuke.arc.util.ArcAnnotate.*;
+
+import java.util.*;
+
+/** A tile container. */
+public class Tiles implements Iterable{
+ private final Tile[] array;
+ private final int width, height;
+ private final TileIterator iterator = new TileIterator();
+
+ public Tiles(int width, int height){
+ this.array = new Tile[width * height];
+ this.width = width;
+ this.height = height;
+ }
+
+ /** fills this tile set with empty air tiles. */
+ public void fill(){
+ for(int i = 0; i < array.length; i++){
+ array[i] = new Tile(i % width, i / width);
+ }
+ }
+
+ /** set a tile at a position; does not range-check. use with caution. */
+ public void set(int x, int y, Tile tile){
+ array[y*width + x] = tile;
+ }
+
+ /** @return whether these coordinates are in bounds */
+ public boolean in(int x, int y){
+ return x >= 0 && x < width && y >= 0 && y < height;
+ }
+
+ /** @return a tile at coordinates, or null if out of bounds */
+ public @Nullable Tile get(int x, int y){
+ return (x < 0 || x >= width || y < 0 || y >= height) ? null : array[y*width + x];
+ }
+
+ /** @return a tile at coordinates; throws an exception if out of bounds */
+ public @NonNull Tile getn(int x, int y){
+ if(x < 0 || x >= width || y < 0 || y >= height) throw new IllegalArgumentException(x + ", " + y + " out of bounds: width=" + width + ", height=" + height);
+ return array[y*width + x];
+ }
+
+ /** @return a tile at an iteration index [0, width * height] */
+ public @NonNull Tile geti(int idx){
+ return array[idx];
+ }
+
+ /** @return a tile at an int position (not equivalent to geti) */
+ public @Nullable Tile getp(int pos){
+ return get(Pos.x(pos), Pos.y(pos));
+ }
+
+ public int width(){
+ return width;
+ }
+
+ public int height(){
+ return height;
+ }
+
+ @Override
+ public Iterator iterator(){
+ iterator.index = 0;
+ return iterator;
+ }
+
+ private class TileIterator implements Iterator{
+ int index = 0;
+
+ @Override
+ public boolean hasNext(){
+ return index < array.length;
+ }
+
+ @Override
+ public Tile next(){
+ return array[index++];
+ }
+ }
+}
diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java
index c293eb5f9d..4ddb75ec32 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Floor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java
@@ -7,6 +7,7 @@ import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.graphics.g2d.TextureAtlas.*;
import io.anuke.arc.math.*;
import io.anuke.arc.math.geom.*;
+import io.anuke.arc.util.ArcAnnotate.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.entities.Effects.*;
import io.anuke.mindustry.type.*;
@@ -33,13 +34,13 @@ public class Floor extends Block{
/** Effect displayed when drowning on this floor. */
public Effect drownUpdateEffect = Fx.bubble;
/** Status effect applied when walking on. */
- public StatusEffect status = StatusEffects.none;
+ public @NonNull StatusEffect status = StatusEffects.none;
/** Intensity of applied status effect. */
public float statusDuration = 60f;
/** liquids that drop from this block, used for pumps */
- public Liquid liquidDrop = null;
+ public @Nullable Liquid liquidDrop = null;
/** item that drops from this block, used for drills */
- public Item itemDrop = null;
+ public @Nullable Item itemDrop = null;
/** whether this block can be drowned in */
public boolean isLiquid;
/** if true, this block cannot be mined by players. useful for annoying things like sand. */
diff --git a/gradle.properties b/gradle.properties
index 8912a511da..fd97332604 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=9cde8aeb1f4913d5f9c1ed1792d5c5c5d522298c
+archash=640a9a5546f742c272c6117ea4ad886c80cd84ef
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 766a840ef0..619b3bd91e 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -111,7 +111,7 @@ public class ApplicationTests{
@Test
void createMap(){
- Tile[][] tiles = world.createTiles(8, 8);
+ Tile[][] tiles = world.resize(8, 8);
world.beginMapLoad();
for(int x = 0; x < tiles.length; x++){
@@ -329,7 +329,7 @@ public class ApplicationTests{
@Test
void allBlockTest(){
- Tile[][] tiles = world.createTiles(256*2 + 20, 10);
+ Tile[][] tiles = world.resize(256*2 + 20, 10);
world.beginMapLoad();
for(int x = 0; x < tiles.length; x++){