More crystals

core/assets/icons/icons.properties

@@ -505,3 +505,4 @@
 63199=crystal-cluster|block-crystal-cluster-ui
 63198=crystalline-boulder|block-crystalline-boulder-ui
 63197=crystal-floor|block-crystal-floor-ui
+63196=vibrant-crystal-cluster|block-vibrant-crystal-cluster-ui

core/src/mindustry/content/Blocks.java

@@ -49,7 +49,7 @@ public class Blocks{
     ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor,
     iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
     //boulders
-    shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, crystallineBoulder,
+    shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystallineBoulder,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
     darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
     pebbles, tendrils,
@@ -657,12 +657,16 @@ public class Blocks{
             arkyicStone.asFloor().decoration = this;
         }};
 
-        //TODO better visuals, maybe make tree
         crystalCluster = new TallBlock("crystal-cluster"){{
             variants = 3;
             clipSize = 128f;
         }};
 
+        vibrantCrystalCluster = new TallBlock("vibrant-crystal-cluster"){{
+            variants = 3;
+            clipSize = 128f;
+        }};
+
         crystallineBoulder = new Prop("crystalline-boulder"){{
             variants = 2;
             crystallineStone.asFloor().decoration = this;

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

@@ -215,13 +215,15 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
                     ore = Blocks.oreCrystalThorium;
                 }
 
-                if(noise(x + 999, y + 600 - x, 5, 0.8f, 50f, 1f) < 0.38f && floor == Blocks.crystallineStone){
-                    floor = Blocks.crystalFloor;
-                }
             }
 
-            if(block == Blocks.air && floor == Blocks.crystallineStone && rand.chance(0.08) && nearWall(x, y) && !near(x, y, 4, Blocks.crystalCluster)){
+            if(noise(x + 999, y + 600 - x, 5, 0.8f, 50f, 1f) < 0.38f && floor == Blocks.crystallineStone){
-                block = Blocks.crystalCluster;
+                floor = Blocks.crystalFloor;
+            }
+
+            if(block == Blocks.air && (floor == Blocks.crystallineStone || floor == Blocks.crystalFloor) && rand.chance(0.09) && nearWall(x, y)
+                && !near(x, y, 4, Blocks.crystalCluster) && !near(x, y, 4, Blocks.vibrantCrystalCluster)){
+                block = floor == Blocks.crystalFloor ? Blocks.vibrantCrystalCluster : Blocks.crystalCluster;
             }
         });
 

tools/src/mindustry/tools/Generators.java

@@ -687,9 +687,10 @@ public class Generators{
                         }
                     }
 
+                    image.draw(base, true);
+
                     replace(ore.variantRegions[i], image);
 
-                    image.draw(base, true);
                     save(image, "../blocks/environment/" + ore.name + (i + 1));
                     save(image, "../editor/editor-" + ore.name + (i + 1));