diff --git a/src/dependencies.php b/src/dependencies.php index 36006f4d..5a6e7ab5 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -134,6 +134,7 @@ require_once(FILE_PATH . "/src/world/generator/LevelGenerator.php"); require_once(FILE_PATH . "/src/world/generator/biome/Biome.php"); require_once(FILE_PATH . "/src/world/generator/biome/BiomeSelector.php"); require_once(FILE_PATH . "/src/world/generator/biome/biomes/BiomeWithGrass.php"); +require_once(FILE_PATH . "/src/world/generator/biome/biomes/BiomeExtremeHills.php"); require_all(FILE_PATH . "src/"); diff --git a/src/world/generator/ExperimentalGenerator.php b/src/world/generator/ExperimentalGenerator.php index e2440015..4dd28801 100644 --- a/src/world/generator/ExperimentalGenerator.php +++ b/src/world/generator/ExperimentalGenerator.php @@ -146,7 +146,6 @@ class ExperimentalGenerator implements NewLevelGenerator{ } $minSum /= $weightSum; $maxSum /= $weightSum; - for($y = $startY; $y < $endY; ++$y){ if($y === 0){ $chunk .= "\x07"; @@ -161,6 +160,8 @@ class ExperimentalGenerator implements NewLevelGenerator{ if($noiseValue > 0){ $chunk .= "\x01"; + }elseif($y <= $this->waterHeight){ + $chunk .= "\x09"; }else{ $chunk .= "\x00"; } diff --git a/src/world/generator/biome/Biome.php b/src/world/generator/biome/Biome.php index 13978d94..4e70378b 100644 --- a/src/world/generator/biome/Biome.php +++ b/src/world/generator/biome/Biome.php @@ -47,6 +47,8 @@ abstract class Biome{ public static function init(){ BiomeSelector::registerBiome(new BiomeExtremeHills(BIOME_EXTREME_HILLS, "Extreme Hills")); BiomeSelector::registerBiome(new BiomePlains(BIOME_PLAINS, "Plains")); + BiomeSelector::registerBiome(new BiomeExtremeHillsEdge(BIOME_EXTREME_HILLS_EDGE, "Extreme Hills Edge")); + BiomeSelector::registerBiome(new BiomeRiver(BIOME_RIVER, "River")); } private static $initialized = false; diff --git a/src/world/generator/biome/BiomeSelector.php b/src/world/generator/biome/BiomeSelector.php index 4539a2a4..f0d6988e 100644 --- a/src/world/generator/biome/BiomeSelector.php +++ b/src/world/generator/biome/BiomeSelector.php @@ -48,8 +48,12 @@ class BiomeSelector if($r < 0.60){ return BIOME_PLAINS; }else{ - if($t < 0.70){ + if($t < 0.25){ return BIOME_EXTREME_HILLS; + }else if($t < 0.70){ + return BIOME_EXTREME_HILLS_EDGE; + }else{ + return BIOME_RIVER; } } } diff --git a/src/world/generator/biome/biomes/BiomeExtremeHillsEdge.php b/src/world/generator/biome/biomes/BiomeExtremeHillsEdge.php new file mode 100644 index 00000000..54a4766c --- /dev/null +++ b/src/world/generator/biome/biomes/BiomeExtremeHillsEdge.php @@ -0,0 +1,10 @@ +setMinMax(63, 97); + } +} + diff --git a/src/world/generator/biome/biomes/BiomeRiver.php b/src/world/generator/biome/biomes/BiomeRiver.php new file mode 100644 index 00000000..9f3cd4a1 --- /dev/null +++ b/src/world/generator/biome/biomes/BiomeRiver.php @@ -0,0 +1,18 @@ +setBaseAmount(6); + $tallGrass = new TallGrass(); + $tallGrass->setBaseAmount(5); + + $this->addPopulator($sugarcane); + $this->addPopulator($tallGrass); + */ + $this->setMinMax(58, 62); + } +} diff --git a/src/world/generator/populator/GroundCover.php b/src/world/generator/populator/GroundCover.php index f8d436ed..ddac2258 100644 --- a/src/world/generator/populator/GroundCover.php +++ b/src/world/generator/populator/GroundCover.php @@ -4,8 +4,7 @@ class GroundCover extends Populator { public function populate(Level $level, $chunkX, $chunkZ, Random $random) { - console("gcpop: $chunkX $chunkZ"); - $waterHeight = 0; //TODO + $waterHeight = 63; for($x = 0; $x < 16; ++$x){ for($z = 0; $z < 16; ++$z){ $pcx = ($chunkX << 4) + $x;