From 7379d5bee8eece730aeb93434556b4e7a3397781 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Sat, 21 May 2022 13:43:28 +0200
Subject: [PATCH] Add Belltower to villages

---
 mods/MAPGEN/mcl_villages/buildings.lua        |  21 ++++++++++++++----
 .../mcl_villages/schematics/belltower.mts     | Bin 0 -> 211 bytes
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 mods/MAPGEN/mcl_villages/schematics/belltower.mts

diff --git a/mods/MAPGEN/mcl_villages/buildings.lua b/mods/MAPGEN/mcl_villages/buildings.lua
index 928d37b37..c9fc87ed4 100644
--- a/mods/MAPGEN/mcl_villages/buildings.lua
+++ b/mods/MAPGEN/mcl_villages/buildings.lua
@@ -200,7 +200,7 @@ local function spawn_iron_golem(pos)
 end
 
 local function spawn_villagers(minp,maxp)
-	local beds=minetest.find_nodes_in_area(minp,maxp,{"mcl_beds:bed_red_bottom"})
+	local beds=minetest.find_nodes_in_area(vector.offset(minp,-20,-20,-20),vector.offset(maxp,20,20,20),{"mcl_beds:bed_red_bottom"})
 	for _,bed in pairs(beds) do
 		local m = minetest.get_meta(bed)
 		if m:get_string("villager") == "" then
@@ -234,6 +234,22 @@ end
 
 function settlements.place_schematics(settlement_info, pr)
 	local building_all_info
+	
+	--attempt to place one belltower in the center of the village - this doesn't always work out great but it's a lot better than doing it first or last.
+	local belltower = table.remove(settlement_info,math.floor(#settlement_info/2))
+	mcl_structures.place_schematic(
+		vector.offset(belltower["pos"],0,1,0),
+		settlements.modpath.."/schematics/belltower.mts",
+		belltower["rotation"],
+		nil,
+		true,
+		nil,
+		function(p1, p2, size, rotation, pr)
+			spawn_iron_golem(p1)
+		end,
+		pr
+	)
+	
 	for i, built_house in ipairs(settlement_info) do
 		local is_last = i == #settlement_info
 		
@@ -307,9 +323,6 @@ function settlements.place_schematics(settlement_info, pr)
 			function(p1, p2, size, rotation, pr)
 				init_nodes(p1, p2, size, rotation, pr)
 				spawn_villagers(p1,p2)
-				if is_last then
-					spawn_iron_golem(p1)
-				end
 			end,
 			pr
 		)
diff --git a/mods/MAPGEN/mcl_villages/schematics/belltower.mts b/mods/MAPGEN/mcl_villages/schematics/belltower.mts
new file mode 100644
index 0000000000000000000000000000000000000000..8eb524312cc98c62899ef6d7714398c5ef869d4e
GIT binary patch
literal 211
zcmeYb3HD`RVPIuoV_>ZZ0|s^m;oRh$_~iVeRIB2W{JhkpqRixM2Ij=fA_g&#OnG8X
zPBD^Hya9s<NW8ctF|(-HsyHVxDZV^EKZQX8n`nGVegOj?NG2&2WDbaA5CZXY67xz@
zi}H%Ck~0!B^D5>fCnO}WIJ2>-X>@aHcT4g~dbXY6(Mj-_6&JQ6&TL2AC7%On`mF!f
U%1>!%eC5!>mBzpzU+SFz03Fy#S^xk5

literal 0
HcmV?d00001