nalc
/
maidroid
forked from mtcontrib/maidroid
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #160 from tacigar/tacigar/dummy_item 

Fix bug of dummy item
Close #145
This commit is contained in:
tacigar 2017-01-09 23:45:53 +09:00 committed by GitHub
parent 74654691dd 44f2177a95
commit 750802fd00
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
maidroid/api.lua
View File

@ -267,17 +267,15 @@ do
wield_image = "maidroid_dummy_empty_craftitem.png", wield_image = "maidroid_dummy_empty_craftitem.png",
}) })
local function on_activate(self, staticdata) local remove_flag_word = "remove"
-- attach to the nearest maidroid.
local all_objects = minetest.get_objects_inside_radius(self.object:getpos(), 0.1)
for _, obj in ipairs(all_objects) do
local luaentity = obj:get_luaentity()
if maidroid.is_maidroid(luaentity.name) then local function get_staticdata(self)
self.object:set_attach(obj, "Arm_R", {x = 0.065, y = 0.50, z = -0.15}, {x = -45, y = 0, z = 0}) return remove_flag_word
self.object:set_properties{textures={"maidroid:dummy_empty_craftitem"}} end
return
end local function on_activate(self, staticdata)
if staticdata == remove_flag_word then
self.object:remove()
end end
end end
@ -307,15 +305,17 @@ do
end end
minetest.register_entity("maidroid:dummy_item", { minetest.register_entity("maidroid:dummy_item", {
hp_max = 1, hp_max = 1,
visual = "wielditem", visual = "wielditem",
visual_size = {x = 0.025, y = 0.025}, visual_size = {x = 0.025, y = 0.025},
collisionbox = {0, 0, 0, 0, 0, 0}, collisionbox = {0, 0, 0, 0, 0, 0},
physical = false, physical = false,
textures = {"air"}, textures = {"air"},
on_activate = on_activate, on_activate = on_activate,
on_step = on_step, on_step = on_step,
itemname = "", get_staticdata = get_staticdata,
itemname = itemname,
is_initialized = false,
}) })
end end
@ -471,8 +471,6 @@ function maidroid.register_maidroid(product_name, def)
maidroid.manufacturing_data[product_name] = maidroid.manufacturing_data[product_name] + 1 maidroid.manufacturing_data[product_name] = maidroid.manufacturing_data[product_name] + 1
create_inventory(self) create_inventory(self)
-- attach dummy item to new maidroid.
minetest.add_entity(self.object:getpos(), "maidroid:dummy_item")
else else
-- if static data is not empty string, this object has beed already created. -- if static data is not empty string, this object has beed already created.
local data = minetest.deserialize(staticdata) local data = minetest.deserialize(staticdata)
@ -493,6 +491,11 @@ function maidroid.register_maidroid(product_name, def)
text = self.nametag text = self.nametag
} }
-- attach dummy item to new maidroid.
local dummy_item = minetest.add_entity(self.object:getpos(), "maidroid:dummy_item")
dummy_item:set_attach(self.object, "Arm_R", {x = 0.065, y = 0.50, z = -0.15}, {x = -45, y = 0, z = 0})
dummy_item:set_properties{textures={"maidroid:dummy_empty_craftitem"}}
local core = self:get_core() local core = self:get_core()
if core ~= nil then if core ~= nil then
core.on_start(self) core.on_start(self)