From e2c885096e6d4c9cebc477623324dbbbfabcc077 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 1 Sep 2012 03:49:44 +0200 Subject: [PATCH] Complete rewrite --- init.lua | 267 +++++++++++++++++++++++++++------------------------ init_old.lua | 146 ++++++++++++++++++++++++++++ 2 files changed, 285 insertions(+), 128 deletions(-) create mode 100644 init_old.lua diff --git a/init.lua b/init.lua index c5163c1..faf22b4 100644 --- a/init.lua +++ b/init.lua @@ -1,146 +1,157 @@ -function item_drop(pos, oldnode, digger) - local anzahl = 1 - if oldnode.name.items ~= nil then - local drops = {} - local max_items = oldnode.name.max_items - for i,item in ipairs(oldnode.name.items) do - local rarity - if item.rarity == nil then - rarity = 1 - else - rarity = item.rarity - end - if math.random(1, rarity) == 1 then - table.insert(drops, item.items[1]) - end - if #drops == max_items then - for j,it in ipairs(drops) do - item_drop(pos, {name=it}, digger) - end - return - end - end - return - else - if string.find(oldnode.name, " ") ~= nil then - oldnode.name = oldnode.name:gsub('"',""):gsub("craft ",""):gsub("item ",""):gsub("node ","") - anzahl = string.sub(oldnode.name, string.find(oldnode.name, " ")+1, string.len(oldnode.name)) - oldnode.name = string.sub(oldnode.name, 1, string.find(oldnode.name, " ")-1) - end - end - - if oldnode.name == "" then - return - end - - for i=1,anzahl do - if digger:get_inventory():room_for_item("main", ItemStack(oldnode.name)) then - digger:get_inventory():remove_item("main", ItemStack(oldnode.name)) - end - local item = minetest.env:add_item(pos, oldnode) - if item ~= nil then - item:get_luaentity().collect = true - local x = math.random(1, 5) - if math.random(1,2) == 1 then - x = -x - end - local z = math.random(1, 5) - if math.random(1,2) == 1 then - z = -z - end - item:setvelocity({x=1/x, y=item:getvelocity().y, z=1/z}) - end - end -end - -local item_timer = {} - minetest.register_globalstep(function(dtime) - for i,player in ipairs(minetest.get_connected_players()) do + for _,player in ipairs(minetest.get_connected_players()) do local pos = player:getpos() pos.y = pos.y+0.5 - local items = minetest.env:get_objects_inside_radius(pos,1) - for j,item in ipairs(items) do - if not item:is_player() and item:get_luaentity().itemstring ~= nil then - if item:get_luaentity().itemstring ~= "" and player:get_inventory():room_for_item("main", ItemStack(item:get_luaentity().itemstring)) and item:get_luaentity().collect then - player:get_inventory():add_item("main", ItemStack(item:get_luaentity().itemstring)) - minetest.sound_play("item_drop_pickup", { - to_player = player, - }) - item:remove() - item:get_luaentity().itemstring = "" + local inv = player:get_inventory() + + for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do + if not object:is_player() and object:get_luaentity().name == "__builtin:item" then + if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then + inv:add_item("main", ItemStack(object:get_luaentity().itemstring)) + if object:get_luaentity().itemstring ~= "" then + minetest.sound_play("item_drop_pickup", { + to_player = player:get_player_name(), + }) + end + object:get_luaentity().itemstring = "" + object:remove() end end end - items = minetest.env:get_objects_inside_radius(pos, 2) - for j,item in ipairs(items) do - if not item:is_player() and item:get_luaentity().itemstring ~= nil then - if player:get_inventory():room_for_item("main", ItemStack(item:get_luaentity().itemstring)) and item:get_luaentity().collect then - local p = player:getpos() - p.y = p.y+0.5 - local i = item:getpos() - local move = {x=(p.x-i.x)*15, y=(p.y-i.y)*15, z=(p.z-i.z)*15} - item:setacceleration(move) + for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 2)) do + if not object:is_player() and object:get_luaentity().name == "__builtin:item" then + if object:get_luaentity().collect then + if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then + local pos1 = pos + pos1.y = pos1.y+0.3 + local pos2 = object:getpos() + local vec = {x=pos1.x-pos2.x, y=pos1.y-pos2.y, z=pos1.z-pos2.z} + vec.x = vec.x*15 + vec.y = vec.y*15 + vec.z = vec.z*15 + object:setacceleration(vec) + end + else + minetest.after(0.5, function(entity) + entity.collect = true + end, object:get_luaentity()) end - - if item:get_luaentity().collect == nil and item:get_luaentity().itemstring ~= "" then - if item:get_luaentity().timer == nil then - item:get_luaentity().timer = 0 - table.insert(item_timer, item) + end + end + end +end) + +drops = {} +after_dig_nodes = {} + +get_drops = function(tab) + if not tab.items then + return {tab} + end + local ret = {} + if tab.rarity and math.random(1, tab.rarity) ~= 1 then + return {} + end + local max = tab.max_items + if not max then + max = #tab+100 + end + for i,item in ipairs(tab.items) do + if #ret>=max then + break + end + if item.items == nil then + table.insert(ret, item) + else + for _,item2 in ipairs(get_drops(item)) do + table.insert(ret, item2) + end + end + end + return ret +end + +minetest.after(0, function() + for name,node in pairs(minetest.registered_nodes) do + if node.drop ~= nil then + drops[name] = node.drop + end + if node.after_dig_node ~= nil then + after_dig_nodes[name] = node.after_dig_nodes + end + local new_node = {} + new_node.drop = "" + new_node.after_dig_node = function(pos, oldnode, oldmetadata, digger) + if after_dig_nodes[oldnode.name] ~= nil then + after_dig_nodes[oldnode.name](pos, oldnode, oldmetadata, digger) + end + local name = oldnode.name + if drops[name] == nil then + local obj = minetest.env:add_item(pos, oldnode) + if obj ~= nil then + obj:get_luaentity().collect = true + local x = math.random(1, 5) + if math.random(1,2) == 1 then + x = -x + end + local z = math.random(1, 5) + if math.random(1,2) == 1 then + z = -z + end + obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z}) + end + else + if drops[name].items == nil then + oldnode.name = drops[name] + local num = 1 + if string.find(oldnode.name, " ") then + num = tonumber(string.sub(oldnode.name, string.find(oldnode.name, " ")+1)) + oldnode.name = string.sub(oldnode.name, 1, string.find(oldnode.name, " ")-1) + end + for i=1,num do + local obj = minetest.env:add_item(pos, oldnode) + if obj ~= nil then + obj:get_luaentity().collect = true + local x = math.random(1, 5) + if math.random(1,2) == 1 then + x = -x + end + local z = math.random(1, 5) + if math.random(1,2) == 1 then + z = -z + end + obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z}) + end + end + else + for _,item in ipairs(get_drops(drops[oldnode.name])) do + oldnode.name = item + local obj = minetest.env:add_item(pos, oldnode) + if obj ~= nil then + obj:get_luaentity().collect = true + local x = math.random(1, 5) + if math.random(1,2) == 1 then + x = -x + end + local z = math.random(1, 5) + if math.random(1,2) == 1 then + z = -z + end + obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z}) + end end end end end - end - - for i,item in ipairs(item_timer) do - if item:get_luaentity() == nil then - table.remove(item_timer, i) - else - item:get_luaentity().timer = item:get_luaentity().timer + dtime - if item:get_luaentity().timer > 1 then - item:get_luaentity().collect = true - table.remove(item_timer, i) - end - end - end -end) - -minetest.after(0, function() - for name,node in pairs(minetest.registered_nodes) do - local func - if node.drop == nil then - if node.after_dig_node == nil then - func = function(pos, oldnode, oldmetadata, digger) - item_drop(pos, oldnode, digger) - end - else - func = function(pos, oldnode, oldmetadata, digger) - item_drop(pos, oldnode, digger) - end - end - else - if node.after_dig_node == nil then - func = function(pos, oldnode, oldmetadata, digger) - oldnode.name = node.drop - item_drop(pos, oldnode, digger) - end - else - func = function(pos, oldnode, oldmetadata, digger) - oldnode.name = node.drop - item_drop(pos, oldnode, digger) - end + + for name,value in pairs(node) do + if name ~= "drop" and name ~= "after_dig_node" then + new_node[name] = value end end - local new_node = { - after_dig_node = func, - } - for str,val in pairs(node) do - new_node[str] = val - end minetest.register_node(":"..new_node.name, new_node) + end end) - diff --git a/init_old.lua b/init_old.lua new file mode 100644 index 0000000..c5163c1 --- /dev/null +++ b/init_old.lua @@ -0,0 +1,146 @@ +function item_drop(pos, oldnode, digger) + local anzahl = 1 + if oldnode.name.items ~= nil then + local drops = {} + local max_items = oldnode.name.max_items + for i,item in ipairs(oldnode.name.items) do + local rarity + if item.rarity == nil then + rarity = 1 + else + rarity = item.rarity + end + if math.random(1, rarity) == 1 then + table.insert(drops, item.items[1]) + end + if #drops == max_items then + for j,it in ipairs(drops) do + item_drop(pos, {name=it}, digger) + end + return + end + end + return + else + if string.find(oldnode.name, " ") ~= nil then + oldnode.name = oldnode.name:gsub('"',""):gsub("craft ",""):gsub("item ",""):gsub("node ","") + anzahl = string.sub(oldnode.name, string.find(oldnode.name, " ")+1, string.len(oldnode.name)) + oldnode.name = string.sub(oldnode.name, 1, string.find(oldnode.name, " ")-1) + end + end + + if oldnode.name == "" then + return + end + + for i=1,anzahl do + if digger:get_inventory():room_for_item("main", ItemStack(oldnode.name)) then + digger:get_inventory():remove_item("main", ItemStack(oldnode.name)) + end + local item = minetest.env:add_item(pos, oldnode) + if item ~= nil then + item:get_luaentity().collect = true + local x = math.random(1, 5) + if math.random(1,2) == 1 then + x = -x + end + local z = math.random(1, 5) + if math.random(1,2) == 1 then + z = -z + end + item:setvelocity({x=1/x, y=item:getvelocity().y, z=1/z}) + end + end +end + +local item_timer = {} + +minetest.register_globalstep(function(dtime) + for i,player in ipairs(minetest.get_connected_players()) do + local pos = player:getpos() + pos.y = pos.y+0.5 + local items = minetest.env:get_objects_inside_radius(pos,1) + for j,item in ipairs(items) do + if not item:is_player() and item:get_luaentity().itemstring ~= nil then + if item:get_luaentity().itemstring ~= "" and player:get_inventory():room_for_item("main", ItemStack(item:get_luaentity().itemstring)) and item:get_luaentity().collect then + player:get_inventory():add_item("main", ItemStack(item:get_luaentity().itemstring)) + minetest.sound_play("item_drop_pickup", { + to_player = player, + }) + item:remove() + item:get_luaentity().itemstring = "" + end + end + end + + items = minetest.env:get_objects_inside_radius(pos, 2) + for j,item in ipairs(items) do + if not item:is_player() and item:get_luaentity().itemstring ~= nil then + if player:get_inventory():room_for_item("main", ItemStack(item:get_luaentity().itemstring)) and item:get_luaentity().collect then + local p = player:getpos() + p.y = p.y+0.5 + local i = item:getpos() + local move = {x=(p.x-i.x)*15, y=(p.y-i.y)*15, z=(p.z-i.z)*15} + item:setacceleration(move) + end + + if item:get_luaentity().collect == nil and item:get_luaentity().itemstring ~= "" then + if item:get_luaentity().timer == nil then + item:get_luaentity().timer = 0 + table.insert(item_timer, item) + end + end + end + end + end + + for i,item in ipairs(item_timer) do + if item:get_luaentity() == nil then + table.remove(item_timer, i) + else + item:get_luaentity().timer = item:get_luaentity().timer + dtime + if item:get_luaentity().timer > 1 then + item:get_luaentity().collect = true + table.remove(item_timer, i) + end + end + end +end) + +minetest.after(0, function() + for name,node in pairs(minetest.registered_nodes) do + local func + if node.drop == nil then + if node.after_dig_node == nil then + func = function(pos, oldnode, oldmetadata, digger) + item_drop(pos, oldnode, digger) + end + else + func = function(pos, oldnode, oldmetadata, digger) + item_drop(pos, oldnode, digger) + end + end + else + if node.after_dig_node == nil then + func = function(pos, oldnode, oldmetadata, digger) + oldnode.name = node.drop + item_drop(pos, oldnode, digger) + end + else + func = function(pos, oldnode, oldmetadata, digger) + oldnode.name = node.drop + item_drop(pos, oldnode, digger) + end + end + end + + local new_node = { + after_dig_node = func, + } + for str,val in pairs(node) do + new_node[str] = val + end + minetest.register_node(":"..new_node.name, new_node) + end +end) +