Merge pull request 'release/0.81.1_merge_conflict_fix' (#3132) from release/0.81.1_merge_conflict_fix into master

Reviewed-on: MineClone2/MineClone2#3132

CREDITS.md

@@ -8,12 +8,13 @@
 
 
 ## Maintainers
+* AncientMariner
 * Nicu
-* cora
 
 ## Previous Maintainers
 * Fleckenstein
 * jordan4ibanez
+* cora
 
 ## Developers
 * bzoss
@@ -35,7 +36,6 @@
 * MrRar
 * talamh
 * Faerraven
-* AncientMariner
 
 ## Contributors
 * Laurent Rocher

RELEASE.md

@@ -0,0 +1,19 @@
+#File to document release steps with a view to evolving into a script
+
+#Update CREDITS.md
+#Update version in README.md (soon to be game.conf from of 0.82.0)
+
+lua tools/generate_ingame_credits.lua
+
+git add CREDITS.md
+git add mods/HUD/mcl_credits/people.lua
+
+git add README.md
+# To uncomment when applicable
+#git add game.conf
+
+git commit -m "Pre-release update credits and set version 0.81.1"
+
+git tag 0.81.1
+
+git push origin 0.81.1

mods/CORE/mcl_events/init.lua

@@ -102,6 +102,7 @@ function check_events(dtime)
 	for _,e in pairs(mcl_events.registered_events) do
 		local pp = e.cond_start()
 		if pp then
+			--minetest.log("It's gonna start the raid maybe")
 			for _,p in pairs(pp) do
 				local start = true
 				if e.exclusive_to_area then
@@ -110,11 +111,14 @@ function check_events(dtime)
 					end
 				end
 				if start then
+					--minetest.log("It's gonna start the raid definitely")
 					start_event(p,e)
 				elseif DBG then
 					mcl_log("[mcl_events] Event "..e.readable_name.." already active at "..minetest.pos_to_string(vector.round(p.pos)))
 				end
 			end
+		else
+			--minetest.log("Do not start this raid")
 		end
 	end
 	for idx,ae in pairs(active_events) do

mods/ENTITIES/mcl_mobs/movement.lua

@@ -1397,7 +1397,7 @@ function mob_class:check_smooth_rotation(dtime)
 			yaw = yaw + (math.random() * 2 - 1) * 5 * dtime
 		end
 		self.object:set_yaw(yaw)
-		self:update_roll()
+		--self:update_roll()
 	end
 	-- end rotation
 end

mods/ENTITIES/mcl_mobs/physics.lua

@@ -354,7 +354,7 @@ function mob_class:set_yaw(yaw, delay, dtime)
 		if self.shaking and dtime then
 			yaw = yaw + (math.random() * 2 - 1) * 5 * dtime
 		end
-		self:update_roll()
+		--self:update_roll()
 		return yaw
 	end
 

mods/ENVIRONMENT/mcl_raids/init.lua

@@ -218,7 +218,7 @@ function mcl_raids.find_villager(pos)
 end
 
 function mcl_raids.find_bed(pos)
-	return minetest.find_node_near(pos,128,{"mcl_beds:bed_red_bottom"})
+	return minetest.find_node_near(pos,32,{"mcl_beds:bed_red_bottom"})
 end
 
 function mcl_raids.find_village(pos)
@@ -293,11 +293,13 @@ mcl_events.register_event("raid",{
 	exclusive_to_area = 128,
 	enable_bossbar = true,
 	cond_start  = function(self)
+		--minetest.log("Cond start raid")
 		local r = {}
 		for _,p in pairs(minetest.get_connected_players()) do
 			if mcl_potions.player_has_effect(p,"bad_omen") then
 				local raid_pos = mcl_raids.find_village(p:get_pos())
 				if raid_pos then
+					--minetest.log("We have a raid position. Start raid")
 					table.insert(r,{ player = p:get_player_name(), pos = raid_pos })
 				end
 			end

mods/ENVIRONMENT/mcl_zombie_sieges/init.lua

@@ -10,10 +10,14 @@ local function spawn_zombies(self)
 		local p = vector.offset(nn[i%#nn],0,1,0)
 		if check_spawn_pos(p) then
 			local m = mcl_mobs.spawn(p,"mobs_mc:zombie")
+			if m then
 				local l = m:get_luaentity()
 				l:gopath(self.pos)
 				table.insert(self.mobs, m)
 				self.health_max = self.health_max + l.health
+			else
+				--minetest.log("Failed to spawn zombie at location: " .. minetest.pos_to_string(p))
+			end
 		end
 	end
 end
@@ -26,16 +30,25 @@ mcl_events.register_event("zombie_siege",{
 	exclusive_to_area = 128,
 	enable_bossbar = false,
 	cond_start  = function(self)
+		--minetest.log("Cond start zs")
+		local r = {}
+
+		local t = minetest.get_timeofday()
 		local pr = PseudoRandom(minetest.get_day_count())
 		local rnd = pr:next(1,10)
-		local t = minetest.get_timeofday()
+
-		local r = {}
+		if t < 0.04 and rnd == 1 then
+			--minetest.log("Well, it's siege time")
 			for _,p in pairs(minetest.get_connected_players()) do
 				local village = mcl_raids.find_village(p:get_pos())
-			if t < 0.04 and village and rnd == 1 then
+				if village then
+					--minetest.log("Found village")
 					table.insert(r,{ player = p:get_player_name(), pos = village})
 				end
 			end
+		else
+			--minetest.log("Not night for a siege, or not success")
+		end
 		if #r > 0 then return r end
 	end,
 	on_start = function(self)

mods/HUD/mcl_credits/people.lua

@@ -9,12 +9,13 @@ return {
 		"Wuzzy",
 	}},
 	{S("Maintainers"), 0xFF51D5, {
+		"AncientMariner",
 		"Nicu",
-		"cora",
 	}},
 	{S("Previous Maintainers"), 0xFFFFFF, {
 		"Fleckenstein",
 		"jordan4ibanez",
+		"cora",
 	}},
 	{S("Developers"), 0xF84355, {
 		"bzoss",
@@ -36,7 +37,6 @@ return {
 		"MrRar",
 		"talamh",
 		"Faerraven",
-		"AncientMariner",
 	}},
 	{S("Contributors"), 0x52FF00, {
 		"Laurent Rocher",