New maps / New generation filter(s) and tweaks

core/assets/bundles/bundle.properties

@@ -286,6 +286,7 @@ filter.option.octaves = Octaves
 filter.option.falloff = Falloff
 filter.option.block = Block
 filter.option.floor = Floor
+filter.option.flooronto = Target Floor
 filter.option.wall = Wall
 filter.option.ore = Ore
 filter.option.floor2 = Secondary Floor

core/src/io/anuke/mindustry/content/Blocks.java

@@ -1433,15 +1433,15 @@ public class Blocks implements ContentList{
             );
 
             size = 2;
-            range = 120f;
-            reload = 35f;
+            range = 150f;
+            reload = 30f;
             restitution = 0.03f;
             ammoEjectBack = 3f;
             cooldown = 0.03f;
             recoil = 3f;
             shootShake = 2f;
-            burstSpacing = 4;
-            shots = 3;
+            burstSpacing = 3f;
+            shots = 4;
             ammoUseEffect = Fx.shellEjectBig;
             health = 360;
         }};

core/src/io/anuke/mindustry/editor/MapGenerateDialog.java

@@ -12,6 +12,7 @@ import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Scaling;
 import io.anuke.arc.util.async.AsyncExecutor;
 import io.anuke.arc.util.async.AsyncResult;
+import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.editor.generation.*;
 import io.anuke.mindustry.editor.generation.GenerateFilter.GenerateInput;
 import io.anuke.mindustry.game.Team;
@@ -27,7 +28,10 @@ import static io.anuke.mindustry.Vars.*;
 
 @SuppressWarnings("unchecked")
 public class MapGenerateDialog extends FloatingDialog{
-    private final Supplier<GenerateFilter>[] filterTypes = new Supplier[]{NoiseFilter::new, ScatterFilter::new, TerrainFilter::new, DistortFilter::new, RiverNoiseFilter::new, OreFilter::new, MedianFilter::new};
+    private final Supplier<GenerateFilter>[] filterTypes = new Supplier[]{
+        NoiseFilter::new, ScatterFilter::new, TerrainFilter::new, DistortFilter::new,
+        RiverNoiseFilter::new, OreFilter::new, MedianFilter::new, BlendFilter::new
+    };
     private final MapEditor editor;
 
     private Pixmap pixmap;
@@ -184,6 +188,20 @@ public class MapGenerateDialog extends FloatingDialog{
             if(++i % 2 == 0) selection.cont.row();
         }
 
+        selection.cont.addButton("Default Ores", () -> {
+            int index = 0;
+            for(Block block : new Block[]{Blocks.oreCopper, Blocks.oreCoal, Blocks.oreLead, Blocks.oreTitanium, Blocks.oreThorium}){
+                OreFilter filter = new OreFilter();
+                filter.threshold += index ++ * 0.02f;
+                filter.ore = block;
+                filters.add(filter);
+            }
+
+            rebuildFilters();
+            update();
+            selection.hide();
+        });
+
         selection.addCloseButton();
         selection.show();
     }

core/src/io/anuke/mindustry/editor/generation/BlendFilter.java

@@ -0,0 +1,46 @@
+package io.anuke.mindustry.editor.generation;
+
+import io.anuke.arc.math.Mathf;
+import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.editor.generation.FilterOption.BlockOption;
+import io.anuke.mindustry.editor.generation.FilterOption.SliderOption;
+import io.anuke.mindustry.world.Block;
+
+import static io.anuke.mindustry.editor.generation.FilterOption.floorsOnly;
+
+public class BlendFilter extends GenerateFilter{
+    float radius = 2f;
+    Block flooronto = Blocks.stone, floor = Blocks.ice;
+
+    {
+        options(
+        new SliderOption("radius", () -> radius, f -> radius = f, 1f, 10f),
+        new BlockOption("flooronto", () -> flooronto, b -> flooronto = b, floorsOnly),
+        new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly)
+        );
+    }
+
+    @Override
+    public void apply(){
+        if(in.floor == flooronto) return;
+
+        int rad = (int)radius;
+        boolean found = false;
+
+        outer:
+        for(int x = -rad; x <= rad; x++){
+            for(int y = -rad; y <= rad; y++){
+                if(Mathf.dst2(x, y) > rad*rad) continue;
+
+                if(in.tile(in.x + x, in.y + y).floor == flooronto.id){
+                    found = true;
+                    break outer;
+                }
+            }
+        }
+
+        if(found){
+            in.floor = floor;
+        }
+    }
+}

core/src/io/anuke/mindustry/editor/generation/FilterOption.java

@@ -6,6 +6,7 @@ import io.anuke.arc.scene.style.TextureRegionDrawable;
 import io.anuke.arc.scene.ui.Slider;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Block.Icon;
@@ -16,6 +17,9 @@ import static io.anuke.mindustry.Vars.updateEditorOnChange;
 public abstract class FilterOption{
     public static final Predicate<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(Icon.full));
     public static final Predicate<Block> wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && Core.atlas.isFound(b.icon(Icon.full));
+    public static final Predicate<Block> floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(Icon.full)));
+    public static final Predicate<Block> wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && Core.atlas.isFound(b.icon(Icon.full)));
+    public static final Predicate<Block> wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(Icon.full)));
     public static final Predicate<Block> oresOnly = b -> b instanceof OverlayFloor && Core.atlas.isFound(b.icon(Icon.full));
 
     public abstract void build(Table table);
@@ -66,14 +70,15 @@ public abstract class FilterOption{
 
         @Override
         public void build(Table table){
-            table.addButton(b -> b.addImage(supplier.get().icon(Icon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable()).setRegion(supplier.get().icon(Icon.small))).size(8 * 3), () -> {
+            table.addButton(b -> b.addImage(supplier.get().icon(Icon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable())
+                .setRegion(supplier.get() == Blocks.air ? Core.atlas.find("icon-none") : supplier.get().icon(Icon.small))).size(8 * 3), () -> {
                 FloatingDialog dialog = new FloatingDialog("");
                 dialog.setFillParent(false);
                 int i = 0;
                 for(Block block : Vars.content.blocks()){
                     if(!filter.test(block)) continue;
 
-                    dialog.cont.addImage(block.icon(Icon.medium)).size(8 * 4).pad(3).get().clicked(() -> {
+                    dialog.cont.addImage(block == Blocks.air ? Core.atlas.find("icon-none-small") : block.icon(Icon.medium)).size(8 * 4).pad(3).get().clicked(() -> {
                         consumer.accept(block);
                         dialog.hide();
                         changed.run();

core/src/io/anuke/mindustry/editor/generation/OreFilter.java

@@ -8,8 +8,8 @@ import static io.anuke.mindustry.editor.generation.FilterOption.BlockOption;
 import static io.anuke.mindustry.editor.generation.FilterOption.oresOnly;
 
 public class OreFilter extends GenerateFilter{
-    float scl = 40, threshold = 0.8f, octaves = 3f, falloff = 0.5f;
-    Block ore = Blocks.oreCopper;
+    public float scl = 50, threshold = 0.72f, octaves = 3f, falloff = 0.4f;
+    public Block ore = Blocks.oreCopper;
 
     {
         options(

core/src/io/anuke/mindustry/editor/generation/ScatterFilter.java

@@ -5,26 +5,34 @@ import io.anuke.mindustry.editor.generation.FilterOption.BlockOption;
 import io.anuke.mindustry.editor.generation.FilterOption.SliderOption;
 import io.anuke.mindustry.world.Block;
 
-import static io.anuke.mindustry.editor.generation.FilterOption.floorsOnly;
-import static io.anuke.mindustry.editor.generation.FilterOption.wallsOnly;
+import static io.anuke.mindustry.editor.generation.FilterOption.*;
 
 public class ScatterFilter extends GenerateFilter{
     float chance = 0.1f;
-    Block floor = Blocks.ice, block = Blocks.icerocks;
+    Block flooronto = Blocks.air, floor = Blocks.air, block = Blocks.air;
 
     {
         options(
         new SliderOption("chance", () -> chance, f -> chance = f, 0f, 1f),
-        new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
-        new BlockOption("block", () -> block, b -> block = b, wallsOnly)
+        new BlockOption("flooronto", () -> flooronto, b -> flooronto = b, floorsOptional),
+        new BlockOption("floor", () -> floor, b -> floor = b, floorsOptional),
+        new BlockOption("block", () -> block, b -> block = b, wallsOresOptional)
         );
     }
 
     @Override
     public void apply(){
 
-        if(in.srcfloor == floor && in.srcblock == Blocks.air && chance() <= chance){
-            in.block = block;
+        if(block != Blocks.air && (in.srcfloor == flooronto || flooronto == Blocks.air) && in.srcblock == Blocks.air && chance() <= chance){
+            if(!block.isOverlay()){
+                in.block = block;
+            }else{
+                in.ore = block;
+            }
+        }
+
+        if(floor != Blocks.air && (in.srcfloor == flooronto || flooronto == Blocks.air) && chance() <= chance){
+            in.floor = floor;
         }
     }
 }

core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java

@@ -1,14 +1,18 @@
 package io.anuke.mindustry.entities.traits;
 
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
+import io.anuke.arc.Core;
+import io.anuke.arc.Events;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.Queue;
 import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import io.anuke.arc.math.Angles;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.entities.type.TileEntity;
+import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.EventType.BuildSelectEvent;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Pal;
@@ -21,7 +25,8 @@ import java.io.*;
 import java.util.Arrays;
 
 import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
+import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.removal;
+import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.tmptr;
 
 /** Interface for units that build things.*/
 public interface BuilderTrait extends Entity, TeamTrait{
@@ -78,6 +83,11 @@ public interface BuilderTrait extends Entity, TeamTrait{
 
         TileEntity core = unit.getClosestCore();
 
+        if(tile.entity instanceof BuildEntity && !current.initialized){
+            Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking)));
+            current.initialized = true;
+        }
+
         //if there is no core to build with or no build entity, stop building!
         if((core == null && !state.rules.infiniteResources) || !(tile.entity instanceof BuildEntity)){
             return;
@@ -107,11 +117,6 @@ public interface BuilderTrait extends Entity, TeamTrait{
         }else{
             entity.progress = current.progress;
         }
-
-        if(!current.initialized){
-            Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking)));
-            current.initialized = true;
-        }
     }
 
     /** Returns the queue for storing build requests. */

core/src/io/anuke/mindustry/maps/Maps.java

@@ -18,7 +18,7 @@ import static io.anuke.mindustry.Vars.*;
 
 public class Maps implements Disposable{
     /** List of all built-in maps. Filenames only. */
-    private static String[] defaultMapNames = {"fortress", "labyrinth", "islands"};
+    private static String[] defaultMapNames = {"fortress", "labyrinth", "islands", "tendrils", "caldera"};
     /** All maps stored in an ordered array. */
     private Array<Map> maps = new Array<>();
     /** Serializer for meta. */