diff --git a/assets/Data/entity/foliage.json b/assets/Data/entity/foliage.json index 40a4239c..5fde21e9 100644 --- a/assets/Data/entity/foliage.json +++ b/assets/Data/entity/foliage.json @@ -231,6 +231,17 @@ "path" : "Models/foliage/tree4.glb" } } + }, + { + "id" : "bush4", + "tokens" : [ + "FLAMMABLE" + ], + "graphicsTemplate": { + "model": { + "path" : "Models/foliage/bush4.glb" + } + } } ] diff --git a/assets/Data/game/biomes.json b/assets/Data/game/biomes.json index ac39c8d0..7acf4c93 100644 --- a/assets/Data/game/biomes.json +++ b/assets/Data/game/biomes.json @@ -37,6 +37,69 @@ ] } }, + { + "id": "forest", + "displayName": "Forest", + "isAerial": false, + "isSurface": true, + "isSubterranean": false, + "regions": [ + { + "frequency": 1.0, + "baseFloorVoxel": 1, + "floorVariants": [ + { + "voxelId": 2, + "frequency": 1.0, + "dispersion": 1.0, + "priority": 1.0 + } + ], + "foliageDescription": [ + ] + } + ], + "surfaceGenerationParams": { + "surfaceGenTag": "plains", + "heightOffset": 20, + "noiseScale" : 0.1, + "warpScale" : 0.1, + "floorVariants": [ + { + "voxelId": 2, + "frequency": 0.9, + "dispersion": 1.0, + "priority": 1.0 + }, + { + "voxelId": 1, + "frequency": 0.1, + "dispersion": 1.0, + "priority": 1.0 + } + ], + "foliageDescriptions": [ + { + "entityIDs": [ + "pine2" + ], + "regularity": 0.6, + "threshold": 0.03, + "scale": 0.5, + "priority": 1.0 + }, + { + "entityIDs": [ + "bush4" + ], + "regularity": 0.6, + "threshold": 0.05, + "scale": 0.5, + "priority": 1.0 + } + ] + } + }, { "id": "hills", "displayName": "Hills", diff --git a/assets/Models/foliage/Leaves_TwistedTree.png b/assets/Models/foliage/Leaves_TwistedTree.png new file mode 100644 index 00000000..2d3caa95 Binary files /dev/null and b/assets/Models/foliage/Leaves_TwistedTree.png differ diff --git a/assets/Models/foliage/Leaves_TwistedTree_Green.png b/assets/Models/foliage/Leaves_TwistedTree_Green.png new file mode 100644 index 00000000..bd5fee55 Binary files /dev/null and b/assets/Models/foliage/Leaves_TwistedTree_Green.png differ diff --git a/assets/Models/foliage/bush4.glb b/assets/Models/foliage/bush4.glb new file mode 100644 index 00000000..f715b053 Binary files /dev/null and b/assets/Models/foliage/bush4.glb differ diff --git a/assets/Models/foliage/texturemap.json b/assets/Models/foliage/texturemap.json index b331a0fb..924b7ccb 100644 --- a/assets/Models/foliage/texturemap.json +++ b/assets/Models/foliage/texturemap.json @@ -11,6 +11,13 @@ "diffuse" : "/Textures/Leaf_Pine_C.png", "isDefault" : false } + ], + "Models/foliage/bush4.glb": [ + { + "meshName" : "bush", + "diffuse" : "/Models/foliage/Leaves_TwistedTree_Green.png", + "isDefault" : true + } ] } } \ No newline at end of file diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 9fdbad2d..d1a3e21f 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1421,6 +1421,8 @@ Noise control from biome definition (04/03/2025) Add rock and stick items Update ServerEntityUtils.repositionEntityRecursive behavior +Add bush entity +Add bushes to forest biome