From 94767e57baf9935587cceed736287713b47be1f3 Mon Sep 17 00:00:00 2001 From: Joseph Pickard Date: Sun, 17 Jan 2016 13:27:33 -0500 Subject: [PATCH 1/2] Added a WorldEdit wand item that can be used to select areas with worldedit. --- worldedit/init.lua | 1 + worldedit/wand.lua | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 worldedit/wand.lua diff --git a/worldedit/init.lua b/worldedit/init.lua index e193454..ec6e99d 100644 --- a/worldedit/init.lua +++ b/worldedit/init.lua @@ -36,6 +36,7 @@ load_module(path .. "/visualization.lua") load_module(path .. "/serialization.lua") load_module(path .. "/code.lua") load_module(path .. "/compatibility.lua") +load_module(path .. "/wand.lua") if minetest.setting_getbool("log_mods") then diff --git a/worldedit/wand.lua b/worldedit/wand.lua new file mode 100644 index 0000000..1973c79 --- /dev/null +++ b/worldedit/wand.lua @@ -0,0 +1,64 @@ +-- TODO: Add inventory image + +minetest.register_tool( "worldedit:wand", +{ + description = "WorldEdit Wand. Left-click with it to set the first WorldEdit position, Right-click to set the second WorldEdit position.", + groups = {}, + inventory_image = "default_book.png", -- TODO + wield_image = "", + 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}, 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_use = function(itemstack, placer, pointed_thing) + if ( placer ~= nil and pointed_thing ~= nil) then + local name = placer:get_player_name(); + local pos = minetest.get_pointed_thing_position( pointed_thing, false ); -- not above + + if( not( pos ) or not( pos.x )) then + return itemstack; + end + + worldedit.pos1[name] = pos + worldedit.mark_pos1(name); + + end + return itemstack; -- nothing consumed, nothing changed + end, + + + on_place = function(itemstack, placer, pointed_thing) + if( placer ~= nil and pointed_thing ~= nil) then + local name = placer:get_player_name(); + local pos = minetest.get_pointed_thing_position( pointed_thing, false ); -- not above + + if( not( pos ) or not( pos.x )) then + return itemstack; + end + + worldedit.pos2[name] = pos; + worldedit.mark_pos2(name); + end + return itemstack; -- nothing consumed, nothing changed + end, +}) + + +-- minetest.register_craft({ +-- output = "worldedit:wand",}); +-- recipe = { { "markers:mark" }, +-- { "markers:stone" }, +-- { "default:book"} +-- } }); + From bea4710000f7373154eb6c2ab3c3903091ca545a Mon Sep 17 00:00:00 2001 From: Joseph Pickard Date: Fri, 22 Jan 2016 11:14:51 -0600 Subject: [PATCH 2/2] Removed semicolons. Removed unnecessary parentheses from 'if' statements. Added a texture for the 'worldedit:wand' item. --- worldedit/textures/worldedit_wand.png | Bin 0 -> 442 bytes worldedit/wand.lua | 47 ++++++++++---------------- 2 files changed, 18 insertions(+), 29 deletions(-) create mode 100644 worldedit/textures/worldedit_wand.png diff --git a/worldedit/textures/worldedit_wand.png b/worldedit/textures/worldedit_wand.png new file mode 100644 index 0000000000000000000000000000000000000000..13eb12189cb19a680229526a474f38f932300ab1 GIT binary patch literal 442 zcmV;r0Y(0aP)YX~D;^6zhY%lq+t9~~3e-UnQMy0G(L5CoCbLBh== z5DNIw3X)cJp+6FWexczo(!-(xV*dHr8*{Uf%fUJ@g7q`K=_*qFSkw$sgJBr=*Vvy8 zuyBGp@o_hoig{RlLBvn4NLT;>YtaC^q!P$t!^+Vu2@3!qHqph3MTY70B9_X~zZ*1? zIDaM6>4p6Egzf2G78U?NER`XfqZ5^40rB}T3kv{X=|Cs5!w2=NfQ`v+ZhC`8wx+yn zl?gAkb|lkT5*7f!a&(A2ZDqXIOl+P$Q&ScGl1yhQU#UW|%UGQoX5j?C<1UQyhj9nL kM{P|20J}2^J8ETo0~vOCmI$`c0000007*qoM6N<$f^)O3761SM literal 0 HcmV?d00001 diff --git a/worldedit/wand.lua b/worldedit/wand.lua index 1973c79..e5c2503 100644 --- a/worldedit/wand.lua +++ b/worldedit/wand.lua @@ -1,14 +1,12 @@ --- TODO: Add inventory image - minetest.register_tool( "worldedit:wand", { description = "WorldEdit Wand. Left-click with it to set the first WorldEdit position, Right-click to set the second WorldEdit position.", groups = {}, - inventory_image = "default_book.png", -- TODO + inventory_image = "worldedit_wand.png", wield_image = "", 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 + liquids_pointable = true, -- ground with only water on can be selected as well -- the tool_capabilities are completely irrelevant here - no need to dig tool_capabilities = { full_punch_interval = 1.0, @@ -22,43 +20,34 @@ minetest.register_tool( "worldedit:wand", node_placement_prediction = nil, on_use = function(itemstack, placer, pointed_thing) - if ( placer ~= nil and pointed_thing ~= nil) then - local name = placer:get_player_name(); - local pos = minetest.get_pointed_thing_position( pointed_thing, false ); -- not above + if placer ~= nil and pointed_thing ~= nil then + local name = placer:get_player_name() + local pos = minetest.get_pointed_thing_position( pointed_thing, false ) -- not above - if( not( pos ) or not( pos.x )) then - return itemstack; + if not pos then + return itemstack end worldedit.pos1[name] = pos - worldedit.mark_pos1(name); + worldedit.mark_pos1(name) end - return itemstack; -- nothing consumed, nothing changed + return itemstack -- nothing consumed, nothing changed end, - on_place = function(itemstack, placer, pointed_thing) - if( placer ~= nil and pointed_thing ~= nil) then - local name = placer:get_player_name(); - local pos = minetest.get_pointed_thing_position( pointed_thing, false ); -- not above + on_place = function(itemstack, placer, pointed_thing) -- Left Click + if placer ~= nil and pointed_thing ~= nil then + local name = placer:get_player_name() + local pos = minetest.get_pointed_thing_position( pointed_thing, false ) -- not above - if( not( pos ) or not( pos.x )) then - return itemstack; + if not pos then + return itemstack end - worldedit.pos2[name] = pos; - worldedit.mark_pos2(name); + worldedit.pos2[name] = pos + worldedit.mark_pos2(name) end - return itemstack; -- nothing consumed, nothing changed + return itemstack -- nothing consumed, nothing changed end, }) - - --- minetest.register_craft({ --- output = "worldedit:wand",}); --- recipe = { { "markers:mark" }, --- { "markers:stone" }, --- { "default:book"} --- } }); -