More stone blocks

core/assets/icons/icons.properties

@@ -387,3 +387,7 @@
 63346=ferric-stone-wall|block-ferric-stone-wall-ui
 63345=ferric-craters|block-ferric-craters-ui
 63344=ferric-boulder|block-ferric-boulder-ui
+63343=beryllic-stone|block-beryllic-stone-ui
+63342=beryllic-stone-wall|block-beryllic-stone-wall-ui
+63341=beryllic-boulder|block-beryllic-boulder-ui
+63340=carbon-boulder|block-carbon-boulder-ui

core/src/mindustry/content/Blocks.java

@@ -40,10 +40,10 @@ public class Blocks implements ContentList{
     redmat, bluemat,
     stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
     redweed, purbush, coralChunk, yellowCoral,
-    regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall,
+    regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall,
-    ferricStone, ferricCraters, graphiticStone,
+    ferricStone, ferricCraters, graphiticStone, beryllicStone,
     iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
-    shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, ferricBoulder,
+    shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
     darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
     pebbles, tendrils,
@@ -53,7 +53,6 @@ public class Blocks implements ContentList{
 
     //wall ores
     wallOreBeryl, graphiticWall,
-    berylWall, //TODO remove?
 
     //crafting
     siliconSmelter, siliconCrucible, siliconArcFurnace, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
@@ -323,6 +322,10 @@ public class Blocks implements ContentList{
             blendGroup = ferricStone;
         }};
 
+        beryllicStone = new Floor("beryllic-stone"){{
+            variants = 4;
+        }};
+
         redIce = new Floor("red-ice"){{
             dragMultiplier = 0.4f;
             speedMultiplier = 0.9f;
@@ -401,6 +404,10 @@ public class Blocks implements ContentList{
             ferricStone.asFloor().wall = this;
         }};
 
+        beryllicStoneWall = new StaticWall("beryllic-stone-wall"){{
+            beryllicStone.asFloor().wall = this;
+        }};
+
         redIceWall = new StaticWall("red-ice-wall"){{
             redIce.asFloor().wall = this;
         }};
@@ -478,11 +485,21 @@ public class Blocks implements ContentList{
             variants = 2;
         }};
 
+        carbonBoulder = new Prop("carbon-boulder"){{
+            variants = 2;
+            graphiticStone.asFloor().decoration = this;
+        }};
+
         ferricBoulder = new Prop("ferric-boulder"){{
             variants = 2;
             ferricStone.asFloor().decoration = this;
         }};
 
+        beryllicBoulder = new Prop("beryllic-boulder"){{
+            variants = 2;
+            beryllicStone.asFloor().decoration = this;
+        }};
+
         moss = new Floor("moss"){{
             variants = 3;
             attributes.set(Attribute.spores, 0.15f);
@@ -556,10 +573,6 @@ public class Blocks implements ContentList{
 
         wallOreBeryl = new WallOreBlock(Items.beryllium);
 
-        berylWall = new StaticWall("beryl-wall"){{
-            itemDrop = Items.beryllium;
-        }};
-
         graphiticWall = new StaticWall("graphitic-wall"){{
             itemDrop = Items.graphite;
             variants = 3;

core/src/mindustry/maps/planet/AsteroidGenerator.java

@@ -15,8 +15,8 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
     //TODO nonstatic
     public static int min = 20, max = 28, octaves = 2, foct = 3;
     public static float radMin = 12f, radMax = 60f, persistence = 0.4f, scale = 30f, mag = 0.46f, thresh = 1f;
-    public static float fmag = 0.59f, fscl = 50f, fper = 0.6f;
+    public static float fmag = 0.5f, fscl = 50f, fper = 0.6f;
-    public static float iceChance = 0.05f, carbonChance = 0.1f;
+    public static float iceChance = 0.05f, carbonChance = 0.1f, berylChance = 0.1f;
 
     Rand rand;
     int seed;
@@ -25,6 +25,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
         Floor floor = (
             rand.chance(iceChance) ? Blocks.ice :
             rand.chance(carbonChance) ? Blocks.graphiticStone :
+            rand.chance(berylChance) ? Blocks.beryllicStone :
             Blocks.ferricStone
         ).asFloor();
 
@@ -76,7 +77,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
 
         //walls at insides
         pass((x, y) -> {
-            if(floor == Blocks.space || Ridged.noise2d(seed + 1, x, y, 3, 0.5f, 1f / 60f) > 0.38f || Mathf.within(x, y, sx, sy, 20 + Ridged.noise2d(seed, x, y, 3, 0.5f, 1f / 30f) * 6f)) return;
+            if(floor == Blocks.space || Ridged.noise2d(seed + 1, x, y, 4, 0.7f, 1f / 60f) > 0.45f || Mathf.within(x, y, sx, sy, 20 + Ridged.noise2d(seed, x, y, 3, 0.5f, 1f / 30f) * 6f)) return;
 
             int radius = 6;
             for(int dx = x - radius; dx <= x + radius; dx++){
@@ -97,7 +98,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
             if(floor == Blocks.stone && rand.chance(0.02)) floor = Blocks.craters;
         });
 
-        decoration(0.013f);
+        decoration(0.015f);
 
         //lead generates around stone walls
         oreAround(Blocks.oreLead, Blocks.stoneWall, 3, 70f, 0.6f);
@@ -108,7 +109,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
         wallOre(Blocks.carbonWall, Blocks.graphiticWall, 35f, 0.57f);
 
         //TODO
-        //wallOre(Blocks.iceWall, Blocks.wallOreBeryl, 35f, 0.57f);
+        wallOre(Blocks.beryllicStoneWall, Blocks.wallOreBeryl, 50f, 0.62f);
 
         //TODO:
         //- thorium - cores?