From 054e1389c4423b33c608bee703bee585e7bc6b60 Mon Sep 17 00:00:00 2001 From: savilli <78875209+savilli@users.noreply.github.com> Date: Thu, 1 Apr 2021 18:33:07 +0300 Subject: [PATCH 01/13] Make your last hitter get a kill if you suicide any possible way (#840) --- mods/pvp/anticoward/init.lua | 122 +++++++++++++++-------------------- 1 file changed, 53 insertions(+), 69 deletions(-) diff --git a/mods/pvp/anticoward/init.lua b/mods/pvp/anticoward/init.lua index bba05b5..de93a2a 100644 --- a/mods/pvp/anticoward/init.lua +++ b/mods/pvp/anticoward/init.lua @@ -15,18 +15,7 @@ ctf.register_on_attack(function(player, hitter, local pname = player:get_player_name() local hname = hitter:get_player_name() - local hp = player:get_hp() - damage - if hp <= 0 then - if potential_cowards[pname] then - player:hud_remove(potential_cowards[pname].hud or 0) - potential_cowards[pname] = nil - end - - if potential_cowards[hname] and potential_cowards[hname].puncher == pname then - hitter:hud_remove(potential_cowards[hname].hud or 0) - potential_cowards[hname] = nil - end - + if pname == hname then return end @@ -49,55 +38,63 @@ ctf.register_on_attack(function(player, hitter, potential_cowards[pname].timer = 0 potential_cowards[pname].puncher = hname + potential_cowards[pname].wielded_item = hitter:get_wielded_item() potential_cowards[pname].toolcaps = tool_capabilities end end) +ctf.register_on_killedplayer(function(victim, killer, _, toolcaps) + if toolcaps.damage_groups.combat_log or toolcaps.damage_groups.suicide then + return + end + + if victim ~= killer and potential_cowards[victim] then -- if player is killed then killer is already awarded + local player = minetest.get_player_by_name(victim) + if player then + player:hud_remove(potential_cowards[victim].hud or 0) + end + + potential_cowards[victim] = nil + end +end) + +function handle_leave_or_die(pname, leave) + if potential_cowards[pname] then + local hname = potential_cowards[pname].puncher + + if leave then + potential_cowards[pname].toolcaps.damage_groups.combat_log = 1 + else + potential_cowards[pname].toolcaps.damage_groups.suicide = 1 + end + + for i = 1, #ctf.registered_on_killedplayer do + ctf.registered_on_killedplayer[i]( + pname, + hname, + potential_cowards[pname].wielded_item, + potential_cowards[pname].toolcaps + ) + end + end + + for victim in pairs(potential_cowards) do + if potential_cowards[victim].puncher == pname then + local victimobj = minetest.get_player_by_name(victim) + + if victimobj then + victimobj:hud_remove(potential_cowards[victim].hud or 0) + end + + potential_cowards[victim] = nil + end + end +end + minetest.register_on_dieplayer(function(player, reason) local pname = player:get_player_name() - if reason.type == "node_damage" or reason.type == "drown" or reason.type == "fall" then - if potential_cowards[pname] then - local hname = potential_cowards[pname].puncher - local last_attacker = minetest.get_player_by_name(hname) - - if not last_attacker then - player:hud_remove(potential_cowards[pname].hud or 0) - potential_cowards[pname] = nil - - return - end - - potential_cowards[pname].toolcaps.damage_groups.suicide = 1 - - for i = 1, #ctf.registered_on_killedplayer do - ctf.registered_on_killedplayer[i]( - pname, - hname, - last_attacker:get_wielded_item(), - potential_cowards[pname].toolcaps - ) - end - - if potential_cowards[hname] and potential_cowards[hname].puncher == pname then - last_attacker:hud_remove(potential_cowards[hname].hud or 0) - potential_cowards[hname] = nil - end - else - for victim in pairs(potential_cowards) do - if potential_cowards[victim].puncher == pname then - local victimobj = minetest.get_player_by_name(victim) - - if victimobj then - victimobj:hud_remove(potential_cowards[victim].hud or 0) - end - - potential_cowards[victim] = nil - break - end - end - end - end + handle_leave_or_die(pname, false) if potential_cowards[pname] then player:hud_remove(potential_cowards[pname].hud or 0) @@ -109,22 +106,9 @@ minetest.register_on_leaveplayer(function(player, timeout) if timeout == true then return end local pname = player:get_player_name() + handle_leave_or_die(pname, true) + if potential_cowards[pname] then - local last_attacker = minetest.get_player_by_name(potential_cowards[pname].puncher) - - if not last_attacker then return end - - potential_cowards[pname].toolcaps.damage_groups.combat_log = 1 - - for i = 1, #ctf.registered_on_killedplayer do - ctf.registered_on_killedplayer[i]( - pname, - potential_cowards[pname].puncher, - last_attacker:get_wielded_item(), - potential_cowards[pname].toolcaps - ) - end - local main, match = ctf_stats.player(pname) if main and match then From bc519e605a60d50f8b38cd98c4d2d14639f53294 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Thu, 1 Apr 2021 09:52:13 -0700 Subject: [PATCH 02/13] Fix crash when no paxel stop reason is given --- mods/ctf/ctf_classes/medic.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_classes/medic.lua b/mods/ctf/ctf_classes/medic.lua index fae1b36..985b7f6 100644 --- a/mods/ctf/ctf_classes/medic.lua +++ b/mods/ctf/ctf_classes/medic.lua @@ -152,7 +152,7 @@ local function paxel_stop(pname, reason) hud_event.new(pname, { name = "ctf_classes:paxel_stop", color = "success", - value = table.concat({"Pillar digging stopped", reason, "- wait " .. DIG_COOLDOWN .. "s"}, " "), + value = table.concat({"Pillar digging stopped", reason or "unknown", "- wait " .. DIG_COOLDOWN .. "s"}, " "), }) diggers[pname] = minetest.after(DIG_COOLDOWN, function() diggers[pname] = nil end) end From c5560f7a2dc33e876f5fdbdb4edeb2b286bc3d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Thu, 1 Apr 2021 19:17:17 +0200 Subject: [PATCH 03/13] Use huds with more player notifications (#853) --- mods/ctf/ctf/teams.lua | 6 +++++- mods/ctf/ctf_classes/medic.lua | 13 +++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mods/ctf/ctf/teams.lua b/mods/ctf/ctf/teams.lua index 115020a..b62469e 100644 --- a/mods/ctf/ctf/teams.lua +++ b/mods/ctf/ctf/teams.lua @@ -480,7 +480,11 @@ minetest.register_on_punchplayer(function(player, hitter, if to.team == from.team and to.team ~= "" and to.team ~= nil and to.name ~= from.name then - minetest.chat_send_player(hname, pname .. " is on your team!") + hud_event.new(hname, { + name = "ctf:friendly_fire", + color = "warning", + value = pname .. " is on your team!", + }) if not ctf.setting("friendly_fire") then return true end diff --git a/mods/ctf/ctf_classes/medic.lua b/mods/ctf/ctf_classes/medic.lua index 985b7f6..d67fab1 100644 --- a/mods/ctf/ctf_classes/medic.lua +++ b/mods/ctf/ctf_classes/medic.lua @@ -99,7 +99,11 @@ minetest.override_item("ctf_bandages:bandage", { if ctf.player(pname).team == ctf.player(name).team then local nodename = minetest.get_node(object:get_pos()).name if ctf_classes.dont_heal[pname] or nodename:find("lava") or nodename:find("water") or nodename:find("trap") then - minetest.chat_send_player(name, "You can't heal player in lava, water or spikes!") + hud_event.new(name, { + name = "ctf_classes:environment", + color = "warning", + value = "Can't heal " .. pname .. " in lava, water or spikes!", + }) return -- Can't heal players in lava/water/spikes end @@ -149,10 +153,15 @@ local function isdiggable(name) end local function paxel_stop(pname, reason) + local message = "Pillar digging stopped " + if reason then + message = message .. reason .. " " + end + message = message .. "- wait " .. DIG_COOLDOWN .. "s" hud_event.new(pname, { name = "ctf_classes:paxel_stop", color = "success", - value = table.concat({"Pillar digging stopped", reason or "unknown", "- wait " .. DIG_COOLDOWN .. "s"}, " "), + value = message, }) diggers[pname] = minetest.after(DIG_COOLDOWN, function() diggers[pname] = nil end) end From c0f224a5bc71066f67a313bd183738b3b6a62a50 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Sun, 4 Apr 2021 09:06:40 -0700 Subject: [PATCH 04/13] Medic paxel improvements --- mods/ctf/ctf_classes/medic.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mods/ctf/ctf_classes/medic.lua b/mods/ctf/ctf_classes/medic.lua index d67fab1..5199612 100644 --- a/mods/ctf/ctf_classes/medic.lua +++ b/mods/ctf/ctf_classes/medic.lua @@ -153,16 +153,12 @@ local function isdiggable(name) end local function paxel_stop(pname, reason) - local message = "Pillar digging stopped " - if reason then - message = message .. reason .. " " - end - message = message .. "- wait " .. DIG_COOLDOWN .. "s" hud_event.new(pname, { name = "ctf_classes:paxel_stop", color = "success", - value = message, + value = string.format("Pillar digging stopped. Reason: %s. You can use again in %ds", reason or "unknown", DIG_COOLDOWN), }) + diggers[pname] = minetest.after(DIG_COOLDOWN, function() diggers[pname] = nil end) end @@ -248,10 +244,10 @@ minetest.register_tool("ctf_classes:paxel_bronze", { if diggers[pname] and diggers[pname] == true and type(diggers[pname]) ~= "table" then diggers[pname] = 1 - minetest.after(2, function() + minetest.after(1, function() if user and user:get_player_control().RMB then if diggers[pname] and type(diggers[pname]) ~= "table" then - paxel_stop(pname) + paxel_stop(pname, "Stop requested") end end end) From 433509bcdd959736d29c9fb3def269fd04c8aa6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Mon, 5 Apr 2021 16:41:51 +0200 Subject: [PATCH 05/13] Announce bounties only to the enemy team (#849) --- mods/ctf/ctf_bounties/init.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mods/ctf/ctf_bounties/init.lua b/mods/ctf/ctf_bounties/init.lua index f978c1f..8da0251 100644 --- a/mods/ctf/ctf_bounties/init.lua +++ b/mods/ctf/ctf_bounties/init.lua @@ -14,8 +14,9 @@ end local function announce_all() if bountied_player then for _, player in pairs(minetest.get_connected_players()) do - if bountied_player ~= player:get_player_name() then - announce(player:get_player_name()) + local pname = player:get_player_name() + if ctf.player(pname).team ~= ctf.player(bountied_player).team then + announce(pname) end end end From 4d680e6b6c9c651614bad6d82f7501b130c69764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Mon, 5 Apr 2021 17:22:24 +0200 Subject: [PATCH 06/13] Code duplication cleanup (#827) * Code duplication cleanup * Fix torches, no immortal variants for some nodes --- mods/ctf/ctf_map/ctf_map_core/nodes.lua | 840 +----------------------- mods/mtg/default/torch.lua | 175 +++-- 2 files changed, 113 insertions(+), 902 deletions(-) diff --git a/mods/ctf/ctf_map/ctf_map_core/nodes.lua b/mods/ctf/ctf_map/ctf_map_core/nodes.lua index c446752..472b71b 100644 --- a/mods/ctf/ctf_map/ctf_map_core/nodes.lua +++ b/mods/ctf/ctf_map/ctf_map_core/nodes.lua @@ -76,814 +76,42 @@ do }) end --- Indestructible nodes from MTG's default mod -do - -- Stone - - minetest.register_node(":ctf_map:stone", { - description = "Indestructible Stone", - tiles = {"default_stone.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:cobble", { - description = "Indestructible Cobblestone", - tiles = {"default_cobble.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:stonebrick", { - description = "Indestructible Stone Brick", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_stone_brick.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:stone_block", { - description = "Indestructible Stone Block", - tiles = {"default_stone_block.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:mossycobble", { - description = "Indestructible Mossy Cobblestone", - tiles = {"default_mossycobble.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - - minetest.register_node(":ctf_map:desert_stone", { - description = "Indestructible Desert Stone", - tiles = {"default_desert_stone.png"}, - groups = {immortal = 1}, - - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:desert_cobble", { - description = "Indestructible Desert Cobblestone", - tiles = {"default_desert_cobble.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:desert_stonebrick", { - description = "Indestructible Desert Stone Brick", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_desert_stone_brick.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:desert_stone_block", { - description = "Indestructible Desert Stone Block", - tiles = {"default_desert_stone_block.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:sandstone", { - description = "Indestructible Sandstone", - tiles = {"default_sandstone.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:sandstonebrick", { - description = "Indestructible Sandstone Brick", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_sandstone_brick.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:sandstone_block", { - description = "Indestructible Sandstone Block", - tiles = {"default_sandstone_block.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:desert_sandstone", { - description = "Indestructible Desert Sandstone", - tiles = {"default_desert_sandstone.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:desert_sandstone_brick", { - description = "Indestructible Desert Sandstone Brick", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_desert_sandstone_brick.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:desert_sandstone_block", { - description = "Indestructible Desert Sandstone Block", - tiles = {"default_desert_sandstone_block.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:silver_sandstone", { - description = "Indestructible Silver Sandstone", - tiles = {"default_silver_sandstone.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:silver_sandstone_brick", { - description = "Indestructible Silver Sandstone Brick", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_silver_sandstone_brick.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:silver_sandstone_block", { - description = "Indestructible Silver Sandstone Block", - tiles = {"default_silver_sandstone_block.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - -- Soft / Non-Stone - - minetest.register_node(":ctf_map:dirt", { - description = "Indestructible Dirt", - tiles = {"default_dirt.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_dirt_defaults(), - }) - - minetest.register_node(":ctf_map:dirt_with_grass", { - description = "Indestructible Dirt with Grass", - tiles = {"default_grass.png", "default_dirt.png", - {name = "default_dirt.png^default_grass_side.png", - tileable_vertical = false}}, - groups = {immortal = 1}, - - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_grass_footstep", gain = 0.25}, - }), - }) - - minetest.register_node(":ctf_map:dirt_with_dry_grass", { - description = "Indestructible Dirt with Dry Grass", - tiles = {"default_dry_grass.png", - "default_dirt.png", - {name = "default_dirt.png^default_dry_grass_side.png", - tileable_vertical = false}}, - groups = {immortal = 1}, - - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_grass_footstep", gain = 0.4}, - }), - }) - - minetest.register_node(":ctf_map:dirt_with_snow", { - description = "Indestructible Dirt with Snow", - tiles = {"default_snow.png", "default_dirt.png", - {name = "default_dirt.png^default_snow_side.png", - tileable_vertical = false}}, - groups = {immortal = 1}, - - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - }), - }) - - minetest.register_node(":ctf_map:dirt_with_rainforest_litter", { - description = "Indestructible Dirt with Rainforest Litter", - tiles = { - "default_rainforest_litter.png", - "default_dirt.png", - {name = "default_dirt.png^default_rainforest_litter_side.png", - tileable_vertical = false} - }, - groups = {immortal = 1}, - - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_grass_footstep", gain = 0.4}, - }), - }) - - minetest.register_node(":ctf_map:sand", { - description = "Indestructible Sand", - tiles = {"default_sand.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_sand_defaults(), - }) - - minetest.register_node(":ctf_map:desert_sand", { - description = "Indestructible Desert Sand", - tiles = {"default_desert_sand.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_sand_defaults(), - }) - - minetest.register_node(":ctf_map:silver_sand", { - description = "Indestructible Silver Sand", - tiles = {"default_silver_sand.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_sand_defaults(), - }) - - - minetest.register_node(":ctf_map:gravel", { - description = "Indestructible Gravel", - tiles = {"default_gravel.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_gravel_defaults(), - }) - - minetest.register_node(":ctf_map:clay", { - description = "Indestructible Clay", - tiles = {"default_clay.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_dirt_defaults(), - }) - - - minetest.register_node(":ctf_map:snow", { - description = "Indestructible Snow", - tiles = {"default_snow.png"}, - inventory_image = "default_snowball.png", - wield_image = "default_snowball.png", - paramtype = "light", - buildable_to = true, - floodable = true, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, -0.25, 0.5}, - }, - }, - groups = {immortal = 1}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - dug = {name = "default_snow_footstep", gain = 0.2}, - dig = {name = "default_snow_footstep", gain = 0.2} - }) - }) - - minetest.register_node(":ctf_map:snowblock", { - description = "Indestructible Snow Block", - tiles = {"default_snow.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - dug = {name = "default_snow_footstep", gain = 0.2}, - dig = {name = "default_snow_footstep", gain = 0.2} - }) - }) - - minetest.register_node(":ctf_map:ice", { - description = "Indestructible Ice", - tiles = {"default_ice.png"}, - is_ground_content = false, - paramtype = "light", - groups = {immortal = 1, slippery = 4}, - sounds = default.node_sound_glass_defaults(), - }) - - -- Trees - - minetest.register_node(":ctf_map:tree", { - description = "Indestructible Tree", - tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"}, - paramtype2 = "facedir", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - on_place = minetest.rotate_node - }) - - minetest.register_node(":ctf_map:wood", { - description = "Indestructible Wooden Planks", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_wood.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - }) - - minetest.register_node(":ctf_map:leaves", { - description = "Indestructible Leaves", - drawtype = "allfaces_optional", - waving = 1, - tiles = {"default_leaves.png"}, - special_tiles = {"default_leaves_simple.png"}, - paramtype = "light", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_leaves_defaults(), - }) - - minetest.register_node(":ctf_map:apple", { - description = "Indestructible Apple", - drawtype = "plantlike", - tiles = {"default_apple.png"}, - inventory_image = "default_apple.png", - stack_max = 99, - paramtype = "light", - sunlight_propagates = true, - walkable = false, - is_ground_content = false, - selection_box = { - type = "fixed", - fixed = {-3 / 16, -7 / 16, -3 / 16, 3 / 16, 4 / 16, 3 / 16} - }, - groups = {immortal = 1}, - sounds = default.node_sound_leaves_defaults() - }) - - minetest.register_node(":ctf_map:papyrus", { - description = "Indestructible Papyrus", - drawtype = "plantlike", - tiles = {"default_papyrus.png"}, - inventory_image = "default_papyrus.png", - wield_image = "default_papyrus.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = { - type = "fixed", - fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16}, - }, - groups = {immortal = 1}, - sounds = default.node_sound_leaves_defaults(), - after_dig_node = function(pos, node, metadata, digger) - default.dig_up(pos, node, digger) - end, - }) - - minetest.register_node(":ctf_map:jungletree", { - description = "Indestructible Jungle Tree", - tiles = {"default_jungletree_top.png", "default_jungletree_top.png", - "default_jungletree.png"}, - paramtype2 = "facedir", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - on_place = minetest.rotate_node - }) - - minetest.register_node(":ctf_map:junglewood", { - description = "Indestructible Jungle Wood Planks", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_junglewood.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - }) - - minetest.register_node(":ctf_map:jungleleaves", { - description = "Indestructible Jungle Leaves", - drawtype = "allfaces_optional", - waving = 1, - tiles = {"default_jungleleaves.png"}, - special_tiles = {"default_jungleleaves_simple.png"}, - paramtype = "light", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_leaves_defaults(), - }) - - - minetest.register_node(":ctf_map:pine_tree", { - description = "Indestructible Pine Tree", - tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png", - "default_pine_tree.png"}, - paramtype2 = "facedir", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - on_place = minetest.rotate_node - }) - - minetest.register_node(":ctf_map:pine_wood", { - description = "Indestructible Pine Wood Planks", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_pine_wood.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - }) - - minetest.register_node(":ctf_map:pine_needles",{ - description = "Indestructible Pine Needles", - drawtype = "allfaces_optional", - tiles = {"default_pine_needles.png"}, - waving = 1, - paramtype = "light", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_leaves_defaults(), - }) - - minetest.register_node(":ctf_map:acacia_tree", { - description = "Indestructible Acacia Tree", - tiles = {"default_acacia_tree_top.png", "default_acacia_tree_top.png", - "default_acacia_tree.png"}, - paramtype2 = "facedir", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - on_place = minetest.rotate_node - }) - - minetest.register_node(":ctf_map:acacia_wood", { - description = "Indestructible Acacia Wood Planks", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_acacia_wood.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - }) - - minetest.register_node(":ctf_map:acacia_leaves", { - description = "Indestructible Acacia Leaves", - drawtype = "allfaces_optional", - tiles = {"default_acacia_leaves.png"}, - special_tiles = {"default_acacia_leaves_simple.png"}, - waving = 1, - paramtype = "light", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_leaves_defaults(), - }) - - minetest.register_node(":ctf_map:aspen_tree", { - description = "Indestructible Aspen Tree", - tiles = {"default_aspen_tree_top.png", "default_aspen_tree_top.png", - "default_aspen_tree.png"}, - paramtype2 = "facedir", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - on_place = minetest.rotate_node - }) - - minetest.register_node(":ctf_map:aspen_wood", { - description = "Indestructible Aspen Wood Planks", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_aspen_wood.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - }) - - minetest.register_node(":ctf_map:aspen_leaves", { - description = "Indestructible Aspen Leaves", - drawtype = "allfaces_optional", - tiles = {"default_aspen_leaves.png"}, - waving = 1, - paramtype = "light", - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_leaves_defaults(), - }) - - -- - -- Ores - -- - - minetest.register_node(":ctf_map:stone_with_coal", { - description = "Indestructible Coal Ore", - tiles = {"default_stone.png^default_mineral_coal.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:coalblock", { - description = "Indestructible Coal Block", - tiles = {"default_coal_block.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - - minetest.register_node(":ctf_map:stone_with_iron", { - description = "Indestructible Iron Ore", - tiles = {"default_stone.png^default_mineral_iron.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:stone_with_copper", { - description = "Indestructible Copper Ore", - tiles = {"default_stone.png^default_mineral_copper.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:stone_with_tin", { - description = "Indestructible Tin Ore", - tiles = {"default_stone.png^default_mineral_tin.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:bronzeblock", { - description = "Indestructible Bronze Block", - tiles = {"default_bronze_block.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_metal_defaults(), - }) - - minetest.register_node(":ctf_map:stone_with_mese", { - description = "Indestructible Mese Ore", - tiles = {"default_stone.png^default_mineral_mese.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:mese", { - description = "Indestructible Mese Block", - tiles = {"default_mese_block.png"}, - paramtype = "light", - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - light_source = 3, - }) - - minetest.register_node(":ctf_map:stone_with_diamond", { - description = "Indestructible Diamond Ore", - tiles = {"default_stone.png^default_mineral_diamond.png"}, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - -- Plantlife (non-cubic) - - minetest.register_node(":ctf_map:cactus", { - description = "Indestructible Cactus", - tiles = {"default_cactus_top.png", "default_cactus_top.png", - "default_cactus_side.png"}, - paramtype2 = "facedir", - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults(), - on_place = minetest.rotate_node, - }) - - minetest.register_node(":ctf_map:ladder_wood", { - description = "Indestructible Wooden Ladder", - drawtype = "signlike", - tiles = {"default_ladder_wood.png"}, - inventory_image = "default_ladder_wood.png", - wield_image = "default_ladder_wood.png", - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - walkable = false, - climbable = true, - is_ground_content = false, - selection_box = { - type = "wallmounted", - --wall_top = = - --wall_bottom = = - --wall_side = = - }, - groups = {immortal = 1}, - legacy_wallmounted = true, - sounds = default.node_sound_wood_defaults(), - }) - - default.register_fence(":ctf_map:fence_wood", { - description = "Indestructible Wooden Fence", - texture = "default_fence_wood.png", - inventory_image = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126", - wield_image = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126", - material = "ctf_map:wood", - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults() - }) - - default.register_fence(":ctf_map:fence_acacia_wood", { - description = "Indestructible Acacia Fence", - texture = "default_fence_acacia_wood.png", - inventory_image = "default_fence_overlay.png^default_acacia_wood.png^default_fence_overlay.png^[makealpha:255,126,126", - wield_image = "default_fence_overlay.png^default_acacia_wood.png^default_fence_overlay.png^[makealpha:255,126,126", - material = "ctf_map:acacia_wood", - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults() - }) - - default.register_fence(":ctf_map:fence_junglewood", { - description = "Indestructible Jungle Wood Fence", - texture = "default_fence_junglewood.png", - inventory_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126", - wield_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126", - material = "ctf_map:junglewood", - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults() - }) - - default.register_fence(":ctf_map:fence_pine_wood", { - description = "Indestructible Pine Fence", - texture = "default_fence_pine_wood.png", - inventory_image = "default_fence_overlay.png^default_pine_wood.png^default_fence_overlay.png^[makealpha:255,126,126", - wield_image = "default_fence_overlay.png^default_pine_wood.png^default_fence_overlay.png^[makealpha:255,126,126", - material = "ctf_map:pine_wood", - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults() - }) - - default.register_fence(":ctf_map:fence_aspen_wood", { - description = "Indestructible Aspen Fence", - texture = "default_fence_aspen_wood.png", - inventory_image = "default_fence_overlay.png^default_aspen_wood.png^default_fence_overlay.png^[makealpha:255,126,126", - wield_image = "default_fence_overlay.png^default_aspen_wood.png^default_fence_overlay.png^[makealpha:255,126,126", - material = "ctf_map:aspen_wood", - groups = {immortal = 1}, - sounds = default.node_sound_wood_defaults() - }) - - minetest.register_node(":ctf_map:glass", { - description = "Indestructible Glass", - drawtype = "glasslike_framed_optional", - tiles = {"default_glass.png", "default_glass_detail.png"}, - paramtype = "light", - paramtype2 = "glasslikeliquidlevel", - sunlight_propagates = true, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_glass_defaults(), - }) - - minetest.register_node(":ctf_map:brick", { - description = "Indestructible Brick Block", - paramtype2 = "facedir", - place_param2 = 0, - tiles = {"default_brick.png"}, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_node(":ctf_map:meselamp", { - description = "Indestructible Mese Lamp", - drawtype = "glasslike", - tiles = {"default_meselamp.png"}, - paramtype = "light", - sunlight_propagates = true, - is_ground_content = false, - groups = {immortal = 1}, - sounds = default.node_sound_glass_defaults(), - light_source = default.LIGHT_MAX, - }) +local mod_prefixes = { + default = ""; + stairs = ""; + wool = "wool_"; +} + +-- See Lua API, section "Node-only groups" +local preserved_groups = { + bouncy = true; + connect_to_raillike = true; + disable_jump = true; + fall_damage_add_percent = true; + slippery = true; +} + +local function make_immortal(def) + local groups = {immortal = 1} + for group in pairs(preserved_groups) do + groups[group] = def.groups[group] + end + def.groups = groups + def.floodable = false + def.description = def.description and ("Indestructible " .. def.description) end --- Indestructible torches from MTG's default mod -do - minetest.register_node(":ctf_map:torch", { - description = "Torch", - drawtype = "mesh", - mesh = "torch_floor.obj", - inventory_image = "default_torch_on_floor.png", - wield_image = "default_torch_on_floor.png", - tiles = {{ - name = "default_torch_on_floor_animated.png", - animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} - }}, - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - walkable = false, - liquids_pointable = false, - light_source = 12, - groups = {attached_node = 1, torch = 1}, - drop = "ctf_map:torch", - selection_box = { - type = "wallmounted", - wall_bottom = {-1/8, -1/2, -1/8, 1/8, 2/16, 1/8}, - }, - sounds = default.node_sound_wood_defaults(), - on_place = function(itemstack, placer, pointed_thing) - local under = pointed_thing.under - local node = minetest.get_node(under) - local def = minetest.registered_nodes[node.name] - if def and def.on_rightclick and - not (placer and placer:is_player() and - placer:get_player_control().sneak) then - return def.on_rightclick(under, node, placer, itemstack, - pointed_thing) or itemstack - end - - local above = pointed_thing.above - local wdir = minetest.dir_to_wallmounted(vector.subtract(under, above)) - local fakestack = itemstack - if wdir == 0 then - fakestack:set_name(":ctf_map:torch_ceiling") - elseif wdir == 1 then - fakestack:set_name(":ctf_map:torch") - else - fakestack:set_name(":ctf_map:torch_wall") - end - - itemstack = minetest.item_place(fakestack, placer, pointed_thing, wdir) - itemstack:set_name(":ctf_map:torch") - - return itemstack - end, - }) - - minetest.register_node(":ctf_map:torch_wall", { - drawtype = "mesh", - mesh = "torch_wall.obj", - tiles = {{ - name = "default_torch_on_floor_animated.png", - animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} - }}, - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - walkable = false, - light_source = 12, - groups = {not_in_creative_inventory = 1, attached_node = 1, torch = 1}, - drop = "ctf_map:torch", - selection_box = { - type = "wallmounted", - wall_side = {-1/2, -1/2, -1/8, -1/8, 1/8, 1/8}, - }, - sounds = default.node_sound_wood_defaults(), - }) - - minetest.register_node(":ctf_map:torch_ceiling", { - drawtype = "mesh", - mesh = "torch_ceiling.obj", - tiles = {{ - name = "default_torch_on_floor_animated.png", - animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} - }}, - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - walkable = false, - light_source = 12, - groups = {immortal = 1, not_in_creative_inventory = 1, attached_node = 1, torch = 1}, - drop = "ctf_map:torch", - selection_box = { - type = "wallmounted", - wall_top = {-1/8, -1/16, -5/16, 1/8, 1/2, 1/8}, - }, - sounds = default.node_sound_wood_defaults(), - }) -end - --- Register indestructible variants of nodes from MTGs' stairs and wool mods -do - local nodes = table.copy(minetest.registered_nodes) - for name, nodedef in pairs(nodes) do - if name:find("stairs") then - nodedef = table.copy(nodedef) - if nodedef.description then - nodedef.description = "Indestructible " .. nodedef.description - end - nodedef.groups = {immortal = 1} - minetest.register_node(":ctf_map:" .. name:split(":")[2], nodedef) - elseif name:find("wool") then - local color = name:split(":")[2] - nodedef = table.copy(nodedef) - if nodedef.description then - nodedef.description = "Indestructible " .. nodedef.description - end - nodedef.groups = {immortal = 1} - minetest.register_node(":ctf_map:wool_" .. color, nodedef) - minetest.register_alias("ctf_map:" .. color, "ctf_map:wool_" .. color) +for name, def in pairs(minetest.registered_nodes) do + local mod, nodename = name:match"(..-):(.+)" + local prefix = mod_prefixes[mod] + if nodename and prefix and not (def.buildable_to or (def.groups and (def.groups.immortal or def.groups.mortal))) then + -- HACK to preserve backwards compatibility + local new_name = ":ctf_map:" .. prefix .. nodename + local new_def = table.copy(def) + if def.drop == name then + new_def.drop = new_name end + make_immortal(new_def) + minetest.register_node(new_name, new_def) end end diff --git a/mods/mtg/default/torch.lua b/mods/mtg/default/torch.lua index 5de5f89..37d393a 100644 --- a/mods/mtg/default/torch.lua +++ b/mods/mtg/default/torch.lua @@ -13,105 +13,88 @@ local function on_flood(pos, oldnode, newnode) return false end -minetest.register_node("default:torch", { - description = "Torch", - drawtype = "mesh", - mesh = "torch_floor.obj", - inventory_image = "default_torch_on_floor.png", - wield_image = "default_torch_on_floor.png", - tiles = {{ - name = "default_torch_on_floor_animated.png", - animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} - }}, - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - walkable = false, - liquids_pointable = false, - light_source = 12, - groups = {choppy=2, dig_immediate=3, flammable=1, attached_node=1, torch=1}, - drop = "default:torch", - selection_box = { - type = "wallmounted", - wall_bottom = {-1/8, -1/2, -1/8, 1/8, 2/16, 1/8}, +local torch_suffix = {[0] = "_ceiling", "", "_wall", "_wall", "_wall", "_wall"} +function default.torch_on_place(itemstack, placer, pointed_thing) + local under = pointed_thing.under + local node = minetest.get_node(under) + local nodedef = minetest.registered_nodes[node.name] + if nodedef and nodedef.on_rightclick and + not (placer and placer:is_player() and + placer:get_player_control().sneak) then + return nodedef.on_rightclick(under, node, placer, itemstack, + pointed_thing) or itemstack + end + + local above = pointed_thing.above + local wdir = minetest.dir_to_wallmounted(vector.subtract(under, above)) + local name = itemstack:get_name() + itemstack:set_name(name .. torch_suffix[wdir]) + itemstack = minetest.item_place(itemstack, placer, pointed_thing, wdir) + itemstack:set_name(name) + return itemstack +end + +function default.register_torch(name, defs) + local def = defs.floor + def.drop = def.drop or name + def.on_place = def.on_place or default.torch_on_place + minetest.register_node(":" .. name, def) + local def_ceiling = table.copy(def) + for key, value in pairs(defs.ceiling) do + def_ceiling[key] = value + end + def_ceiling.groups.not_in_creative_inventory = 1 + minetest.register_node(":" .. name .. "_ceiling", def_ceiling) + local def_wall = table.copy(def) + for key, value in pairs(defs.wall) do + def_wall[key] = value + end + def_wall.groups.not_in_creative_inventory = 1 + minetest.register_node(":" .. name .. "_wall", def_wall) +end + +default.torch = { + floor = { + description = "Torch", + drawtype = "mesh", + mesh = "torch_floor.obj", + inventory_image = "default_torch_on_floor.png", + wield_image = "default_torch_on_floor.png", + tiles = {{ + name = "default_torch_on_floor_animated.png", + animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} + }}, + paramtype = "light", + paramtype2 = "wallmounted", + sunlight_propagates = true, + walkable = false, + liquids_pointable = false, + light_source = 12, + groups = {choppy=2, dig_immediate=3, flammable=1, attached_node=1, torch=1}, + selection_box = { + type = "wallmounted", + wall_bottom = {-1/8, -1/2, -1/8, 1/8, 2/16, 1/8}, + }, + sounds = default.node_sound_wood_defaults(), + floodable = true, + on_flood = on_flood, }, - sounds = default.node_sound_wood_defaults(), - on_place = function(itemstack, placer, pointed_thing) - local under = pointed_thing.under - local node = minetest.get_node(under) - local def = minetest.registered_nodes[node.name] - if def and def.on_rightclick and - not (placer and placer:is_player() and - placer:get_player_control().sneak) then - return def.on_rightclick(under, node, placer, itemstack, - pointed_thing) or itemstack - end - - local above = pointed_thing.above - local wdir = minetest.dir_to_wallmounted(vector.subtract(under, above)) - local fakestack = itemstack - if wdir == 0 then - fakestack:set_name("default:torch_ceiling") - elseif wdir == 1 then - fakestack:set_name("default:torch") - else - fakestack:set_name("default:torch_wall") - end - - itemstack = minetest.item_place(fakestack, placer, pointed_thing, wdir) - itemstack:set_name("default:torch") - - return itemstack - end, - floodable = true, - on_flood = on_flood, -}) - -minetest.register_node("default:torch_wall", { - drawtype = "mesh", - mesh = "torch_wall.obj", - tiles = {{ - name = "default_torch_on_floor_animated.png", - animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} - }}, - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - walkable = false, - light_source = 12, - groups = {choppy=2, dig_immediate=3, flammable=1, not_in_creative_inventory=1, attached_node=1, torch=1}, - drop = "default:torch", - selection_box = { - type = "wallmounted", - wall_side = {-1/2, -1/2, -1/8, -1/8, 1/8, 1/8}, + ceiling = { + mesh = "torch_ceiling.obj", + selection_box = { + type = "wallmounted", + wall_top = {-1/8, -1/16, -5/16, 1/8, 1/2, 1/8}, + }, }, - sounds = default.node_sound_wood_defaults(), - floodable = true, - on_flood = on_flood, -}) - -minetest.register_node("default:torch_ceiling", { - drawtype = "mesh", - mesh = "torch_ceiling.obj", - tiles = {{ - name = "default_torch_on_floor_animated.png", - animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} - }}, - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - walkable = false, - light_source = 12, - groups = {choppy=2, dig_immediate=3, flammable=1, not_in_creative_inventory=1, attached_node=1, torch=1}, - drop = "default:torch", - selection_box = { - type = "wallmounted", - wall_top = {-1/8, -1/16, -5/16, 1/8, 1/2, 1/8}, + wall = { + mesh = "torch_wall.obj", + selection_box = { + type = "wallmounted", + wall_side = {-1/2, -1/2, -1/8, -1/8, 1/8, 1/8}, + }, }, - sounds = default.node_sound_wood_defaults(), - floodable = true, - on_flood = on_flood, -}) +} +default.register_torch("default:torch", default.torch) minetest.register_lbm({ name = "default:3dtorch", From f774ecff0fa9bb5984b088428e271b70817da0f5 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Mon, 5 Apr 2021 08:24:00 -0700 Subject: [PATCH 07/13] Kill the trailing whitespace --- mods/ctf/ctf_classes/medic.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_classes/medic.lua b/mods/ctf/ctf_classes/medic.lua index 5199612..7115c39 100644 --- a/mods/ctf/ctf_classes/medic.lua +++ b/mods/ctf/ctf_classes/medic.lua @@ -156,7 +156,7 @@ local function paxel_stop(pname, reason) hud_event.new(pname, { name = "ctf_classes:paxel_stop", color = "success", - value = string.format("Pillar digging stopped. Reason: %s. You can use again in %ds", reason or "unknown", DIG_COOLDOWN), + value = string.format("Pillar digging stopped. Reason: %s. You can use again in %ds", reason or "unknown", DIG_COOLDOWN), }) diggers[pname] = minetest.after(DIG_COOLDOWN, function() diggers[pname] = nil end) From f965b310fd78d2d426c5654ca5563d0c4ac6972d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Tue, 6 Apr 2021 16:14:36 +0200 Subject: [PATCH 08/13] Map nodes: Readd wool aliases (#855) --- mods/ctf/ctf_map/ctf_map_core/nodes.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ctf/ctf_map/ctf_map_core/nodes.lua b/mods/ctf/ctf_map/ctf_map_core/nodes.lua index 472b71b..5f708fa 100644 --- a/mods/ctf/ctf_map/ctf_map_core/nodes.lua +++ b/mods/ctf/ctf_map/ctf_map_core/nodes.lua @@ -113,5 +113,8 @@ for name, def in pairs(minetest.registered_nodes) do end make_immortal(new_def) minetest.register_node(new_name, new_def) + if mod == "wool" then + minetest.register_alias("ctf_map:" .. nodename, new_name) + end end end From 2be9adb890de48566d1d37a27f215ca92f064bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Tue, 6 Apr 2021 17:07:58 +0200 Subject: [PATCH 09/13] Fix cleanup (#856) * Map nodes: Readd wool aliases * Fix undefined behavior * Merge branch 'fix-immortal-fences' into fix-cleanup * Set buildable_to to false for immortal nodes --- mods/ctf/ctf_map/ctf_map_core/nodes.lua | 52 ++++++++++++++++--------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/mods/ctf/ctf_map/ctf_map_core/nodes.lua b/mods/ctf/ctf_map/ctf_map_core/nodes.lua index 5f708fa..098ba31 100644 --- a/mods/ctf/ctf_map/ctf_map_core/nodes.lua +++ b/mods/ctf/ctf_map/ctf_map_core/nodes.lua @@ -82,37 +82,53 @@ local mod_prefixes = { wool = "wool_"; } --- See Lua API, section "Node-only groups" -local preserved_groups = { - bouncy = true; - connect_to_raillike = true; - disable_jump = true; - fall_damage_add_percent = true; - slippery = true; +local tool_groups = { + dig_immediate = true } -local function make_immortal(def) - local groups = {immortal = 1} - for group in pairs(preserved_groups) do - groups[group] = def.groups[group] +local function add_tool_groups(def) + local caps = def.tool_capabilities + if not caps then + return end - def.groups = groups + local groups = caps.groupcaps + if not groups then + return + end + for group in pairs(groups) do + tool_groups[group] = true + end +end + +for _, def in pairs(minetest.registered_tools) do + add_tool_groups(def) +end + +-- Add hand groups +add_tool_groups(minetest.registered_items[""]) + +local function make_immortal(def) + for group in pairs(tool_groups) do + def.groups[group] = nil + end + def.groups.immortal = 1 def.floodable = false + def.buildable_to = false def.description = def.description and ("Indestructible " .. def.description) end -for name, def in pairs(minetest.registered_nodes) do +local registered_nodes = table.copy(minetest.registered_nodes) +for name, def in pairs(registered_nodes) do local mod, nodename = name:match"(..-):(.+)" local prefix = mod_prefixes[mod] - if nodename and prefix and not (def.buildable_to or (def.groups and (def.groups.immortal or def.groups.mortal))) then + if nodename and prefix and not (def.groups and def.groups.mortal) then -- HACK to preserve backwards compatibility local new_name = ":ctf_map:" .. prefix .. nodename - local new_def = table.copy(def) if def.drop == name then - new_def.drop = new_name + def.drop = new_name end - make_immortal(new_def) - minetest.register_node(new_name, new_def) + make_immortal(def) + minetest.register_node(new_name, def) if mod == "wool" then minetest.register_alias("ctf_map:" .. nodename, new_name) end From 665ec17c6911d5ffe4acd6caa2d3bdf855d49d5a Mon Sep 17 00:00:00 2001 From: savilli <78875209+savilli@users.noreply.github.com> Date: Tue, 6 Apr 2021 17:48:48 +0200 Subject: [PATCH 10/13] Fix suicider color in kill event on the hud (#857) --- mods/ctf/ctf_events/init.lua | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mods/ctf/ctf_events/init.lua b/mods/ctf/ctf_events/init.lua index 762dd28..f321831 100644 --- a/mods/ctf/ctf_events/init.lua +++ b/mods/ctf/ctf_events/init.lua @@ -10,11 +10,13 @@ ctf_events = { events = {} } -function ctf_events.post(action, one, two) +function ctf_events.post(action, one, one_color, two, two_color) table.insert(ctf_events.events, 1, { action = action, one = one, - two = two + one_color = one_color, + two = two, + two_color = two_color }) while #ctf_events.events > NUM_EVT do @@ -38,17 +40,16 @@ function ctf_events.update_row(i, player, name, tplayer, evt) -- One if evt.one then - local tcolor = ctf_colors.get_color(ctf.player(evt.one)) if hud:exists(player, idx) then hud:change(player, idx, "text", evt.one) - hud:change(player, idx, "number", tcolor.hex) + hud:change(player, idx, "number", evt.one_color.hex) else local tmp = { hud_elem_type = "text", position = {x = 0, y = 0.8}, scale = {x = 200, y = 100}, text = evt.one, - number = tcolor.hex, + number = evt.one_color.hex, offset = {x = 145, y = -y_pos}, alignment = {x = -1, y = 0} } @@ -60,17 +61,16 @@ function ctf_events.update_row(i, player, name, tplayer, evt) -- Two if evt.two then - local tcolor = ctf_colors.get_color(ctf.player(evt.two)) if hud:exists(player, idx2) then hud:change(player, idx2, "text", evt.two) - hud:change(player, idx2, "number", tcolor.hex) + hud:change(player, idx2, "number", evt.two_color.hex) else local tmp = { hud_elem_type = "text", position = {x = 0, y = 0.8}, scale = {x = 200, y = 100}, text = evt.two, - number = tcolor.hex, + number = evt.two_color.hex, offset = {x = 175, y = -y_pos}, alignment = {x = 1, y = 0} } @@ -121,6 +121,9 @@ function ctf_events.update_all() end ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps) + local victim_color = ctf_colors.get_color(ctf.player(victim)) + local killer_color = ctf_colors.get_color(ctf.player(killer)) + local type = "sword" if tool_caps.damage_groups.grenade then @@ -139,7 +142,7 @@ ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps) victim = victim .. " (Suicide?)" end - ctf_events.post("kill_" .. type, killer, victim) + ctf_events.post("kill_" .. type, killer, killer_color, victim, victim_color) ctf_events.update_all() end) From 8b1de228541efdc05624d082790efcccd7b7e0fd Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Tue, 6 Apr 2021 21:21:42 -0700 Subject: [PATCH 11/13] Create indestructible nodes after all mods load --- mods/ctf/ctf_map/ctf_map_core/nodes.lua | 32 +++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/mods/ctf/ctf_map/ctf_map_core/nodes.lua b/mods/ctf/ctf_map/ctf_map_core/nodes.lua index 098ba31..de9cc7c 100644 --- a/mods/ctf/ctf_map/ctf_map_core/nodes.lua +++ b/mods/ctf/ctf_map/ctf_map_core/nodes.lua @@ -117,20 +117,22 @@ local function make_immortal(def) def.description = def.description and ("Indestructible " .. def.description) end -local registered_nodes = table.copy(minetest.registered_nodes) -for name, def in pairs(registered_nodes) do - local mod, nodename = name:match"(..-):(.+)" - local prefix = mod_prefixes[mod] - if nodename and prefix and not (def.groups and def.groups.mortal) then - -- HACK to preserve backwards compatibility - local new_name = ":ctf_map:" .. prefix .. nodename - if def.drop == name then - def.drop = new_name - end - make_immortal(def) - minetest.register_node(new_name, def) - if mod == "wool" then - minetest.register_alias("ctf_map:" .. nodename, new_name) +minetest.register_on_mods_loaded(function() + local registered_nodes = table.copy(minetest.registered_nodes) + for name, def in pairs(registered_nodes) do + local mod, nodename = name:match"(..-):(.+)" + local prefix = mod_prefixes[mod] + if nodename and prefix and not (def.groups and def.groups.mortal) then + -- HACK to preserve backwards compatibility + local new_name = ":ctf_map:" .. prefix .. nodename + if def.drop == name then + def.drop = new_name + end + make_immortal(def) + minetest.register_node(new_name, def) + if mod == "wool" then + minetest.register_alias("ctf_map:" .. nodename, new_name) + end end end -end +end) From 6cf958800b22cfb92fc2e109eb996b767765fbd5 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Tue, 6 Apr 2021 21:35:44 -0700 Subject: [PATCH 12/13] Update maps submodule --- mods/ctf/ctf_map/ctf_map_core/maps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/ctf_map_core/maps b/mods/ctf/ctf_map/ctf_map_core/maps index bbf6007..5fe0d7b 160000 --- a/mods/ctf/ctf_map/ctf_map_core/maps +++ b/mods/ctf/ctf_map/ctf_map_core/maps @@ -1 +1 @@ -Subproject commit bbf60077855ee90b95ca68f1b9bc853f7d53ecf2 +Subproject commit 5fe0d7b1fd8aba95cfe0361a333abfa6b00f20a8 From 6be1373caeafe46dd1b24da6c8da85da3aa38447 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Tue, 6 Apr 2021 21:37:44 -0700 Subject: [PATCH 13/13] Revert "Create indestructible nodes after all mods load" This reverts commit 8b1de228541efdc05624d082790efcccd7b7e0fd. --- mods/ctf/ctf_map/ctf_map_core/nodes.lua | 32 ++++++++++++------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/mods/ctf/ctf_map/ctf_map_core/nodes.lua b/mods/ctf/ctf_map/ctf_map_core/nodes.lua index de9cc7c..098ba31 100644 --- a/mods/ctf/ctf_map/ctf_map_core/nodes.lua +++ b/mods/ctf/ctf_map/ctf_map_core/nodes.lua @@ -117,22 +117,20 @@ local function make_immortal(def) def.description = def.description and ("Indestructible " .. def.description) end -minetest.register_on_mods_loaded(function() - local registered_nodes = table.copy(minetest.registered_nodes) - for name, def in pairs(registered_nodes) do - local mod, nodename = name:match"(..-):(.+)" - local prefix = mod_prefixes[mod] - if nodename and prefix and not (def.groups and def.groups.mortal) then - -- HACK to preserve backwards compatibility - local new_name = ":ctf_map:" .. prefix .. nodename - if def.drop == name then - def.drop = new_name - end - make_immortal(def) - minetest.register_node(new_name, def) - if mod == "wool" then - minetest.register_alias("ctf_map:" .. nodename, new_name) - end +local registered_nodes = table.copy(minetest.registered_nodes) +for name, def in pairs(registered_nodes) do + local mod, nodename = name:match"(..-):(.+)" + local prefix = mod_prefixes[mod] + if nodename and prefix and not (def.groups and def.groups.mortal) then + -- HACK to preserve backwards compatibility + local new_name = ":ctf_map:" .. prefix .. nodename + if def.drop == name then + def.drop = new_name + end + make_immortal(def) + minetest.register_node(new_name, def) + if mod == "wool" then + minetest.register_alias("ctf_map:" .. nodename, new_name) end end -end) +end