From e408dd45e576e92d3f7d8d35b7e552c9bac23687 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Fri, 9 Dec 2022 19:30:06 +0000 Subject: [PATCH 1/5] Remove easter egg taking 3% of processing --- mods/ENTITIES/mcl_mobs/api.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index 4fb89dfa6..04c834ec3 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -471,7 +471,7 @@ local set_yaw = function(self, yaw, delay, dtime) if self.shaking and dtime then yaw = yaw + (random() * 2 - 1) * 5 * dtime end - update_roll(self) + --update_roll(self) return yaw end @@ -822,7 +822,7 @@ local update_tag = function(self) nametag = tag, }) - update_roll(self) + --update_roll(self) end -- drop items @@ -4457,7 +4457,7 @@ local mob_step = function(self, dtime) yaw = yaw + (random() * 2 - 1) * 5 * dtime end self.object:set_yaw(yaw) - update_roll(self) + --update_roll(self) end -- end rotation From f7f0a2be8b9ab7a387fec84c2b4c81ce77b305c0 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Fri, 9 Dec 2022 22:59:58 +0000 Subject: [PATCH 2/5] Raids performance optimisation. Check for village less and over less distance. --- mods/CORE/mcl_events/init.lua | 4 ++++ mods/ENVIRONMENT/mcl_raids/init.lua | 4 +++- mods/ENVIRONMENT/mcl_zombie_sieges/init.lua | 21 +++++++++++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/mods/CORE/mcl_events/init.lua b/mods/CORE/mcl_events/init.lua index 5ec2577a9..625076bae 100644 --- a/mods/CORE/mcl_events/init.lua +++ b/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 diff --git a/mods/ENVIRONMENT/mcl_raids/init.lua b/mods/ENVIRONMENT/mcl_raids/init.lua index 5a4575670..3c9c05157 100644 --- a/mods/ENVIRONMENT/mcl_raids/init.lua +++ b/mods/ENVIRONMENT/mcl_raids/init.lua @@ -217,7 +217,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) @@ -292,11 +292,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 diff --git a/mods/ENVIRONMENT/mcl_zombie_sieges/init.lua b/mods/ENVIRONMENT/mcl_zombie_sieges/init.lua index 8a43b0e7e..3551d4734 100644 --- a/mods/ENVIRONMENT/mcl_zombie_sieges/init.lua +++ b/mods/ENVIRONMENT/mcl_zombie_sieges/init.lua @@ -26,15 +26,24 @@ 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 = {} - 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 - table.insert(r,{ player = p:get_player_name(), pos = village}) + + 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 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, From 9b94a752bd676b3060b83503a13a5508c6e224e2 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Sun, 11 Dec 2022 20:22:06 +0000 Subject: [PATCH 3/5] Fixed bug that crashes zombie siege in context where z cannot spawn --- mods/ENVIRONMENT/mcl_zombie_sieges/init.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mods/ENVIRONMENT/mcl_zombie_sieges/init.lua b/mods/ENVIRONMENT/mcl_zombie_sieges/init.lua index 3551d4734..07db4bc7a 100644 --- a/mods/ENVIRONMENT/mcl_zombie_sieges/init.lua +++ b/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") - local l = m:get_luaentity() - mcl_mobs:gopath(m:get_luaentity(),self.pos) - table.insert(self.mobs,m) - self.health_max = self.health_max + l.health + if m then + local l = m:get_luaentity() + mcl_mobs:gopath(m:get_luaentity(), 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 From 5b680079028399f07688157d520ab213ef27611e Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Wed, 14 Dec 2022 20:13:06 +0000 Subject: [PATCH 4/5] Pre-release update credits and set version 0.81.1 --- CREDITS.md | 4 ++-- README.md | 2 +- RELEASE.md | 15 +++++++++++++++ mods/HUD/mcl_credits/people.lua | 4 ++-- 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 RELEASE.md diff --git a/CREDITS.md b/CREDITS.md index b258ca54b..dcbcee954 100644 --- a/CREDITS.md +++ b/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 diff --git a/README.md b/README.md index 1f6969e33..4e75fb4c1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils. Developed by many people. Not developed or endorsed by Mojang AB. -Version: 0.81 +Version: 0.81.1 ### Gameplay You start in a randomly-generated world made entirely of cubes. You can explore diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 000000000..7e302bd13 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,15 @@ +#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" \ No newline at end of file diff --git a/mods/HUD/mcl_credits/people.lua b/mods/HUD/mcl_credits/people.lua index 6b674e0c8..9c4208ece 100644 --- a/mods/HUD/mcl_credits/people.lua +++ b/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", From 1ac6c45c7fef220cf07176fe5b70dbdd2fe4d81e Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Wed, 14 Dec 2022 20:17:21 +0000 Subject: [PATCH 5/5] Update release readme --- RELEASE.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 7e302bd13..01eb71e7f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -12,4 +12,8 @@ git add README.md # To uncomment when applicable #git add game.conf -git commit -m "Pre-release update credits and set version" \ No newline at end of file +git commit -m "Pre-release update credits and set version 0.81.1" + +git tag 0.81.1 + +git push origin 0.81.1 \ No newline at end of file