From 99349cc6166f4d0058f61eb0aa4996591178fc32 Mon Sep 17 00:00:00 2001
From: sys4-fr <sys4@free.fr>
Date: Sun, 23 Dec 2018 10:39:17 +0100
Subject: [PATCH] Rend les pyramides indestructibles

---
 depends.txt |  1 +
 init.lua    | 19 ++++++++++---------
 nodes.lua   |  2 +-
 room.lua    |  3 ++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/depends.txt b/depends.txt
index b2f86d1..5fb6633 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,4 +1,5 @@
 default
+maptools
 farming?
 sandplus?
 treasurer?
diff --git a/init.lua b/init.lua
index b15a8f5..ba35e7f 100644
--- a/init.lua
+++ b/init.lua
@@ -93,7 +93,7 @@ local function make(pos, brick, sandstone, stone, sand)
 	for iy=0,10,1 do
 		for ix=iy,22-iy,1 do
 			for iz=iy,22-iy,1 do
-			if iy <1 then underground({x=pos.x+ix,y=pos.y,z=pos.z+iz}, stone, sand) end
+				if iy <1 then underground({x=pos.x+ix,y=pos.y,z=pos.z+iz}, stone, sand) end
 				minetest.set_node({x=pos.x+ix,y=pos.y+iy,z=pos.z+iz}, {name=brick})
 				for yy=1,10-iy,1 do
 					local n = minetest.get_node({x=pos.x+ix,y=pos.y+iy+yy,z=pos.z+iz})
@@ -182,20 +182,21 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		p2.y = p2.y - 3
 		if p2.y < 0 then p2.y = 0 end
 		if minetest.find_node_near(p2, 25, {"default:water_source"}) ~= nil or 
-				minetest.find_node_near(p2, 22, {"default:dirt_with_grass"}) ~= nil or
-				minetest.find_node_near(p2, 52, {"default:sandstonebrick"}) ~= nil or
-				minetest.find_node_near(p2, 52, {"sandplus:desert_sandstonebrick"}) ~= nil then
-			return
-		end
+			minetest.find_node_near(p2, 22, {"default:dirt_with_grass"}) ~= nil or
+			minetest.find_node_near(p2, 52, {"maptools:sandstone_brick"}) ~= nil or
+			minetest.find_node_near(p2, 52, {"maptools:desert_sandstone_brick"}) ~= nil or
+			minetest.find_node_near(p2, 52, {"maptools:silver_sandstone_brick"}) ~= nil or
+			minetest.find_node_near(p2, 52, {"sandplus:desert_sandstonebrick"}) ~= nil
+		then return	end
 	
 		if random(0,10) > 7 then
 			return
 		end
 		local p_type = random(1, 3)
 		local p_pot = {
-			[1] = {"default:sandstonebrick", "default:sandstone", "default:sandstone", "default:sand"},
-			[2] = {"default:desert_sandstone_brick", "default:desert_sandstone", "default:desert_stone", "default:desert_sand"},
-			[3] = {"default:silver_sandstone_brick", "default:silver_sandstone", "default:silver_sandstone", "default:silver_sand"}
+			[1] = {"maptools:sandstone_brick", "default:sandstone", "default:sandstone", "default:sand"},
+			[2] = {"maptools:desert_sandstone_brick", "default:desert_sandstone", "default:desert_stone", "default:desert_sand"},
+			[3] = {"maptools:silver_sandstone_brick", "default:silver_sandstone", "default:silver_sandstone", "default:silver_sand"}
 		}
 		
 		if sand == "default:desert_sand" then
diff --git a/nodes.lua b/nodes.lua
index 3a5089c..b7738e1 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -20,7 +20,7 @@ for i=1,3 do
 		_doc_items_longdesc = decodesc,
 		tiles = {"default_sandstone.png", "default_sandstone.png", "default_sandstone.png^tsm_pyramids_"..img[i]..".png"},
 		is_ground_content = false,
-		groups = minetest.registered_nodes["default:sandstone"].groups,
+		groups = {unbreakable=1},
 		sounds = default.node_sound_stone_defaults(),
 	})
 end
diff --git a/room.lua b/room.lua
index ed2079e..b55546d 100644
--- a/room.lua
+++ b/room.lua
@@ -35,6 +35,7 @@ local function replace(str,iy)
 	if iy == 0 and str == "s" then out = "tsm_pyramids:" str = "sun" end
 	if iy == 3 and str == "s" then out = "tsm_pyramids:" str = "men" end
 	if str == "a" then out = "" end
+	if str == "s" then out = "maptools:" end
 	return out..code[str]
 end
 
@@ -42,8 +43,8 @@ local function replace2(str,iy)
 	local out = "default:"
 	if iy == 0 and str == "l" then out = "tsm_pyramids:" str = "t"
 	elseif iy < 3 and str == "l" then str = "a" end
-
 	if str == "a" then out = "" end
+	if str == "b" then out = "maptools:" end
 	return out..code[str]
 end