New blocks

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

@@ -32,8 +32,8 @@ public class Blocks implements ContentList{
     public static Block
 
     //environment
-    air, part, spawn, space, metalfloor, deepwater, water, tar, stone, craters, charr, blackstone, dirt, sand, ice, snow,
-    grass, shrub, rock, icerock, blackrock, rocks, cliffs, pine, whiteTree,
+    air, part, spawn, space, metalfloor, deepwater, water, tar, stone, craters, charr, blackstone, dirt, sand, ice, snow, iceSnow,
+    grass, holostone, holostoneSnow, shrub, rock, icerock, blackrock, rocks, icerocks, cliffs, pine, whiteTree, sporeCluster,
 
     //crafting
     siliconSmelter, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
@@ -182,12 +182,15 @@ public class Blocks implements ContentList{
             dragMultiplier = 0.2f;
             speedMultiplier = 0.4f;
             minimapColor = Color.valueOf("b8eef8");
-            hasOres = true;
         }};
 
         snow = new Floor("snow"){{
             minimapColor = Color.valueOf("c2d1d2");
-            hasOres = true;
+        }};
+
+        iceSnow = new Floor("ice-snow"){{
+            minimapColor = Color.valueOf("c2d1d2");
+            variants = 3;
         }};
 
         grass = new Floor("grass"){{
@@ -197,24 +200,16 @@ public class Blocks implements ContentList{
 
         shrub = new Rock("shrub");
 
-        rock = new Rock("rock"){{
-            variants = 2;
-        }};
-
         cliffs = new StaticWall("cliffs"){{
             variants = 1;
             fillsTile = false;
         }};
 
-        icerock = new Rock("icerock"){{
+        rocks = new StaticWall("rocks"){{
             variants = 2;
         }};
 
-        blackrock = new Rock("blackrock"){{
-            variants = 1;
-        }};
-
-        rocks = new StaticWall("rocks"){{
+        icerocks = new StaticWall("icerocks"){{
             variants = 2;
         }};
 
@@ -226,6 +221,18 @@ public class Blocks implements ContentList{
         whiteTree = new TreeBlock("white-tree-dead"){{
         }};
 
+        sporeCluster = new Rock("spore-cluster"){{
+            variants = 3;
+        }};
+
+        holostone = new Floor("holostone"){{
+            hasOres = true;
+        }};
+
+        holostoneSnow = new Floor("holostone-snow"){{
+
+        }};
+
         //endregion
         //region crafting
 

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

@@ -5,6 +5,7 @@ import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.game.Rules;
 import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.maps.generators.MapGenerator;
+import io.anuke.mindustry.maps.generators.MapGenerator.Decoration;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.Zone;
 import io.anuke.mindustry.world.Block;
@@ -58,7 +59,7 @@ public class Zones implements ContentList{
             }};
         }};
 
-        craters = new Zone("craters", new MapGenerator("craters", 1){{ distortion = 0; }}){{
+        craters = new Zone("craters", new MapGenerator("craters", 1).dist(0)){{
             deployCost = ItemStack.with(Items.copper, 300);
             startingItems = ItemStack.with(Items.copper, 200);
             conditionWave = 15;
@@ -106,7 +107,8 @@ public class Zones implements ContentList{
             }};
         }};
 
-        frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest")){{ //TODO implement
+        frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest")
+            .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.05))){{
             alwaysUnlocked = true;
             deployCost = ItemStack.with(Items.copper, 300);
             startingItems = ItemStack.with(Items.copper, 200);