From bb590d0141bc356b6e4b2b68552fcb37c4e06012 Mon Sep 17 00:00:00 2001
From: d <d>
Date: Wed, 1 Jun 2016 11:15:14 +0900
Subject: [PATCH] Update

---
 .DS_Store                     | Bin 6148 -> 0 bytes
 api.lua                       |  32 +++++++++++---------------------
 maidroids/maidroid.lua        |   3 ---
 modules/_aux.lua              |   7 +++++--
 modules/farming_module.lua    |   4 ++++
 modules/lumberjack_module.lua |   4 ++++
 6 files changed, 24 insertions(+), 26 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 maidroids/maidroid.lua

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 14a15a24afedb9e3f39906eb9ebcaa9ad3a319ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKISv9b4733uBpOP}e1RWC2wt!spa9WuNFb=U;$1wA@zKCS2Mroa&LoZ}QKne0
zMMUS9^-N?UA|tq=+-&HY?VES3mk|ZRamG&0*XDHC9S_@1_WOWwhq9NWtY!1Uw>=sa
zpaN8Y3Qz$m@LdJ6zK+J<J(j0Y0V?nZ3fT9dzzu6+8|a@74Bi3&2MD`i?!5%CSO8cP
z+dxEM8dP9VHCqe~I^resYGNB0bkS@+G;h}IP}Fb7`Nh*kYamA|Kn0!^=*Mzm^?wQf
z(EmS^xS|47;I9<W!J=8r@uaM+oyS?NE$|iGa_(?5%$<V4%Q4W)F&0*ir=Apf#pc+r
ViEW_M5qCO}KLe%<jSBo)fd`@H6{-LL

diff --git a/api.lua b/api.lua
index dea0918..feeba9e 100644
--- a/api.lua
+++ b/api.lua
@@ -87,19 +87,24 @@ function maidroid.register_maidroid(product_name, def)
       })
       inv:set_size(main_invname, main_invsize)
       inv:set_size(module_invname, module_invsize)
-      if self.module then self.module.initialize(self) end
       -- process staticdata
       if staticdata ~= "" then
 	local data = minetest.deserialize(staticdata)
-	local stack = ItemStack(data.inv.module)
-	stack:set_count(1)
-	inv:add_item(module_invname, stack)
+	if data.inv.module ~= "" then
+	  module_stack = ItemStack(data.inv.module)
+	  module_stack:set_count(1)
+	  inv:add_item(module_invname, module_stack)
+	  self.module = maidroid.registered_modules[data.inv.module]
+	end
 	for _, item in ipairs(data.inv.main) do
 	  local itemstack = ItemStack(item.name)
 	  itemstack:set_count(item.count)
 	  inv:add_item(main_invname, itemstack)
 	end
       end
+      -- initialize module
+      if self.module then self.module.initialize(self)
+      else self.object:setvelocity{x = 0, y = 0, z = 0} end
     end,
     on_step = function(self, dtime)
       if self.module then self.module.on_step(self, dtime) end
@@ -119,7 +124,8 @@ function maidroid.register_maidroid(product_name, def)
       local inv = _aux.get_maidroid_inventory(self)
       local staticdata = {}
       staticdata.inv = {}
-      staticdata.inv.module = inv:get_list(module_invname)[1]:get_name()
+      local module_name = inv:get_list(module_invname)[1]:get_name()
+      staticdata.inv.module = module_name or ""
       staticdata.inv.main = {}
       for _, item in ipairs(inv:get_list(main_invname)) do
 	local count = item:get_count()
@@ -140,20 +146,4 @@ function maidroid.register_maidroid(product_name, def)
       return itemstack
     end
   })
-  -- 野生のmaidroidのentityの登録
-  minetest.register_entity(product_name.."_wild", {
-    hp_max = def.hp_max or 1,
-    physical = true,
-    weight = def.weight or 5,
-    on_activate = function(self, staticdata)
-    end,
-    on_step = function(self, dtime)
-    end,
-    on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir)
-    end,
-    on_rightclick = function(self, clicker)
-    end,
-    get_staticdata = function(self)
-    end,
-  })
 end
diff --git a/maidroids/maidroid.lua b/maidroids/maidroid.lua
deleted file mode 100644
index b28b04f..0000000
--- a/maidroids/maidroid.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/modules/_aux.lua b/modules/_aux.lua
index 7577f43..ad9362b 100644
--- a/modules/_aux.lua
+++ b/modules/_aux.lua
@@ -45,9 +45,9 @@ function maidroid.modules._aux.get_upper_pos(vec)
 end
 
 -- 落ちているアイテムを拾う
-function maidroid.modules._aux.get_item(self, radius, target_pred)
+function maidroid.modules._aux.pickup_item(self, radius, target_pred)
   local pos = self.object:getpos()
-  local pred = target_list or (function() return true end)
+  local pred = target_list or (function(itemstring) return true end)
   local all_objects = minetest.get_objects_inside_radius(pos, radius)
   for _, obj in ipairs(all_objects) do
     if not obj:is_player() and obj:get_luaentity() then
@@ -57,6 +57,9 @@ function maidroid.modules._aux.get_item(self, radius, target_pred)
 	  local inv = maidroid._aux.get_maidroid_inventory(self)
 	  local stack = ItemStack(itemstring)
 	  local leftover = inv:add_item("main", stack)
+	  minetest.add_item(obj:getpos(), leftover)
+	  obj:get_luaentity().itemstring = ""
+	  obj:remove()
 	end
       end
     end
diff --git a/modules/farming_module.lua b/modules/farming_module.lua
index 0625768..4817eb6 100644
--- a/modules/farming_module.lua
+++ b/modules/farming_module.lua
@@ -78,6 +78,10 @@ maidroid.register_module("maidroid:farming_module", {
 	self.object:set_animation(maidroid.animations.mine, 15, 0)
 	self.object:setvelocity{x = 0, y = 0, z = 0}
       end
+      -- 種を広い集める
+      _aux.pickup_item(self, 1.5, function(itemstring)
+        return minetest.get_item_group(itemstring, "seed") > 0
+      end)
     elseif self.state == state.punch then
       if self.time_count >= max_punch_time then
 	if maidroid.util.table_find_value(target_plants_list, forward_node.name) then
diff --git a/modules/lumberjack_module.lua b/modules/lumberjack_module.lua
index 5ddf0cc..c70deb5 100644
--- a/modules/lumberjack_module.lua
+++ b/modules/lumberjack_module.lua
@@ -80,6 +80,10 @@ maidroid.register_module("maidroid:lumberjack", {
 	self.object:set_animation(maidroid.animations.mine, 15, 0)
 	self.object:setvelocity{x = 0, y = 0, z = 0}
       end
+      -- 苗木を拾い集める
+      _aux.pickup_item(self, 1.5, function(itemstring)
+	return util.table_find_value(target_sapling_list, itemstring) 
+      end)
     elseif self.state == state.punch then
       if self.time_count >= max_punch_time then
 	local punch_flag, forward_upper_pos, forward_upper_node