diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow1.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow1.png new file mode 100644 index 0000000000..5d68525e05 Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow1.png differ diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow2.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow2.png new file mode 100644 index 0000000000..5c055e1b17 Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow2.png differ diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow3.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow3.png new file mode 100644 index 0000000000..0f65c304a4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster-shadow3.png differ diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png new file mode 100644 index 0000000000..608da574c0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png differ diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster2.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster2.png new file mode 100644 index 0000000000..441acd6621 Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster2.png differ diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster3.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster3.png new file mode 100644 index 0000000000..c259fa954d Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster3.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index d00da281b6..adb53e1a86 100755 --- a/core/assets/icons/icons.properties +++ b/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 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 3ed804cf44..afd76fd7d7 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/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; diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 1692fdaed6..f4a2b6a4f2 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/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)){ - block = Blocks.crystalCluster; + 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 || 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; } }); diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index d51e55e039..ab33eac9cb 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/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));