diff --git a/areas.lua b/areas.lua new file mode 100644 index 0000000..7c8fcf2 --- /dev/null +++ b/areas.lua @@ -0,0 +1,620 @@ + +-- taken from mobf +local COLOR_RED = "#FF0000"; +local COLOR_GREEN = "#00FF00"; +local COLOR_WHITE = "#FFFFFF"; + + +-- we need to store which list we present to which player +markers.menu_data_by_player = {} + + +markers.get_area_by_pos = function(pos) + + local found_areas = {}; + for id, area in pairs(areas.areas) do + if( pos.x >= area.pos1.x and pos.x <= area.pos2.x and + pos.y >= area.pos1.y and pos.y <= area.pos2.y and + pos.z >= area.pos1.z and pos.z <= area.pos2.z )then + + area[ 'id' ] = id; + table.insert(found_areas, area ); + end + end + return found_areas; +end + + + +-- mode: can be pos, player, all, subarea +-- mode_data: content depends on mode +-- selected: display information about the area the player single-clicked on +markers.get_area_list_formspec = function( player, mode, pos, mode_data, selected ) + + + local id_list = {}; + local title = '???'; + local tlabel = ''; + + -- expects a position in mode_data + if( mode=='pos' ) then + -- title would be too long for a label + title = 'All areas which contain position..'; + tlabel = '<'..minetest.pos_to_string( mode_data )..'>:'; + + for id, area in pairs(areas.areas) do + + if( mode_data.x >= area.pos1.x and mode_data.x <= area.pos2.x and + mode_data.y >= area.pos1.y and mode_data.y <= area.pos2.y and + mode_data.z >= area.pos1.z and mode_data.z <= area.pos2.z )then + + table.insert( id_list, id ); + end + end + + -- expects a playername in mode_data + elseif( mode=='player' ) then + + title = 'All areas owned by player..'; + tlabel = '<'..tostring( mode_data )..'>:'; + + for id, area in pairs(areas.areas) do + + if( area.owner == mode_data ) then + table.insert( id_list, id ); + end + end + + -- expects an area_id in mode_data + elseif( mode=='subareas' ) then + + title = 'All subareas of area..'; + tlabel = '<'..tostring( areas.areas[ mode_data ].name )..'> ['..tostring( mode_data )..']:'; + + for id, area in pairs(areas.areas) do + + if( area.parent and area.parent == mode_data ) then + table.insert( id_list, id ); + end + end + + elseif( mode=='all' ) then + title = 'All areas:'; + tlabel = '*all areas*'; + + for id, area in pairs(areas.areas) do + table.insert( id_list, id ); + end + end + + + local formspec = 'size[10,9]'; + + title = minetest.formspec_escape( title ); + tlabel = minetest.formspec_escape( tlabel ); + + formspec = formspec.. + "label[0.5,0;"..title.."]".. + "label[4.7,0;"..tlabel.."]".. + "label[0.5,8.5;Doubleclick to select area.]".. + "label[4.7,8.5;Areas found: "..tostring( #id_list )..".]".. + "textlist[0.5,0.5;7,8;markers_area_list_selection;"; + + local liste = ''; + for i,v in ipairs( id_list ) do + if( liste ~= '' ) then + liste = liste..','; + end + liste = liste..minetest.formspec_escape( areas:toString( v ) ); + + end + + -- highlight selected entry + if( selected ) then + formspec = formspec..liste..';'..selected..';false]'; + else + formspec = formspec..liste..';]'; + end + + local pname = player:get_player_name(); + if( not( markers.menu_data_by_player[ pname ] )) then + markers.menu_data_by_player[ pname ] = {}; + end + + -- display information about the location of the area the player clicked on + if( selected + and id_list[ selected ] + and areas.areas[ id_list[ selected ]] ) then + + local this_area = areas.areas[ id_list[ selected ]]; + formspec = formspec.. + markers.show_compass_marker( 8.5, 3.0, false, pos, this_area.pos1, this_area.pos2 ); + + if( mode=='player' ) then + formspec = formspec.. + 'label[8.0,1.5;'.. + minetest.formspec_escape( this_area.owner..'\'s areas')..']'; + else + formspec = formspec.. + 'button[8.0,1.5;2,0.5;list_player_areas;'.. + minetest.formspec_escape( this_area.owner..'\'s areas')..']'; + end + end + + -- we need to remember especially the id_list - else it would be impossible to know what the + -- player selected + markers.menu_data_by_player[ pname ] = { + typ = 'area_list', + mode = mode, + pos = pos, + mode_data = mode_data, + list = id_list, + + selected = id_list[ selected ], + }; + + + return formspec; +end + + + + +-- shows a formspec with information about a particular area +-- pos is the position of the marker stone or place where the player clicked +-- with the land title register; it is used for relative display of coordinates +markers.get_area_desc_formspec = function( id, player, pos ) + + if( not( areas.areas ) or not( id ) or not( areas.areas[ id ] )) then + return 'field[info;Error:;Area not found.]'; + end + local this_area = areas.areas[ id ]; + + local pname = player:get_player_name(); + + -- show some buttons only if area is owned by the player + local is_owner = false; + -- TODO: offer same view/options for players with the appropriate privs? + if( this_area.owner == pname ) then + is_owner = true; + end + + local formspec = 'size[10,9]'.. + 'label[2.5,0.0;Area information and management]'.. + 'button_exit[4.7,7.0;1,0.5;abort;OK]'; + +-- TODO: BUTTON change_owner + + + -- general information about the area + formspec = formspec.. + 'label[0.5,1.0;This is area number ]'.. + 'label[4.7,1.0;'..tostring( id )..']'.. + + 'label[0.5,1.5;The area is called ]'.. + 'label[4.7,1.5;'..minetest.formspec_escape( this_area.name or '-not set-')..']'.. + + 'label[0.5,2.0;It is owned by ]'.. + 'label[4.7,2.0;'..minetest.formspec_escape( this_area.owner)..']'; + + + -- these functions are only available to the owner of the area + if( is_owner ) then + formspec = formspec.. + 'button_exit[8.0,1.0;2,0.5;delete;Delete]'.. + 'button_exit[8.0,1.5;2,0.5;rename;Rename]'.. + 'button_exit[8.0,2.0;2,0.5;list_player_areas;My areas]'; +-- 'button_exit[8.0,2.0;2,0.5;change_owner;Change owner]'; -- TODO: place that menu button somewhere + + -- subareas of own areas can be deleted (but not renamed) + elseif( not( is_owner ) + and this_area.parent + and areas.areas[ this_area.parent ] + and areas.areas[ this_area.parent ].owner == pname ) then + + formspec = formspec.. + 'button_exit[8.0,1.0;2,0.5;delete;Delete subarea]'.. + 'button_exit[8.0,2.0;2,0.5;list_player_areas;Player\'s areas]'; + + else + formspec = formspec.. + 'button_exit[8.0,2.0;2,0.5;list_player_areas;Player\'s areas]'; + end + + + -- show subowners and areas with the same coordinates + formspec = formspec.. + 'label[0.5,2.5;Further owners of the entire area:]'; + local further_owners = {}; + for i, area in pairs(areas.areas) do + if( i ~= id and + this_area.pos1.x == area.pos1.x and this_area.pos2.x == area.pos2.x and + this_area.pos1.y == area.pos1.y and this_area.pos2.y == area.pos2.y and + this_area.pos1.z == area.pos1.z and this_area.pos2.z == area.pos2.z )then + + table.insert( further_owners, area.owner ); + end + end + if( #further_owners > 0 ) then + + formspec = formspec.. + 'label[4.7,2.5;'..minetest.formspec_escape( table.concat( further_owners, ', '))..'.]'; + + -- deleting subowners is done by deleting their areas + if( is_owner ) then + formspec = formspec.. + 'button_exit[8.0,2.5;2,0.5;add_owner;Add]'; + end + else + formspec = formspec.. + 'label[4.7,2.5;-none-]'; + + if( is_owner ) then + formspec = formspec.. + 'button_exit[8.0,2.5;2,0.5;add_owner;Add]'; + end + end + + + -- is the area a subarea? + if( this_area.parent ) then + formspec = formspec.. + 'label[0.5,3.0;This area is a sub-area of area]'.. + 'label[4.7,3.0;'..minetest.formspec_escape( areas.areas[ this_area.parent ].name..' ['..this_area.parent..']' )..']'.. + 'button_exit[8.0,3.0;2,0.5;show_parent;Show main area]'; + end + + + -- does the area have subareas, i.e. is it a parent area for others? + local sub_areas = {}; + for i, area in pairs(areas.areas) do + if( i ~= id and + area.parent == id ) then + + table.insert( sub_areas, i ); + end + end + if( #sub_areas > 0 ) then + + formspec = formspec.. + 'label[0.5,4.0;Number of defined subareas:]'.. + 'label[4.7,4.0;'..tostring( #sub_areas )..']'.. + 'button_exit[8.0,4.0;2,0.5;list_subareas;List subareas]'; + else + formspec = formspec.. + 'label[0.5,4.0;There are no subareas defined.]'; + end + + + -- give information about the size of the area + local length_x = (math.abs( this_area.pos2.x - this_area.pos1.x )+1); + local length_y = (math.abs( this_area.pos2.y - this_area.pos1.y )+1); + local length_z = (math.abs( this_area.pos2.z - this_area.pos1.z )+1); + + formspec = formspec.. + 'label[0.5,4.5;The area extends from]'.. + 'label[4.7,4.5;'..minetest.pos_to_string( this_area.pos1 )..' to '..minetest.pos_to_string( this_area.pos2 )..'.]'.. + 'label[4.7,4.75;It spans '..tostring( length_x ).. + ' x '..tostring( length_z ).. + ' = '..tostring( length_x * length_z ).. + ' m^2. Height: '..tostring( length_y )..' m.]'; + + + formspec = formspec.. + markers.show_compass_marker( 2.0, 7.0, true, pos, this_area.pos1, this_area.pos2 ); + +-- TODO: buy / sell button + + local pname = player:get_player_name(); + if( not( markers.menu_data_by_player[ pname ] )) then + markers.menu_data_by_player[ pname ] = {}; + end + + -- we need to remember especially the id_list - else it would be impossible to know what the + -- player selected + markers.menu_data_by_player[ pname ] = + { typ = 'show_area', + mode = nil, + pos = pos, + mode_data = nil, + list = nil, + + selected = id, + }; + + return formspec; +end + + + +-- shows where the area (defined by pos1/pos2) is located relative to the given position pos +-- row_offset/col_offset are offsets for the formspec +markers.show_compass_marker = function( col_offset, row_offset, with_text, pos, pos1, pos2 ) + + local formspec = ''; +-- TODO: show up/down information somehow +-- TODO: what if checked with a land claim register? + + -- if possible, show how far the area streches into each direction relative to pos + if( pos.x >= pos1.x and pos.x <= pos2.x + and pos.y >= pos1.y and pos.y <= pos2.y + and pos.z >= pos1.z and pos.z <= pos2.z ) then + + if( with_text ) then + formspec = formspec.. + 'label[0.5,5.5;Dimensions of the area in relation to..]'.. +-- TODO: check if there is a marker; else write 'position you clicked on' + 'label[4.7,5.5;the marker at '..minetest.pos_to_string( pos )..':]'.. + 'button_exit[8.0,5.5;2,0.5;list_areas_at;Local areas]'; + end + formspec = formspec.. + 'image['..col_offset..','..row_offset..';1,1;markers_stone.png]'.. + 'label['..(col_offset-0.8)..','..(row_offset+0.05)..';'..tostring( pos.x - pos1.x )..' m W]'.. + 'label['..(col_offset+1.0)..','..(row_offset+0.05)..';'..tostring( pos2.x - pos.x )..' m E]'.. + 'label['..(col_offset+0.1)..','..(row_offset-0.80)..';'..tostring( pos.z - pos1.z )..' m N]'.. + 'label['..(col_offset+0.1)..','..(row_offset+0.80)..';'..tostring( pos2.z - pos.z )..' m S]'; + + -- else show how far the area is away + else + + local starts_north = ''; + local starts_south = ''; + local starts_east = ''; + local starts_west = ''; + if( pos.z > pos2.z ) then + starts_north = ''; + starts_south = tostring( pos.z - pos2.z )..' m S'; + else + starts_north = tostring( pos1.z - pos.z )..' m N'; + starts_south = ''; + end + if( pos.x > pos2.x ) then + starts_east = ''; + starts_west = tostring( pos.x - pos2.x )..' m W'; + else + starts_east = tostring( pos1.x - pos.x )..' m E'; + starts_west = ''; + end + + + if( with_text ) then + formspec = formspec.. + 'label[0.5,5.5;Position of the area in relation to..]'.. +-- TODO: check if there is a marker; else write 'position you clicked on' + 'label[4.7,5.5;the marker at '..minetest.pos_to_string( pos )..':]'.. + 'button_exit[8.0,5.5;2,0.5;list_areas_at;Local areas]'; + end + formspec = formspec.. + 'image['..col_offset..','..row_offset..';1,1;compass_side_top.png]'.. + 'label['..(col_offset-0.8)..','..(row_offset+0.05)..';'..starts_west..']'.. + 'label['..(col_offset+1.0)..','..(row_offset+0.05)..';'..starts_east..']'.. + 'label['..(col_offset+0.1)..','..(row_offset-0.80)..';'..starts_north..']'.. + 'label['..(col_offset+0.1)..','..(row_offset+0.80)..';'..starts_south..']'; + end + + return formspec; +end + + + +-- formspec input needs to be handled diffrently +markers.form_input_handler_areas = function( player, formname, fields) + + + if( formname ~= "markers:info" + or not( player ) + or not( markers.menu_data_by_player[ player:get_player_name() ] )) then + + return false; + end + + local menu_data = markers.menu_data_by_player[ player:get_player_name() ]; + local formspec = ''; + + + -- rename an area + if( fields.rename + and menu_data.selected + and areas.areas[ menu_data.selected ] + and areas.areas[ menu_data.selected ].owner == player:get_player_name() ) then + + local area = areas.areas[ menu_data.selected ]; + if( not( area.name )) then + area.name = '-enter area name-'; + end + formspec = 'field[rename_new_name;Enter new name for area:;'..minetest.formspec_escape( area.name )..']'; + + elseif( fields.rename_new_name + and menu_data.selected + and areas.areas[ menu_data.selected ] + and areas.areas[ menu_data.selected ].owner == player:get_player_name() ) then + + local area = areas.areas[ menu_data.selected ]; + + -- actually rename the area + areas.areas[ menu_data.selected ].name = fields.rename_new_name; + areas:save(); + + minetest.chat_send_player( area.owner, 'Area successfully renamed.'); + -- shwo the renamed area + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + + + + -- add an owner to the entire area + elseif( fields.add_owner + and menu_data.selected + and areas.areas[ menu_data.selected ] + and areas.areas[ menu_data.selected ].owner == player:get_player_name() ) then + + local area = areas.areas[ menu_data.selected ]; + formspec = 'field[add_owner_name;Grant access to area \"'..minetest.formspec_escape( area.name )..'\" to player:;-enter player name-]'; + + elseif( fields.add_owner_name + -- the player has to own the area already; we need a diffrent name here + and fields.add_owner_name ~= player:get_player_name() + and menu_data.selected + and areas.areas[ menu_data.selected ] + and areas.areas[ menu_data.selected ].owner == player:get_player_name() ) then + + local area = areas.areas[ menu_data.selected ]; + + -- does the player exist? + if( not( areas:player_exists( fields.add_owner_name ))) then + minetest.chat_send_player( area.owner, 'That player does not exist.'); + -- show the formspec + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + + else + -- log the creation of the new area + minetest.log("action", player:get_player_name().." runs /add_owner through the markers-mod. Owner = "..fields.add_owner_name.. + " AreaName = "..area.name.." ParentID = "..menu_data.selected.. + " StartPos = "..area.pos1.x..","..area.pos1.y..","..area.pos1.z.. + " EndPos = " ..area.pos2.x..","..area.pos2.y..","..area.pos2.z) + + -- take the name from the old/parent area + local new_id = areas:add( fields.add_owner_name, area.name, area.pos1, area.pos2, menu_data.selected ); + areas:save() + + + minetest.chat_send_player( fields.add_owner_name, + "You have been granted control over area #".. + new_id..". Type /list_areas to show your areas.") + + minetest.chat_send_player( area.owner, 'The player may now build and dig in your area.'); + -- shwo the new area + markers.menu_data_by_player[ player:get_player_name() ].selected = new_id; + formspec = markers.get_area_desc_formspec( new_id, player, menu_data.pos ); + end + + + + -- delete area + elseif( fields.delete + and menu_data.selected + and areas.areas[ menu_data.selected ] ) then + + local area = areas.areas[ menu_data.selected ]; + + -- a player can only delete own areas or subareas of own areas + if( area.owner ~= player:get_player_name() + and not( area.parent + and areas.areas[ area.parent ] + and areas.areas[ area.parent ].owner + and areas.areas[ area.parent ].owner == player:get_player_name() )) then + + minetest.chat_send_player( area.owner, 'Permission denied. You own neither the area itshelf nor its parent area.'); + -- shwo the renamed area + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + + else + + formspec = 'field[rename_new_name;Enter new name for area:;'..minetest.formspec_escape( area.name )..']'; + formspec = 'field[delete_confirm;'..minetest.formspec_escape( 'Really delete area \"'..area.name.. + '\" (owned by '..area.owner..')? Confirm with YES:')..';-type yes in capitals to confirm-]'; + + end + + elseif( fields.delete_confirm + and menu_data.selected + and areas.areas[ menu_data.selected ] ) then + + local area = areas.areas[ menu_data.selected ]; + local old_owner = area.owner; + + local subareas = {}; + for i,v in pairs( areas.areas ) do + if( v.parent and v.parent == menu_data.selected ) then + table.insert( subareas, i ); + end + end + + -- a player can only delete own areas or subareas of own areas + if( area.owner ~= player:get_player_name() + and not( area.parent + and areas.areas[ area.parent ] + and areas.areas[ area.parent ].owner + and areas.areas[ area.parent ].owner == player:get_player_name() )) then + + minetest.chat_send_player( player:get_player_name(), 'Permission denied. You own neither the area itshelf nor its parent area.'); + -- shwo the renamed area + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + + -- avoid accidents + elseif( fields.delete_confirm ~= 'YES' ) then + minetest.chat_send_player( player:get_player_name(), 'Delition of area \"'..tostring( area.name )..'\" (owned by '..old_owner..') aborted.'); + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + + -- only areas without subareas can be deleted + elseif( #subareas > 0 ) then + minetest.chat_send_player( player:get_player_name(), 'The area has '..tostring( #subareas )..' subarea(s). Please delete those first!'); + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + + else + + -- TODO: really delete + minetest.chat_send_player( player:get_player_name(), 'Area \"'..tostring( area.name )..'\" (owned by '..old_owner..') deleted.'); + -- show the list of areas owned by the previous owner + formspec = markers.get_area_list_formspec( player, 'player', menu_data.pos, old_owner, nil ); + end + + + + elseif( fields.show_parent + and menu_data.selected + and areas.areas[ menu_data.selected ] + and areas.areas[ menu_data.selected ].parent ) then + + formspec = markers.get_area_desc_formspec( areas.areas[ menu_data.selected ].parent, player, menu_data.pos ); + + + elseif( fields.list_player_areas + and menu_data.selected + and areas.areas[ menu_data.selected ] ) then + + formspec = markers.get_area_list_formspec( player, 'player', menu_data.pos, areas.areas[ menu_data.selected ].owner, nil ); + + + elseif( fields.list_subareas + and menu_data.selected + and areas.areas[ menu_data.selected ] ) then + + formspec = markers.get_area_list_formspec( player, 'subareas', menu_data.pos, menu_data.selected, nil ); + + + elseif( fields.list_areas_at + and menu_data.pos ) then + + formspec = markers.get_area_list_formspec( player, 'pos', menu_data.pos, menu_data.pos, nil ); + + + elseif( fields.markers_area_list_selection + and menu_data.typ + and menu_data.typ == 'area_list' + and menu_data.list + and #menu_data.list > 0 ) then + + + local field_data = fields.markers_area_list_selection:split( ':' ); + if( not( field_data ) or #field_data < 2 ) then + field_data = { '', '' }; + end + + local selected = tonumber( field_data[ 2 ] ); + if( field_data[1]=='DCL' ) then + + -- on doubleclick, show detailed area information + formspec = markers.get_area_desc_formspec( tonumber( menu_data.list[ selected ] ), player, menu_data.pos ); + else + + -- on single click, just show the position of that particular area + formspec = markers.get_area_list_formspec( player, menu_data.mode, menu_data.pos, menu_data.mode_data, selected ); + end + + else + return false; + end + + minetest.show_formspec( player:get_player_name(), "markers:info", formspec ) + return true; +end diff --git a/init.lua b/init.lua index cc844c0..d30fc15 100644 --- a/init.lua +++ b/init.lua @@ -21,6 +21,8 @@ markers.MAX_HEIGHT = 100; markers.MAX_SIZE = 1024; -- 32m * 32m = 1024 m^2 +dofile(minetest.get_modpath("markers").."/areas.lua"); + dofile(minetest.get_modpath("markers").."/marker_stone.lua"); -- TODO: dofile land_title_register.lua @@ -499,6 +501,7 @@ markers.marker_on_receive_fields = function(pos, formname, fields, sender) local canAdd, errMsg = areas:canPlayerAddArea(pos1, pos2, name) if not canAdd then minetest.chat_send_player(name, "You can't protect that area: "..errMsg) + minetest.show_formspec( name, "markers:mark", markers.get_marker_formspec(sender, pos, errMsg)); return end @@ -533,6 +536,24 @@ markers.form_input_handler = function( player, formname, fields) markers.marker_on_receive_fields(pos, formname, fields, player); end return true; + + + elseif( formname == "markers:info" + and player + and markers.menu_data_by_player[ player:get_player_name() ] ) then + + local res = markers.form_input_handler_areas( player, formname, fields); + if( res ) then + return true; + end + + -- TODO +-- minetest.chat_send_player('singleplayer','MARKERS:INFO WITH '..minetest.serialize( fields )); + + else + -- TODO +-- minetest.chat_send_player('singleplayer','YOU CALLED '..tostring( formname )..' WITH '..minetest.serialize( fields )); + end return false; diff --git a/marker_stone.lua b/marker_stone.lua index 568dc21..0c7c926 100644 --- a/marker_stone.lua +++ b/marker_stone.lua @@ -3,10 +3,19 @@ minetest.register_node("markers:stone", { description = "Boundary marker for land administration", tiles = {"markers_stone.png", "markers_stone.png", "markers_stone_side.png", "markers_stone_side.png", "markers_stone_side.png", "markers_stone_side.png" }, - paramtype2 = "facedir", +-- no facedir here - we want a fixed north indication! +-- paramtype2 = "facedir", groups = {cracky=2}, legacy_facedir_simple = true, is_ground_content = false, + + on_rightclick = function(pos, node, clicker) + + minetest.show_formspec( clicker:get_player_name(), "markers:info", + markers.get_area_list_formspec( clicker, 'pos', pos, pos, nil )); + return; + + end, }) diff --git a/textures/compass_side_top.png b/textures/compass_side_top.png new file mode 100644 index 0000000..3c87c57 Binary files /dev/null and b/textures/compass_side_top.png differ