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
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#?MXyIR9J=GmO&1LAPhxEV&YZYdkzmb*YOVSy^5=u6$#1E_Wx20nI<lT(*Gz>
zn2z`Uc`0_Cx7ID%x-F1jazzgk?*_ow*Z|)34+HQT13vB&w5A^&-!%gW#LNt=oo`Fz
zI&ZZu{A7R;&+YlsAYcGSobi(&Qt420V#=xqB1ys?aSudw6Gqs&E#kz=c5x4QXV1py
zUI{ITDnP{S(Rh#D1ro%#m(kw=n3WK5jusaIo)T99BC>$QFdwB}5coxe6deWvh0bq?
zlz&<wSmA7Q*<lH_><hRO_P7V=yTBU6h+C$ff))sL>=!b$aoriMt!4lK002ovPDHLk
FV1f`xenS8N

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
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#*GWV{R9J=Wm$4CmAPhy(<IYv=ox|Z=#~til#Y!vgKp-UXgBGS0{(p&(Xtyr&
zX^7ajgL<5eaT-|bdX+lJyc&Qcet;i<1kheV$-eJaK%2e4pQDikcxo=uiU5%29L?Te
zRKvUkVN0f|zK*yZPS;9|{bz_nYE0%3a;BMN;!zO+NQ4m(0RSp16~G(j0l-`F9RSU>
zLNu<R0yR4!3qS&af>ljJWTnXOfs_&YHCg}uw=lf-n`WJGoQ9-+G!5M%ROY3mvS$EM
j4UR^&P6+usZZV)PT~l1oU-3Zb00000NkvXXu0mjf*qwEf

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
zcmV+@0oVSCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;z>k7R9J=8mO&1LAPhwrV!~C}a}EzT*O@!G_bRT&g)t#2<+rqoe~YD$4{iPY
zzT@8!nx}<YE-Iz~edk5HD<wAr;HYl^>HVt#NW}r~_X=9=N8<;{=EpKCC7Y+ET9TIz
zQ1n+DQb}q~oB+7VTOr^_h;%mzgwH?FsCzDi*GepffU1BqToC0DW{v34am<0}w-x8I
zoQm&opbG%WH6Sr82RIOB<Cq$;5|>2(1DaLw{3F!v^QdA9E~c<Ka3{o`c-N3GIA_=O
uN{2kX0c|&qC$0h@L7e0@kyX$FfyS=#b69CE%!!Bq0000<MNUMnLSTZeetPo&

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));