Misc bugfixes / New zone

android/proguard-project.txt

@@ -20,26 +20,10 @@
 #}
 
 -verbose
-
+-verbose
--dontwarn android.support.**
+-ignorewarnings
--dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication
+-keep class io.anuke.mindustry.game.Rules
--dontwarn com.badlogic.gdx.utils.GdxBuild
+-keep class io.anuke.mindustry.desktop.DesktopLauncher
--dontwarn com.badlogic.gdx.physics.box2d.utils.Box2DBuild
+-keepclasseswithmembers public class * {
--dontwarn com.badlogic.gdx.jnigen.BuildTarget*
+    public static void main(java.lang.String[]);
--dontwarn com.badlogic.gdx.graphics.g2d.freetype.FreetypeBuild
-
--keep class com.badlogic.gdx.controllers.android.AndroidControllers
-
--keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* {
-   <init>(com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration);
-}
-
--keepclassmembers class com.badlogic.gdx.physics.box2d.World {
-   boolean contactFilter(long, long);
-   void    beginContact(long);
-   void    endContact(long);
-   void    preSolve(long, long);
-   void    postSolve(long, long);
-   boolean reportFixture(long);
-   float   reportRayFixture(long, float, float, float, float, float);
 }

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

@@ -277,18 +277,18 @@ public class Blocks implements ContentList{
         }};
 
         ignarock = new Floor("ignarock"){{
-
+            blendGroup = sand;
         }};
 
         hotrock = new Floor("hotrock"){{
             heat = 0.5f;
-            blendGroup = ignarock;
+            blendGroup = sand;
         }};
 
         magmarock = new Floor("magmarock"){{
             heat = 0.75f;
             updateEffect = Fx.magmasmoke;
-            blendGroup = ignarock;
+            blendGroup = sand;
         }};
 
         //endregion
@@ -457,6 +457,18 @@ public class Blocks implements ContentList{
             consumes.liquid(Liquids.slag, 0.3f);
         }};
 
+        cultivator = new Cultivator("cultivator"){{
+            requirements(Category.crafting, ItemStack.with(Items.copper, 20, Items.lead, 50, Items.silicon, 20));
+            output = Items.biomatter;
+            craftTime = 200;
+            size = 2;
+            hasLiquids = true;
+            hasPower = true;
+
+            consumes.power(0.80f);
+            consumes.liquid(Liquids.water, 0.15f);
+        }};
+
         biomatterCompressor = new Compressor("biomattercompressor"){{
             requirements(Category.crafting, ItemStack.with(Items.lead, 70, Items.silicon, 60));
             liquidCapacity = 60f;
@@ -951,18 +963,6 @@ public class Blocks implements ContentList{
             consumes.liquid(Liquids.water, 0.15f);
         }};
 
-        cultivator = new Cultivator("cultivator"){{
-            requirements(Category.production, ItemStack.with(Items.copper, 20, Items.lead, 50, Items.silicon, 20));
-            output = Items.biomatter;
-            craftTime = 200;
-            size = 2;
-            hasLiquids = true;
-            hasPower = true;
-
-            consumes.power(0.80f);
-            consumes.liquid(Liquids.water, 0.15f);
-        }};
-
         //endregion
         //region storage
 

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

@@ -387,16 +387,66 @@ public class Zones implements ContentList{
             }};
         }};
 
-        desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift")){{
+        desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift").dist(2f)){{
-            deployCost = ItemStack.with(Items.copper, 300);
+            deployCost = ItemStack.with(Items.copper, 2000);
-            startingItems = ItemStack.with(Items.copper, 200);
+            startingItems = ItemStack.with(Items.copper, 1500);
-            conditionWave = 15;
+            itemRequirements = ItemStack.with(Items.copper, 8000, Items.metaglass, 2000, Items.graphite, 3000);
+            conditionWave = 10;
+            launchPeriod = 20;
             zoneRequirements = new Zone[]{stainedMountains};
-            blockRequirements = new Block[]{Blocks.copperWall};
+            blockRequirements = new Block[]{Blocks.thermalGenerator};
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
-                waveSpacing = 60 * 80;
+                waveSpacing = 30 * 60;
+                spawns = Array.with(
+                    new SpawnGroup(UnitTypes.crawler){{
+                        unitScaling = 1;
+                        spacing = 2;
+                        end = 10;
+                    }},
+
+                    new SpawnGroup(UnitTypes.dagger){{
+                        begin = 2;
+                        spacing = 2;
+                        unitScaling = 2;
+                    }},
+
+                    new SpawnGroup(UnitTypes.titan){{
+                        begin = 10;
+                        unitScaling = 1f;
+                        unitAmount = 3;
+                        spacing = 3;
+                    }},
+
+                    new SpawnGroup(UnitTypes.fortress){{
+                        begin = 5;
+                        unitScaling = 1;
+                        spacing = 5;
+                        unitAmount = 1;
+                    }},
+
+                    new SpawnGroup(UnitTypes.fortress){{
+                        begin = 13;
+                        unitScaling = 1;
+                        spacing = 4;
+                        unitAmount = 1;
+                    }},
+
+                    new SpawnGroup(UnitTypes.dagger){{
+                        begin = 11;
+                        spacing = 2;
+                        unitScaling = 2;
+                        unitAmount = 2;
+                    }},
+
+                    new SpawnGroup(UnitTypes.crawler){{
+                        unitScaling = 1;
+                        spacing = 2;
+                        unitAmount = 4;
+                        begin = 13;
+                    }}
+                );
             }};
         }};
 

core/src/io/anuke/mindustry/graphics/BlockRenderer.java

@@ -210,9 +210,7 @@ public class BlockRenderer{
             }else if(req.layer == Layer.block){
                 block.draw(req.tile);
                 if(block.synthetic() && req.tile.getTeam() != players[0].getTeam()){
-                    Draw.color(req.tile.getTeam().color);
+                    block.drawTeam(req.tile);
-                    Draw.rect("block-border", req.tile.drawx() - block.size * tilesize/2f + 4, req.tile.drawy() - block.size * tilesize/2f + 4);
-                    Draw.color();
                 }
             }else if(req.layer == block.layer){
                 block.drawLayer(req.tile);

core/src/io/anuke/mindustry/world/Block.java

@@ -214,6 +214,12 @@ public class Block extends BlockStorage{
         draw(tile);
     }
 
+    public void drawTeam(Tile tile){
+        Draw.color(tile.getTeam().color);
+        Draw.rect("block-border", tile.drawx() - size * tilesize/2f + 4, tile.drawy() - size * tilesize/2f + 4);
+        Draw.color();
+    }
+
     /** Called after the block is placed by this client. */
     public void playerPlaced(Tile tile){
     }

core/src/io/anuke/mindustry/world/blocks/Floor.java

@@ -150,7 +150,7 @@ public class Floor extends Block{
     }
 
     protected boolean doEdge(Floor other){
-        return (other.blendGroup.id > id || edges() == null) && other.edgeOnto(this);
+        return (other.blendGroup.id > blendGroup.id || edges() == null) && other.edgeOnto(this);
     }
 
     protected boolean edgeOnto(Floor other){

core/src/io/anuke/mindustry/world/blocks/OreBlock.java

@@ -19,7 +19,7 @@ public class OreBlock extends Floor{
         this.base = base;
         this.variants = 3;
         this.edge = base.name;
-        this.blendGroup = base;
+        this.blendGroup = base.blendGroup;
         this.color.set(ore.color);
 
         oreBlockMap.getOr(ore, ObjectMap::new).put(base, this);

core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java

@@ -37,6 +37,11 @@ public class ShockMine extends Block{
         Draw.color();
     }
 
+    @Override
+    public void drawTeam(Tile tile){
+        //no
+    }
+
     @Override
     public void draw(Tile tile){
         //nope

core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java

@@ -84,7 +84,7 @@ public class Cultivator extends GenericCrafter{
         return new CultivatorEntity();
     }
 
-    public static class CultivatorEntity extends TileEntity{
+    public static class CultivatorEntity extends GenericCrafterEntity{
         public float warmup;
 
         @Override