Add sandy biome, desert biome no longer has water

ClassiCube · Jan 15, 2023 · 0c53f8e · 0c53f8e
1 parent c839f35
commit 0c53f8e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/MCGalaxy/Generator/MapGenBiome.cs b/MCGalaxy/Generator/MapGenBiome.cs
@@ -22,7 +22,7 @@ namespace MCGalaxy.Generator
 {
     public enum MapGenBiomeName
     {
-        Forest, Arctic, Desert, Hell, Swamp, Mine
+        Forest, Arctic, Desert, Hell, Swamp, Mine, Sandy
     }
 
     /// <summary> Contains environment settings and the types of blocks that are used to generate a map </summary>
@@ -60,6 +60,7 @@ public struct MapGenBiome
                 case MapGenBiomeName.Hell:   return Hell;
                 case MapGenBiomeName.Swamp:  return Swamp;
                 case MapGenBiomeName.Mine:   return Mine;
+                case MapGenBiomeName.Sandy:  return Sandy;
             }
             return Forest;
         }
@@ -104,7 +105,7 @@ public struct MapGenBiome
             Surface    = Block.Sand,
             Ground     = Block.Sand,
             Cliff      = Block.Gravel,
-            Water      = Block.StillWater,
+            Water      = Block.Air,
             Bedrock    = Block.Stone,
             BeachSandy = Block.Sand,
             BeachRocky = Block.Gravel,
@@ -155,5 +156,19 @@ public struct MapGenBiome
             SkyColor   = "#444444",
             FogColor   = "#777777",
         };
+
+        public static MapGenBiome Sandy = new MapGenBiome()
+        {
+            Surface    = Block.Sand,
+            Ground     = Block.Sand,
+            Cliff      = Block.Gravel,
+            Water      = Block.StillWater,
+            Bedrock    = Block.Stone,
+            BeachSandy = Block.Sand,
+            BeachRocky = Block.Gravel,
+            CloudColor = "#52C6F7",
+            Border     = Block.Sand,
+            TreeType   = "Palm",
+        };
     }
 }
diff --git a/MCGalaxy/Generator/Realistic/RealisticMapGen.cs b/MCGalaxy/Generator/Realistic/RealisticMapGen.cs
@@ -372,7 +372,7 @@ public sealed class RealisticMapGen
             byte[] blocks = lvl.blocks;
 
             // first layer used to be bedrock, but is now skipped over
-            //  (since map generation would just replace it anyways)
+            //  (since map generation will just replace it anyways)
             index += oneY;
 
             for (int y = 1; y < height; ++y)

diff --git a/MCGalaxy/Generator/fCraft/fCraftMapGen.cs b/MCGalaxy/Generator/fCraft/fCraftMapGen.cs
@@ -50,13 +50,15 @@ public sealed class fCraftMapGen
 
         void ApplyBiome(Level map) {
             MapGenBiome biome = MapGenBiome.Get(args.Biome);
-            bGroundSurface   = biome.Surface;
+            bGroundSurface    = biome.Surface;
             bWater    = biome.Water;
             bGround   = biome.Ground;
             bSeaFloor = biome.BeachSandy;
             bBedrock  = biome.Bedrock;
             bCliff    = biome.Cliff;
 
+            args.AddWater = biome.Water != Block.Air;
+
             // TODO: temp hack, need a better solution
             if (args.Biome == MapGenBiomeName.Arctic) groundThickness = 1;
 
@@ -412,7 +414,6 @@ public sealed class fCraftMapGen
 
             args.Biome      = theme;
             args.AddTrees   = theme == MapGenBiomeName.Forest;
-            args.AddWater   = theme != MapGenBiomeName.Desert;
             args.WaterLevel = (lvl.Height - 1) / 2;
 
             new fCraftMapGen(args).Generate(lvl);

diff --git a/MCGalaxy/Generator/fCraft/fCraftMapGenArgs.cs b/MCGalaxy/Generator/fCraft/fCraftMapGenArgs.cs
@@ -69,7 +69,7 @@ public sealed class fCraftMapGenArgs
 
                 case MapGenTemplate.Atoll:
                     return new fCraftMapGenArgs {
-                        //Theme = MapGenThemeName.Desert,
+                        //Biome = MapGenBiomeName.Sandy, TODO maybe?
                         MaxHeight = 2,
                         MaxDepth = 39,
                         UseBias = true,