Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-15 23:51:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into translations-to-spanish

Browse source
This commit is contained in:
megustanlosfrijoles 2023-05-02 00:08:55 +00:00
commit 2f7d4b7c24
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mods/ENTITIES/mcl_item_entity/init.lua
View file

@ -621,13 +621,17 @@ minetest.register_entity(":__builtin:item", {
if speed ~= nil then self.random_velocity = speed end
local vel = self.object:get_velocity()
-- There is perhaps a cleverer way of making this physical so it bounces off the wall like swords.
local max_vel = 6.5 -- Faster than this and it throws it into the wall / floor and turns black because of clipping.
if vel and vel.x == 0 and vel.z == 0 and self.random_velocity > 0 then
local v = self.random_velocity
local x = math.random(5, 10) / 10 * v
local x = math.random(5, max_vel) / 10 * v
if math.random(0, 10) < 5 then x = -x end
local z = math.random(5, 10) / 10 * v
local z = math.random(5, max_vel) / 10 * v
if math.random(0, 10) < 5 then z = -z end
local y = math.random(2, 4)
local y = math.random(1, 2)
self.object:set_velocity(vector.new(x, y, z))
end
self.random_velocity = 0
@ -804,11 +808,19 @@ minetest.register_entity(":__builtin:item", {
if total_count > max_count then
return false
end
-- Merge the remote stack into this one
-- local pos = object:get_pos()
-- pos.y = pos.y + ((total_count - count) / max_count) * 0.15
-- self.object:move_to(pos)
-- Merge the remote stack into this one
local self_pos = self.object:get_pos()
local pos = object:get_pos()
--local y = pos.y + ((total_count - count) / max_count) * 0.15
local x_diff = (self_pos.x - pos.x) / 2
local z_diff = (self_pos.z - pos.z) / 2
local new_pos = vector.offset(pos, x_diff, 0, z_diff)
new_pos.y = math.max(self_pos.y, pos.y) + 0.1
self.object:move_to(new_pos)
self.age = 0 -- Handle as new entity
own_stack:set_count(total_count)
@ -829,6 +841,7 @@ minetest.register_entity(":__builtin:item", {
self.object:set_acceleration(vector.zero())
return
end
self.age = self.age + dtime
if self._collector_timer then
self._collector_timer = self._collector_timer + dtime
@ -858,6 +871,9 @@ minetest.register_entity(":__builtin:item", {
return
end
if self.is_clock then
self.object:set_properties({
textures = { "mcl_clock:clock_" .. (mcl_worlds.clock_works(p) and mcl_clock.old_time or mcl_clock.random_frame) }
@ -907,14 +923,13 @@ minetest.register_entity(":__builtin:item", {
local is_on_floor = def and (def.walkable
and not def.groups.slippery and v.y == 0)
if not minetest.registered_nodes[nn]
or is_floating or is_on_floor then
if not minetest.registered_nodes[nn] or is_floating or is_on_floor then
local own_stack = ItemStack(self.object:get_luaentity().itemstring)
-- Merge with close entities of the same item
for _, object in pairs(minetest.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
if obj and obj.name == "__builtin:item" and obj.physical_state == false then
if self:try_merge_with(own_stack, object, obj) then
return
end

2
mods/ENTITIES/mcl_mobs/init.lua
View file

@ -556,7 +556,7 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
nametag = string.sub(nametag, 1, MAX_MOB_NAME_LENGTH)
end
ent.nametag = nametag
update_tag(ent)
ent:update_tag()
end
-- if not in creative then take item