Code touch-up

This commit is contained in:
tacotexmex 2017-08-30 21:13:33 +02:00
parent dbd9538a78
commit 5aed10c3e7
1 changed files with 121 additions and 120 deletions

241
init.lua
View File

@ -13,145 +13,146 @@ local pickup_radius = tonumber(minetest.settings:get("item_pickup_radius")) or 0
local timer = 0 local timer = 0
if pickup then if pickup then
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)
timer = timer + dtime timer = timer + dtime
if timer < 0.2 then return end if timer < 0.2 then return end
timer = 0 timer = 0
for _,player in ipairs(minetest.get_connected_players()) do for _,player in ipairs(minetest.get_connected_players()) do
local keys_pressed = false local keys_pressed = false
local control = player:get_player_control() local control = player:get_player_control()
if keytype == "Use" then if keytype == "Use" then
if control.aux1 == true then keys_pressed = true end if control.aux1 == true then keys_pressed = true end
elseif keytype == "Sneak" then elseif keytype == "Sneak" then
if control.sneak == true then keys_pressed = true end if control.sneak == true then keys_pressed = true end
elseif keytype == "LeftAndRight" then -- LeftAndRight combination elseif keytype == "LeftAndRight" then -- LeftAndRight combination
if control.left and control.right then keys_pressed = true end if control.left and control.right then keys_pressed = true end
elseif keytype == "RMB" then elseif keytype == "RMB" then
if control.RMB == true then keys_pressed = true end if control.RMB == true then keys_pressed = true end
elseif keytype == "SneakAndRMB" then -- SneakAndRMB combination elseif keytype == "SneakAndRMB" then -- SneakAndRMB combination
if control.sneak and control.RMB then keys_pressed = true end if control.sneak and control.RMB then keys_pressed = true end
end end
if keys_pressed or not key then if keys_pressed or not key then
if player:get_hp() > 0 or not minetest.settings:get_bool("enable_damage") then if player:get_hp() > 0 or not minetest.settings:get_bool("enable_damage") then
local pos = player:getpos() local pos = player:getpos()
pos.y = pos.y+0.5 pos.y = pos.y+0.5
local inv = player:get_inventory() local inv = player:get_inventory()
for _,object in ipairs(minetest.get_objects_inside_radius(pos, pickup_radius)) do local objectlist = minetest.get_objects_inside_radius(pos, pickup_radius)
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then for _,object in ipairs(objectlist) do
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then if not object:is_player()
inv:add_item("main", ItemStack(object:get_luaentity().itemstring)) and object:get_luaentity()
if object:get_luaentity().itemstring ~= "" then and object:get_luaentity().name == "__builtin:item" then
--minetest.chat_send_player(player:get_player_name(), "[ItemPickup] You picked up " .. object:get_luaentity().itemstring) local pos2 = object:getpos()
minetest.sound_play("item_drop_pickup", { local distance = math.sqrt(((pos2.x - pos.x) * (pos2.x - pos.x)) + ((pos2.y - pos.y) * (pos2.y - pos.y))
to_player = player:get_player_name(), + ((pos2.z - pos.z) * (pos2.z - pos.z)))
gain = pickup_gain, if distance <= 1 then
}) if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
end inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
object:get_luaentity().itemstring = "" if object:get_luaentity().itemstring ~= "" then
object:remove() minetest.sound_play("item_drop_pickup", {
end to_player = player:get_player_name(),
end gain = pickup_gain,
end })
end
object:get_luaentity().itemstring = ""
object:remove()
end
else
if object:get_luaentity().collect then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
local pos1 = pos
pos1.y = pos1.y+0.2
local vec = {x=pos1.x-pos2.x, y=pos1.y-pos2.y, z=pos1.z-pos2.z}
vec.x = vec.x*3
vec.y = vec.y*3
vec.z = vec.z*3
object:setvelocity(vec)
object:get_luaentity().physical_state = false
object:get_luaentity().object:set_properties({
physical = false
})
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do minetest.after(1, function()
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then local lua = object:get_luaentity()
if object:get_luaentity().collect then if object == nil or lua == nil or lua.itemstring == nil then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then return
local pos1 = pos end
pos1.y = pos1.y+0.2 if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
local pos2 = object:getpos() inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
local vec = {x=pos1.x-pos2.x, y=pos1.y-pos2.y, z=pos1.z-pos2.z} if object:get_luaentity().itemstring ~= "" then
vec.x = vec.x*3 minetest.sound_play("item_drop_pickup", {
vec.y = vec.y*3 to_player = player:get_player_name(),
vec.z = vec.z*3 gain = pickup_gain,
object:setvelocity(vec) })
object:get_luaentity().physical_state = false end
object:get_luaentity().object:set_properties({ object:get_luaentity().itemstring = ""
physical = false object:remove()
}) else
object:setvelocity({x=0,y=0,z=0})
minetest.after(1, function(args) object:get_luaentity().physical_state = true
local lua = object:get_luaentity() object:get_luaentity().object:set_properties({
if object == nil or lua == nil or lua.itemstring == nil then return end physical = true
})
if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then end
inv:add_item("main", ItemStack(object:get_luaentity().itemstring)) end, {player, object})
if object:get_luaentity().itemstring ~= "" then end
minetest.sound_play("item_drop_pickup", { end
to_player = player:get_player_name(), end
gain = pickup_gain, end
}) end
end end
object:get_luaentity().itemstring = "" end
object:remove() end
else end)
object:setvelocity({x=0,y=0,z=0})
object:get_luaentity().physical_state = true
object:get_luaentity().object:set_properties({
physical = true
})
end
end, {player, object})
end
end
end
end
end
end
end
end)
end end
if drop then if drop then
function minetest.handle_node_drops(pos, drops, digger) function minetest.handle_node_drops(pos, drops, digger)
local inv local inv
local diggerPos = pos local diggerPos = pos
if minetest.settings:get_bool("creative_mode") and digger and digger:is_player() then if minetest.settings:get_bool("creative_mode") and digger and digger:is_player() then
inv = digger:get_inventory() inv = digger:get_inventory()
diggerPos = digger:getpos() diggerPos = digger:getpos()
end end
for _,item in ipairs(drops) do for _,item in ipairs(drops) do
local count, name local count, name
if type(item) == "string" then if type(item) == "string" then
count = 1 count = 1
name = item name = item
else else
count = item:get_count() count = item:get_count()
name = item:get_name() name = item:get_name()
end end
if not inv or not inv:contains_item("main", ItemStack(name)) then if not inv or not inv:contains_item("main", ItemStack(name)) then
for i=1,count do for i=1,count do
local adjustedPos = {x=diggerPos.x, y=diggerPos.y, z=diggerPos.z} local adjustedPos = {x=diggerPos.x, y=diggerPos.y, z=diggerPos.z}
local obj = minetest.add_item(adjustedPos, name) local obj = minetest.add_item(adjustedPos, name)
if obj ~= nil then if obj ~= nil then
obj:get_luaentity().collect = true obj:get_luaentity().collect = true
local x = math.random(1, 5) local x = math.random(1, 5)
if math.random(1,2) == 1 then x = -x end if math.random(1,2) == 1 then x = -x end
local z = math.random(1, 5) local z = math.random(1, 5)
if math.random(1,2) == 1 then z = -z end if math.random(1,2) == 1 then z = -z end
obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z}) obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z})
end end
end end
end end
end end
end end
end end
if minetest.settings:get("log_mods") then minetest.log("action", "[Mod] item_drop loaded") end if minetest.settings:get("log_mods") then minetest.log("action", "[Mod] item_drop loaded") end