From 5be12f750f71039cf18864c7c55e75bc02025858 Mon Sep 17 00:00:00 2001 From: ArkQuark <74979909+ArkQuark@users.noreply.github.com> Date: Tue, 28 Feb 2023 20:40:20 +0300 Subject: [PATCH] update experimental world type --- src/world/Level.php | 2 +- src/world/generator/NormalGenerator.php | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/world/Level.php b/src/world/Level.php index 39dfefc5..0bd2d4c6 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -7,7 +7,7 @@ class Level{ * 1 - Infinite * @var integer */ - public $generatorType = 0; + public $generatorType = 1; /** * @var Config diff --git a/src/world/generator/NormalGenerator.php b/src/world/generator/NormalGenerator.php index aba05b6f..07327a0f 100644 --- a/src/world/generator/NormalGenerator.php +++ b/src/world/generator/NormalGenerator.php @@ -32,8 +32,6 @@ class NormalGenerator implements NewLevelGenerator{ $this->noisePatchesSmall = new NoiseGeneratorSimplex($this->random, 2); $this->noiseBase = new NoiseGeneratorSimplex($this->random, 16); - - $ores = new OrePopulator(); $ores->setOreTypes(array( new OreType(new CoalOreBlock(), 20, 16, 0, 128), @@ -43,8 +41,12 @@ class NormalGenerator implements NewLevelGenerator{ new OreType(new GoldOreBlock(), 2, 8, 0, 32), new OreType(new DiamondOreBlock(), 1, 7, 0, 16), new OreType(new EmeraldOreBlock(), 1, 7, 0, 16), //TODO vanilla + new OreType(new DirtBlock(), 20, 32, 0, 128), new OreType(new GravelBlock(), 10, 16, 0, 128), + new OreType(new StoneBlock(1), 12, 16, 0, 128), + new OreType(new StoneBlock(3), 12, 16, 0, 128), + new OreType(new StoneBlock(5), 12, 16, 0, 128), )); $this->populators[] = $ores; @@ -85,12 +87,11 @@ class NormalGenerator implements NewLevelGenerator{ for($z = 0; $z < 16; ++$z){ for($x = 0; $x < 16; ++$x){ $i = ($z << 4) + $x; - $height = $this->worldHeight + $hills[$i] * 14 + $base[$i] * 7; - $height = (int) $height; + $height = floor($this->worldHeight + $hills[$i] * 14 + $base[$i] * 7); for($y = $startY; $y < $endY; ++$y){ $diff = $height - $y; - if($y <= 4 and ($y === 0 or $this->random->nextFloat() < 0.75)){ + if($y <= 4 and ($y === 0 or $this->random->nextFloat() < 0.33)){ $chunk .= "\x07"; //bedrock }elseif($diff > 2){ $chunk .= "\x01"; //stone @@ -106,13 +107,13 @@ class NormalGenerator implements NewLevelGenerator{ if(($this->waterHeight - $y) <= 1 and $diff === 0){ $chunk .= "\x0c"; //sand }elseif($diff === 0){ - if($patchesSmall[$i] > 0.3){ + /*if($patchesSmall[$i] > 0.3){ $chunk .= "\x0d"; //gravel }elseif($patchesSmall[$i] < -0.45){ $chunk .= "\x0c"; //sand - }else{ + }else{*/ $chunk .= "\x03"; //dirt - } + //} }else{ $chunk .= "\x09"; //still_water }