BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Item entity stacks merge on the ground.

Browse Source 
Add TTL to item entities.
This commit is contained in:
RealBadAngel 2014-05-17 11:25:25 +02:00
parent 94dba66c16
commit 18fe277d94
2 changed files with 103 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
builtin/game/item_entity.lua
View File

@ -8,14 +8,22 @@ function core.spawn_item(pos, item)
return obj
end
-- If item_entity_ttl is not set, enity will have default life time
-- Setting it to -1 disables the feature
local time_to_live = tonumber(core.setting_get("item_entity_ttl"))
if not time_to_live then
time_to_live = 900
end
core.register_entity(":__builtin:item", {
initial_properties = {
hp_max = 1,
physical = true,
collide_with_objects = false,
collisionbox = {-0.17,-0.17,-0.17, 0.17,0.17,0.17},
visual = "sprite",
visual_size = {x=0.5, y=0.5},
collisionbox = {-0.24, -0.24, -0.24, 0.24, 0.24, 0.24},
visual = "wielditem",
visual_size = {x = 0.3, y = 0.3},
textures = {""},
spritediv = {x = 1, y = 1},
initial_sprite_basepos = {x = 0, y = 0},
@ -24,10 +32,19 @@ core.register_entity(":__builtin:item", {
itemstring = '',
physical_state = true,
age = 0,
set_item = function(self, itemstring)
self.itemstring = itemstring
local stack = ItemStack(itemstring)
local count = stack:get_count()
local max_count = stack:get_stack_max()
if count > max_count then
count = max_count
self.itemstring = stack:get_name().." "..max_count
end
local s = 0.15 + 0.15 * (count / max_count)
local c = 0.8 * s
local itemtable = stack:to_table()
local itemname = nil
if itemtable then
@ -41,36 +58,34 @@ core.register_entity(":__builtin:item", {
end
prop = {
is_visible = true,
visual = "sprite",
textures = {"unknown_item.png"}
visual = "wielditem",
textures = {itemname},
visual_size = {x = s, y = s},
collisionbox = {-c, -c, -c, c, c, c},
automatic_rotate = math.pi * 0.2,
}
if item_texture and item_texture ~= "" then
prop.visual = "sprite"
prop.textures = {item_texture}
prop.visual_size = {x=0.50, y=0.50}
else
prop.visual = "wielditem"
prop.textures = {itemname}
prop.visual_size = {x=0.20, y=0.20}
prop.automatic_rotate = math.pi * 0.25
end
self.object:set_properties(prop)
end,
get_staticdata = function(self)
--return self.itemstring
return core.serialize({
itemstring = self.itemstring,
always_collect = self.always_collect,
age = self.age
})
end,
on_activate = function(self, staticdata)
on_activate = function(self, staticdata, dtime_s)
if string.sub(staticdata, 1, string.len("return")) == "return" then
local data = core.deserialize(staticdata)
if data and type(data) == "table" then
self.itemstring = data.itemstring
self.always_collect = data.always_collect
if data.age then
self.age = data.age + dtime_s
else
self.age = dtime_s
end
end
else
self.itemstring = staticdata
@ -82,6 +97,12 @@ core.register_entity(":__builtin:item", {
end,
on_step = function(self, dtime)
self.age = self.age + dtime
if time_to_live > 0 and self.age > time_to_live then
self.itemstring = ''
self.object:remove()
return
end
local p = self.object:getpos()
p.y = p.y - 0.3
local nn = core.get_node(p).name
@ -89,21 +110,67 @@ core.register_entity(":__builtin:item", {
local v = self.object:getvelocity()
if not core.registered_nodes[nn] or core.registered_nodes[nn].walkable and v.y == 0 then
if self.physical_state then
local own_stack = ItemStack(self.object:get_luaentity().itemstring)
for _,object in ipairs(core.get_objects_inside_radius(p, 0.8)) do
local obj = object:get_luaentity()
if obj and obj.name == "__builtin:item" and obj.physical_state == false then
local stack = ItemStack(obj.itemstring)
if own_stack:get_name() == stack:get_name() and stack:get_free_space() > 0 then
local overflow = false
local count = stack:get_count() + own_stack:get_count()
local max_count = stack:get_stack_max()
if count>max_count then
overflow = true
count = count - max_count
else
self.itemstring = ''
end
local pos=object:getpos()
pos.y = pos.y + (count - stack:get_count()) / max_count * 0.15
object:moveto(pos, false)
local s, c
local max_count = stack:get_stack_max()
local name = stack:get_name()
if not overflow then
obj.itemstring = name.." "..count
s = 0.15 + 0.15 * (count / max_count)
c = 0.8 * s
object:set_properties({
visual_size = {x = s, y = s},
collisionbox = {-c, -c, -c, c, c, c}
})
self.object:remove()
return
else
s = 0.3
c = 0.24
object:set_properties({
visual_size = {x = s, y = s},
collisionbox = {-c, -c, -c, c, c, c}
})
obj.itemstring = name.." "..max_count
s = 0.15 + 0.15 * (count / max_count)
c = 0.8 * s
self.object:set_properties({
visual_size = {x = s, y = s},
collisionbox = {-c, -c, -c, c, c, c}
})
self.itemstring = name.." "..count
end
end
end
end
self.object:setvelocity({x = 0, y = 0, z = 0})
self.object:setacceleration({x = 0, y = 0, z = 0})
self.physical_state = false
self.object:set_properties({
physical = false
})
self.object:set_properties({physical = false})
end
else
if not self.physical_state then
self.object:setvelocity({x = 0, y = 0, z = 0})
self.object:setacceleration({x = 0, y = -10, z = 0})
self.physical_state = true
self.object:set_properties({
physical = true
})
self.object:set_properties({physical = true})
end
end
end,
@ -120,4 +187,3 @@ core.register_entity(":__builtin:item", {
self.object:remove()
end,
})

3
minetest.conf.example
View File

@ -264,6 +264,9 @@
#max_users = 15
# Set to true to disallow old clients from connecting
#strict_protocol_version_checking = false
# Time in seconds for item entity to live. Default value: 900s
# Setting it to -1 disables the feature
#item_entity_ttl = 900
# Set to true to enable creative mode (unlimited inventory)
#creative_mode = false
# Enable players getting damage and dying