Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zone wave bugfix / New tests / More "encouragement"

Browse Source
This commit is contained in:
Anuken
2019-03-21 19:19:12 -04:00
parent b48110db3b
commit ee06e620c6
5 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ public class Zones implements ContentList{
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
waveSpacing = 60 * 60 * 1.5f;
waveSpacing = 60 * 60 * 1.3f;
}};
}};

2
core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
View File

@@ -95,7 +95,7 @@ public class MapGenerator extends Generator{
tiles[x][y].setBlock(Blocks.air);
}
if(tiles[x][y].block() == Blocks.spawn){
if(tiles[x][y].block() == Blocks.spawn && enemySpawns != -1){
enemies.add(new Point2(x, y));
tiles[x][y].setBlock(Blocks.air);
}

2
core/src/io/anuke/mindustry/ui/ItemsDisplay.java
View File

@@ -27,6 +27,8 @@ public class ItemsDisplay extends Table{
table("flat", t -> {
t.margin(10).marginLeft(15).marginTop(15f);
t.add("$launcheditems").colspan(3).left().padBottom(5);
t.row();
ObjectIntMap<Item> items = data.items();
for(Item item : content.items()){
if(item.type == ItemType.material && data.isUnlocked(item)){