From 0e790e61f254bc14cf100e73bb12f0fcfcd7917c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 20 Jan 2022 15:19:03 -0500
Subject: [PATCH] Generation tweaks

---
 .../blocks/environment/yellow-stone-plates1.png   | Bin 0 -> 307 bytes
 .../blocks/environment/yellow-stone-plates2.png   | Bin 0 -> 285 bytes
 .../blocks/environment/yellow-stone-plates3.png   | Bin 0 -> 296 bytes
 core/assets/icons/icons.properties                |   1 +
 core/src/mindustry/content/Blocks.java            |  10 +++++++---
 .../maps/planet/ErekirPlanetGenerator.java        |  11 +++++++++--
 6 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/environment/yellow-stone-plates1.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/yellow-stone-plates2.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/yellow-stone-plates3.png

diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-plates1.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates1.png
new file mode 100644
index 0000000000000000000000000000000000000000..068eaa8e24875617e1e2b259ca4db1d4e6335edf
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V0i24
z;usRqdUu*5UyA~dt9#O;&^y(9{N~p`^1a*JwR)x~=gAA-{s-~QRMTs@^j{-jM&I{;
zm6~O9w_nq}wM%zGe32`^(0jH6H*PT8`^wM!L5kV#ozRwL^0N0$nK_P};aM{`-}{MG
z{#Ly|DGh?>-~PO;kig(J=i_9BpqBx~NvBq^D|sH0E97@66?VI^OZU-{Q)Pwx73t@X
zy@=z~?a*>K^5$Yi|6Nw0BRi&Fyw5mesz70%m^kA+p>Rf}O$|p3<d?<?{BUg%k!53Q
zJ(u4xr9MhA;$cql%|y<vZ@6~|ecQqQV)p^5BOTGp<~50Nl)Mo)+ERE|a_!nQ1_lNO
MPgg&ebxsLQ01!xiLjV8(

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-plates2.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fce3922890a91a930c7f63633751632641405fd
GIT binary patch
literal 285
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V7Tt-
z;usRq`gZz8!3G5$*NczOg}#}4_+iX(**CFAy|mvsD5!jF7F#CzufB6a#&*5WnH@K_
zH&@N+EtHCQT{YF}#2%>zmAVG`29^tPjwkoM4|ABkcmMpw6Im*<^e%QWOn4@9_FjC*
z;XN#g-pf|*>)RpgcipS!Z+eGwmd`VRqGdBv9t8?Adb9`%FfwRqiyn}E#&{t5qb$SO
ztxhKE7BHDwD{?z9H8zF%I;Si>@xF12;4jn2|Npid?D;-BZEnGwwk35YymysCo-JLn
pDV-sZx6f^>AIDGYJi`TgvB5Ft<3BpQU|?Wi@O1TaS?83{1OV8bb&>!8

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/yellow-stone-plates3.png b/core/assets-raw/sprites/blocks/environment/yellow-stone-plates3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a058c3a8b31415d271d4e23ffd372e55c23cd8a2
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V0h%|
z;usRqdUcv3UyA~dt7Oul&>O{k{N~qZTJQL-weDD}p`zB)?OVF)yO;L!=l=b(@9}-X
zS<73a^t6^S)IN9Jt*vU#{9r{s!^^*`89k0NzW>e@_166{`^jg=jkHx~FJBrpX*yrP
zmvHGI&n&+=3_DInD?V`VC^6@3Id6YqMYUebbuXRPhE)y5F#=Bo(t2N9EIiZrV!P<`
zO>?^57cAgrIBBY2sKag{koI_n)JCD{F8`Tlg?{{_eC6He6-iur%QjdRs2`bEaeacm
zMf&xxUhOt}8FS71)Yma7IL>)uIx+MDQ{%C9pNb<g_0Dv5FfcGMc)I$ztaD0e0syUk
Bdh-AP

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 1220a685be..0f81f57397 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -508,3 +508,4 @@
 63196=vibrant-crystal-cluster|block-vibrant-crystal-cluster-ui
 63195=red-ice-boulder|block-red-ice-boulder-ui
 63194=crystal-blocks|block-crystal-blocks-ui
+63193=yellow-stone-plates|block-yellow-stone-plates-ui
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index a5cdecfd72..24a433c3b5 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -46,7 +46,7 @@ public class Blocks{
     stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
     redweed, purbush, coralChunk, yellowCoral,
     regolithWall, yellowStoneWall, rhyoliteWall, steamVent, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall, arkyicWall, crystallineStoneWall,
-    ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor,
+    ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor, yellowStonePlates,
     iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
     //boulders
     shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
@@ -407,6 +407,10 @@ public class Blocks{
             variants = 4;
         }};
 
+        yellowStonePlates = new Floor("yellow-stone-plates"){{
+            variants = 3;
+        }};
+
         redIce = new Floor("red-ice"){{
             //TODO red ice boulder
             dragMultiplier = 0.4f;
@@ -510,7 +514,7 @@ public class Blocks{
         }};
 
         yellowStoneWall = new StaticWall("yellow-stone-wall"){{
-            yellowStone.asFloor().wall = slag.asFloor().wall = this;
+            yellowStone.asFloor().wall = slag.asFloor().wall = yellowStonePlates.asFloor().wall = this;
             attributes.set(Attribute.silicate, 1.5f);
         }};
 
@@ -647,7 +651,7 @@ public class Blocks{
 
         yellowStoneBoulder = new Prop("yellow-stone-boulder"){{
             variants = 2;
-            yellowStone.asFloor().decoration = regolith.asFloor().decoration = this;
+            yellowStone.asFloor().decoration = regolith.asFloor().decoration = yellowStonePlates.asFloor().decoration = this;
         }};
 
         //1px outline + 4.50 gaussian shadow in gimp
diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
index db6da5071a..ca42c750ca 100644
--- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
@@ -24,9 +24,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
     public float heightScl = 0.9f, octaves = 8, persistence = 0.7f, heightPow = 3f, heightMult = 1.6f;
 
     Block[][] arr = {
-    //{Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.rhyolite, Blocks.basalt}
+    {Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.rhyolite, Blocks.carbonStone}
     //TODO basalt bad
-    {Blocks.regolith, Blocks.regolith, Blocks.beryllicStone, Blocks.crystallineStone, Blocks.basalt}
+    //{Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.crystallineStone, Blocks.carbonStone}
     };
 
     @Override
@@ -155,7 +155,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
 
         blend(Blocks.arkyciteFloor, Blocks.arkyicStone, 4);
 
+        //TODO may overwrite floor blocks under walls and look bad
+        blend(Blocks.slag, Blocks.yellowStonePlates, 4);
+
         distort(10f, 12f);
+
         distort(5f, 7f);
 
         //does arkycite need smoothing?
@@ -178,6 +182,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
                 if(block == Blocks.air) block = Blocks.yellowStoneWall;
             }
 
+            if(floor == Blocks.yellowStonePlates && noise(x + 78 + y, y, 3, 0.8f, 8f, 1f) > 0.38f){
+                floor = Blocks.yellowStone;
+            }
         });
 
         inverseFloodFill(tiles.getn(spawnX, spawnY));