Merge branch 'blaboing-patch-1'

add mod.conf

areas.lua

@@ -478,7 +478,7 @@ end
 markers.form_input_handler_areas = function( player, formname, fields)
 
    local pname = player:get_player_name();
-   local ppos = player:getpos()
+   local ppos = player:get_pos()
 
    if( formname ~= "markers:info"
       or not( player )

config.lua

@@ -12,7 +12,7 @@ markers.EXPIRE_AFTER = 60*60*24;
 markers.MAX_HEIGHT   = 100;
 
 -- only areas up to this size (in square meters) can be protected
-markers.MAX_SIZE     = 1024; -- 32m * 32m = 1024 m^2
+markers.MAX_SIZE     = 4096; -- 64m * 64m= 4096 m^2
 
 -- show only areas withhin this range when showing the list of ALL areas
 -- (else it does get too crowded on multiplayer servers)
@@ -30,7 +30,18 @@ end
 -- for most cases, the default values ought to work
 --markers.AREA_RANGE   = 100000;
 
-if( io.open(minetest.get_worldpath().."/markers_settings.txt","r")) then
-	io.close()
-	dofile(minetest.get_worldpath().."/markers_settings.txt")
+local settings = Settings( minetest.get_worldpath().."/markers_settings.txt");
+if( settings ) then
+	if( settings:get( "markers_MAX_MARKERS" )) then
+		markers.MAX_MARKERS  = tonumber(settings:get( "markers_MAX_MARKERS"));
+	end
+	if( settings:get( "markers_EXPIRE_AFTER" )) then
+		markers.EXPIRE_AFTER = tonumber(settings:get( "markers_EXPIRE_AFTER"));
+	end
+	if( settings:get( "markers_MAX_HEIGHT" )) then
+		markers.MAX_HEIGHT   = tonumber(settings:get( "markers_MAX_HEIGHT"));
+	end
+	if( settings:get( "markers_MAX_SIZE" )) then
+		markers.MAX_SIZE     = tonumber(settings:get( "markers_MAX_SIZE"));
+	end
 end

depends.txt

@@ -1 +1,2 @@
 areas
+default

init.lua

@@ -128,7 +128,7 @@ markers.marker_placed = function( pos, placer, itemstack )
       end
 
       -- make sure the list does not grow too large
-      if( n > markers.MAX_MARKERS and minetest.get_player_privs(name)["megabuilder"] ~= true) then
+      if( n > markers.MAX_MARKERS ) then
          table.remove( markers.positions[ name ], 1 );
       end
    end
@@ -284,7 +284,7 @@ markers.get_marker_formspec = function(player, pos, error_msg)
                * (math.abs( coords[1].z - coords[2].z )+1);
 
     -- check if area is too large
-    if( markers.MAX_SIZE < size and minetest.get_player_privs(name)["megabuilder"] ~= true) then
+    if( markers.MAX_SIZE < size ) then
        return formspec_info.."Error: You can only protect\nareas of up to "..tostring( markers.MAX_SIZE ).."m^2.\n"..
                              "Your marked area is "..tostring( size ).." m^2 large.]";
     end
@@ -374,19 +374,19 @@ markers.marker_on_receive_fields = function(pos, formname, fields, sender)
    local add_depth  = tonumber( fields['add_depth']  );
 
    local error_msg = '';
-   if(     not( add_height ) or add_height < 0 or (add_height > markers.MAX_HEIGHT and minetest.get_player_privs(name)["megabuilder"] ~= true)) then
+   if(     not( add_height ) or add_height < 0 or add_height > markers.MAX_HEIGHT ) then
       minetest.chat_send_player( name, 'Please enter a number between 0 and '..tostring( markers.MAX_HEIGHT )..
 		' in the field where the height of your area is requested. Your area will stretch that many blocks '..
 		'up into the sky from the position of this marker onward.');
       error_msg = 'The height value\nhas to be larger than 0\nand smaller than '..tostring( markers.MAX_HEIGHT );
 
-   elseif( not( add_depth  ) or add_depth  < 0 or (add_depth  > markers.MAX_HEIGHT and minetest.get_player_privs(name)["megabuilder"] ~= true)) then
+   elseif( not( add_depth  ) or add_depth  < 0 or add_depth  > markers.MAX_HEIGHT ) then
       minetest.chat_send_player( name, 'Please enter a number between 0 and '..tostring( markers.MAX_HEIGHT )..
 		' in the field where the depth of your area is requested. Your area will stretch that many blocks '..
 		'into the ground from the position of this marker onward.');
       error_msg = 'The depth value\nhas to be larger than 0\nand smaller than '..tostring( markers.MAX_HEIGHT );
 
-   elseif( add_height + add_depth > markers.MAX_HEIGHT ) and minetest.get_player_privs(name)["megabuilder"] ~= true then
+   elseif( add_height + add_depth > markers.MAX_HEIGHT ) then
       minetest.chat_send_player( name,  'Sorry, your area exceeds the height limit. Height and depth added have to '..
 		'be smaller than '..tostring( markers.MAX_HEIGHT )..'.');
       error_msg = 'height + depth has to\nbe smaller than '..tostring( markers.MAX_HEIGHT )..'.'

land_title_register.lua

@@ -9,16 +9,18 @@ minetest.register_tool( "markers:land_title_register",
     wield_scale = {x=1,y=1,z=1},
     stack_max = 1, -- there is no need to have more than one
     liquids_pointable = true, -- ground with only water on can be owned as well
+--[[
     -- the tool_capabilities are completely irrelevant here - no need to dig
     tool_capabilities = {
         full_punch_interval = 1.0,
         max_drop_level=0,
         groupcaps={
-            fleshy={times={[2]=0.80, [3]=0.40}, uses = 1/0.05, maxlevel=1},
-            snappy={times={[2]=0.80, [3]=0.40}, uses = 1/0.05, maxlevel=1},
-            choppy={times={[3]=0.90}, uses = 1/0.05, maxlevel=0}
+            fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
+            snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
+            choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
         }
     },
+--]]
     node_placement_prediction = nil,
 
     on_place = function(itemstack, placer, pointed_thing)

markers_settings.txt

@@ -0,0 +1,19 @@
+# copy this to your worldpath if you want to override these values
+
+# store the positions of that many markers for each player (until server restart)
+# default: 50
+markers_MAX_MARKERS = 50
+
+# the protection against digging of the marker by other players expires after this time
+# default: 60*60*24 (1 day)
+markers_EXPIRE_AFTER = 86400
+
+
+# self-protected areas can not get higher than this
+# default: 100
+markers_MAX_HEIGHT = 100
+
+
+# only areas up to this size (in square meters) can be protected
+# default: 4096
+markers_MAX_SIZE = 4096

mod.conf

@@ -0,0 +1,3 @@
+name = markers
+description = markers for the Minetest mod "areas" 
+depends = areas