From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 8 Jul 2015 19:01:29 +0000 (+0100)
Subject: Biome API decorations: 'spawnby' searches a 3D neighbourhood
X-Git-Tag: 0.4.13~138
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b51738177e2dae60153a825e200ea9cdeb1cec99;p=oweals%2Fminetest.git

Biome API decorations: 'spawnby' searches a 3D neighbourhood

The neighbours checked are the 8 nodes horizontally surrounding the decoration base
and the 8 nodes horizontally surrounding the ground node below the decoration
---

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 95b514a92..49292d2b4 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3331,7 +3331,9 @@ Definition tables
     --      ^ Number of nodes the decoration can be at maximum.
     --  ^ If absent, the parameter 'height' is used as a constant.
         spawn_by = "default:water",
-    --  ^ Node that the decoration only spawns next to, in a 1-node square radius.
+    --  ^ Node that the decoration only spawns next to.
+    --  ^ The neighbours checked are the 8 nodes horizontally surrounding the lowest node of the
+    --  ^ decoration, and the 8 nodes horizontally surrounding the ground node below the decoration.
         num_spawn_by = 1,
     --  ^ Number of spawn_by nodes that must be surrounding the decoration position to occur.
     --  ^ If absent or -1, decorations occur next to any nodes.
diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index f133788de..0d6693929 100644
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -246,7 +246,7 @@ bool DecoSimple::canPlaceDecoration(MMVManip *vm, v3s16 p)
 		return true;
 
 	int nneighs = 0;
-	v3s16 dirs[8] = {
+	v3s16 dirs[16] = {
 		v3s16( 0, 0,  1),
 		v3s16( 0, 0, -1),
 		v3s16( 1, 0,  0),
@@ -254,7 +254,16 @@ bool DecoSimple::canPlaceDecoration(MMVManip *vm, v3s16 p)
 		v3s16( 1, 0,  1),
 		v3s16(-1, 0,  1),
 		v3s16(-1, 0, -1),
-		v3s16( 1, 0, -1)
+		v3s16( 1, 0, -1),
+
+		v3s16( 0, 1,  1),
+		v3s16( 0, 1, -1),
+		v3s16( 1, 1,  0),
+		v3s16(-1, 1,  0),
+		v3s16( 1, 1,  1),
+		v3s16(-1, 1,  1),
+		v3s16(-1, 1, -1),
+		v3s16( 1, 1, -1)
 	};
 
 	// Check a Moore neighborhood if there are enough spawnby nodes