Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix screen's overcovering of areas (fixes #14) #16

Closed
wants to merge 1 commit into from
Closed

Fix screen's overcovering of areas (fixes #14) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ Commands
* `/list_areas` -- Lists all of the areas that you own, or all areas if you
have the `areas` privilege.

* `/list_owners` -- Lists the owner(s) of an area where the player stands inside.

* `/find_areas <Regex>` -- Finds areas using a Lua regular expresion.
For example, to find castles:

Expand Down
65 changes: 40 additions & 25 deletions chatcommands.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ minetest.register_chatcommand("protect", {
return false, "You need to select an area first."
end

minetest.log("action", "/protect invoked, owner="..name..
" AreaName="..param..
" StartPos="..minetest.pos_to_string(pos1)..
" EndPos=" ..minetest.pos_to_string(pos2))
minetest.log("action", "/protect invoked. Owner = "..name..
" AreaName = "..param..
" StartPos = "..minetest.pos_to_string(pos1)..
" EndPos = " ..minetest.pos_to_string(pos2))

local canAdd, errMsg = areas:canPlayerAddArea(pos1, pos2, name)
if not canAdd then
Expand All @@ -32,9 +32,9 @@ minetest.register_chatcommand("protect", {

minetest.register_chatcommand("set_owner", {
params = "<PlayerName> <AreaName>",
description = "Protect an area beetween two positions and give"
.." a player access to it without setting the parent of the"
.." area to any existing area",
description = [[ Protect an area between two positions and give
a player access to it without setting the parent of the
area to any existing area. ]],
privs = areas.adminPrivs,
func = function(name, param)
local ownerName, areaName = param:match('^(%S+)%s(.+)$')
Expand All @@ -49,8 +49,7 @@ minetest.register_chatcommand("set_owner", {
end

if not areas:player_exists(ownerName) then
return false, "The player \""
..ownerName.."\" does not exist."
return false, "The player \""..ownerName.."\" does not exist."
end

minetest.log("action", name.." runs /set_owner. Owner = "..ownerName..
Expand All @@ -71,9 +70,9 @@ minetest.register_chatcommand("set_owner", {

minetest.register_chatcommand("add_owner", {
params = "<ParentID> <Player> <AreaName>",
description = "Give a player access to a sub-area beetween two"
.." positions that have already been protected,"
.." Use set_owner if you don't want the parent to be set.",
description = [[ Give a player access to a sub-area between two
positions that have already been protected.
Use set_owner if you don't want the parent to be set. ]],
func = function(name, param)
local pid, ownerName, areaName
= param:match('^(%d+) ([^ ]+) (.+)$')
Expand Down Expand Up @@ -117,7 +116,7 @@ minetest.register_chatcommand("add_owner", {

minetest.register_chatcommand("rename_area", {
params = "<ID> <newName>",
description = "Rename a area that you own",
description = "Rename an area that you own",
func = function(name, param)
local id, newName = param:match("^(%d+)%s(.+)$")
if not id then
Expand Down Expand Up @@ -191,9 +190,26 @@ minetest.register_chatcommand("list_areas", {
})


minetest.register_chatcommand("list_owners", {
description = "List owners for an area",
func = function(name, param)
local player = minetest.get_player_by_name(name)
local pos = vector.round(player:getpos())
local areaStrings = {}
for id, area in pairs(areas:getAreasAtPos(pos)) do
table.insert(areaStrings, areas:toString(id))
end
if #areaStrings == 0 then
return true, "No owner found."
end
return true, table.concat(areaStrings, "\n")
end
})


minetest.register_chatcommand("recursive_remove_areas", {
params = "<id>",
description = "Recursively remove areas using an id",
params = "<ID>",
description = "Recursively remove areas using an ID",
func = function(name, param)
local id = tonumber(param)
if not id then
Expand All @@ -208,14 +224,14 @@ minetest.register_chatcommand("recursive_remove_areas", {

areas:remove(id, true)
areas:save()
return true, "Removed area "..id.." and it's sub areas."
return true, "Removed area "..id.." and its sub-areas."
end
})


minetest.register_chatcommand("remove_area", {
params = "<id>",
description = "Remove an area using an id",
params = "<ID>",
description = "Remove an area using an ID",
func = function(name, param)
local id = tonumber(param)
if not id then
Expand All @@ -236,17 +252,15 @@ minetest.register_chatcommand("remove_area", {

minetest.register_chatcommand("change_owner", {
params = "<ID> <NewOwner>",
description = "Change the owner of an area using it's ID",
description = "Change the owner of an area using its ID",
func = function(name, param)
local id, newOwner = param:match("^(%d+)%s(%S+)$")
if not id then
return false, "Invalid usage, see"
.." /help change_owner."
return false, "Invalid usage, see /help change_owner."
end

if not areas:player_exists(newOwner) then
return false, "The player \""..newOwner
.."\" does not exist."
return false, "The player \""..newOwner.."\" does not exist."
end

id = tonumber(id)
Expand Down Expand Up @@ -313,6 +327,7 @@ minetest.register_chatcommand("move_area", {
end,
})


minetest.register_chatcommand("area_info", {
description = "Get information about area configuration and usage.",
func = function(name, param)
Expand All @@ -337,11 +352,11 @@ minetest.register_chatcommand("area_info", {
size_limit_high or size_limit

-- Privilege information
local self_prot_line = ("Self protection is %sabled"):format(
local self_prot_line = ("Self-protection is %sabled"):format(
self_prot and "en" or "dis")
if self_prot and prot_priv then
self_prot_line = self_prot_line..
(" %s have the neccessary privilege (%q).")
(" %s have the necessary privilege (%q).")
:format(
has_prot_priv and "and you" or
"but you don't",
Expand Down
8 changes: 4 additions & 4 deletions hud.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ minetest.register_globalstep(function(dtime)
:format(area.name, id, area.owner,
area.open and ":open" or ""))
end
local areaString = "Areas:"
if #areaStrings > 0 then
areaString = areaString.."\n"..
table.concat(areaStrings, "\n")
local areaString = "Areas:\n"..(areaStrings[1] or "")
if #areaStrings > 1 then
areaString = areaString.."\n\t+ "..(#areaStrings-1)..
" sub-owner(s), /list_owners to show."
end
local hud = areas.hud[name]
if not hud then
Expand Down