From e40d1e666a55834a83d017d8cf4c6f4cf2bc8c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Sun, 28 Mar 2021 21:45:49 +0200 Subject: [PATCH] place_limit: Use HUD notifications & quota instead of time between placements (#844) * place_limit: Use HUD notifications * Adjust warning color * Quota instead of time between placements * Bump maps submodule --- mods/pvp/place_limit/init.lua | 54 +++++++++++++++++------------------ mods/pvp/place_limit/mod.conf | 1 + 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/mods/pvp/place_limit/init.lua b/mods/pvp/place_limit/init.lua index 46b4683..51ebd8b 100644 --- a/mods/pvp/place_limit/init.lua +++ b/mods/pvp/place_limit/init.lua @@ -1,53 +1,51 @@ -- Licensed under the MIT license, written by appgurueu. local players = {} local blocks_per_second = 5 -local resend_chat_message_seconds = 10 +local resend_notification_seconds = 10 +-- Bootstrap 4 "warning" color +local warning_color = 0xFFC107 minetest.register_on_joinplayer(function(player) -- player has to wait after join before they can place a node players[player:get_player_name()] = { - last_placement = minetest.get_us_time(), - last_chat_message_sent = -math.huge + last_notification_sent = -math.huge } end) -local chat_send_player = minetest.chat_send_player -function minetest.chat_send_player(name, message) - if players[name] then - players[name].last_chat_message_sent = -math.huge - end - return chat_send_player(name, message) -end - -local chat_send_all = minetest.chat_send_all -function minetest.chat_send_all(message) - for _, playerdata in pairs(players) do - playerdata.last_chat_message_sent = -math.huge - end - return chat_send_all(message) -end - minetest.register_on_leaveplayer(function(player) players[player:get_player_name()] = nil end) minetest.register_on_placenode(function(pos, _newnode, placer, oldnode, _itemstack, pointed_thing) + local name = placer:get_player_name() if not ItemStack(minetest.get_node(pointed_thing.under).name):get_definition().pointable then - -- this should happen rarely - minetest.chat_send_player(placer:get_player_name(), "The block you have been building to has been dug/replaced!") + -- This should happen rarely + hud_event.new(name, { + name = "place_limit:unpointable", + color = warning_color, + value = "Block not pointable (dug/replaced)!", + }) minetest.set_node(pos, oldnode) return true end - local name = placer:get_player_name() - local playerdata = players[name] local time = minetest.get_us_time() - if (time - playerdata.last_placement) / 1e6 < 1 / blocks_per_second then - if (time - playerdata.last_chat_message_sent) / 1e6 >= resend_chat_message_seconds then - chat_send_player(placer:get_player_name(), "You are placing blocks too fast (more than " .. blocks_per_second .. " blocks per second) !") - playerdata.last_chat_message_sent = time + local placements = players[name] + for i = #placements, 1, -1 do + if time - placements[i] > 1e6 then + placements[i] = nil + end + end + if #placements >= blocks_per_second then + if (time - placements.last_notification_sent) / 1e6 >= resend_notification_seconds then + hud_event.new(name, { + name = "place_limit:speed", + color = warning_color, + value = "Placing too fast!", + }) + placements.last_notification_sent = time end minetest.set_node(pos, oldnode) return true end - playerdata.last_placement = time + table.insert(placements, 1, time) end) diff --git a/mods/pvp/place_limit/mod.conf b/mods/pvp/place_limit/mod.conf index 3c6236e..e29d69c 100644 --- a/mods/pvp/place_limit/mod.conf +++ b/mods/pvp/place_limit/mod.conf @@ -1,2 +1,3 @@ name = place_limit description = Limits block placement +depends = hud_events