From 5051654528a2dedef596a46fd71fbf4a22391083 Mon Sep 17 00:00:00 2001 From: tacigar Date: Wed, 1 Jun 2016 20:51:15 +0900 Subject: [PATCH] Update --- api.lua | 2 +- maidroids.lua | 2 ++ models/maidroid_mk2.png | Bin 0 -> 1005 bytes models/maidroid_mk3.png | Bin 0 -> 990 bytes modules/_aux.lua | 2 +- modules/farming_module.lua | 3 ++- 6 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 models/maidroid_mk2.png create mode 100644 models/maidroid_mk3.png diff --git a/api.lua b/api.lua index feeba9e..ab79de4 100644 --- a/api.lua +++ b/api.lua @@ -142,7 +142,7 @@ function maidroid.register_maidroid(product_name, def) minetest.register_craftitem(product_name.."_swawn_egg", { description = def.description.." Swapn Egg", on_use = function(itemstack, user, pointed_thing) - minetest.add_entity(pointed_thing.above, "maidroid:maidroid") + minetest.add_entity(pointed_thing.above, product_name) return itemstack end }) diff --git a/maidroids.lua b/maidroids.lua index 59a29b6..652048c 100644 --- a/maidroids.lua +++ b/maidroids.lua @@ -11,9 +11,11 @@ maidroid.register_maidroid("maidroid:maidroid", { maidroid.register_maidroid("maidroid:maidroid_mk2", { hp_max = 10, description = "Maidroid : Maidroid MkII", + textures = {"maidroid_mk2.png"}, }) maidroid.register_maidroid("maidroid:maidroid_mk3", { hp_max = 10, description = "Maidroid : Maidroid MkIII", + textures = {"maidroid_mk3.png"}, }) diff --git a/models/maidroid_mk2.png b/models/maidroid_mk2.png new file mode 100644 index 0000000000000000000000000000000000000000..97690e101dd7ec8bd203eabad23d58dd24b328f2 GIT binary patch literal 1005 zcmV|~z8DG|GDhg|Srm)S_9e@AyZtZ#h#_RY+j*)i>Rn)%JY?|r|2-<#0x z#)=65Ohil+SQ4_?3Z5CHIIB30vW>gdMq#!8(pj3aIb&Y)?ULVu;CdjrVROYLG( zoSUD%$^q0gt>(Nxrg~#Ae6GvWig**{4Q~|GT+#3z;=Z9tVbaPbyI-TkxcM5+K|TdK z&(z-|VvZ8y=2PZ#V~zmUw@k7ReZXX;OjMasSwT~I^#b9SwJ5MnTZp#5=!5Kz1 z*;Q4wt~r4ZjKPt;5Khk)Av&kvC@?Sfp#OB^04WO;5P!~s<5~3E;6?U$?z?sTBox{Q zNXHRnjvY^$rqzUz1*+@1=h5ZWLR1f06?^Gypda{rLVf{j?^fzYW;kd-2ij&10_^&h zSxu9HfojSW3Lu1_RjqA5f65<(LgW7stbUlAS>2Rky>DpJDn8bieSW{jH?YTW!)k^C zleI-H17H}_RG!TiEg#!C4o&jsb5nxxIc4=&b{GT#kPWE}o9WS~LO(B3SY^(t8dreX zoruHL2(mjstJ;M`s<%#9XqpCX)P2$OxiQ;`$UZlp(a#dBWx$S0sLzA#m_ELIKCYf1~)3Ze@+>~KD-)Rc)`wu(S<4F(7 zf~5BnLh69<@1O**!k1Mw(v!rGFy%MxJTSK&2mp#x{_$dUWH9ELMcMY#acp~kqs3Ho zScV0f@PrV|=fxB8gP)>V{nbl3tYDP4- zo!(I?=`~|d@$zD^&plMb`6AjAH}P$G4gk=e=*R2)D`alO8F0AW#a1X(aMtDC5lbo4}FiL4+X^ah+NMh8`SW!YE zbh0ZDjm2SQ_F`g`gloJ@EVS7|Dh*fNjm0s`?A+|`%(5u{WRjh~v%7EK{6GKAXsxPimByINyn5kPm^8!R|34 z<|r|7zRdReLL`9C-$~^C(V@l2`<7)TN)BpTpD{+_22EYNB=lE4e8s)1jmT%8EbkmwH!1`p%_vfwSoQ?k(6Ot-)UXv_a9-Z zM@bLLf}~?D%jyEczk?FM3SU;$NLP|1!j#{%^T6WPzz%~E@yCnR`I)>ji(z()OP<`h zgX4`BqcL?E7HGg*mWA#01*tzzO%K|(P59|^9LN9r?T!2K>ty5?n&D%#CQ7r*fl9(3 z&*`GrI+cx()(ke)ZD&+Krvi>wKu5m!mA3$ZK4UCURp?$PqjCx*E3x84MpO;wH(|QW zi)oAUMcHn}#XzC#_Xi4P>{eX$lZ7PbcQRHi7SYP?1NhcCQ_Sw8STq1MV{3CJEHPBp zI~jYmQUlP-TpO|V831%qa-^9s?fM?tjVdOGj<=taL%nD>s!}2H2PhNXDXw5QcK`qY M07*qoM6N<$g5H(TyZ`_I literal 0 HcmV?d00001 diff --git a/modules/_aux.lua b/modules/_aux.lua index ad9362b..3978db6 100644 --- a/modules/_aux.lua +++ b/modules/_aux.lua @@ -47,7 +47,7 @@ end -- 落ちているアイテムを拾う function maidroid.modules._aux.pickup_item(self, radius, target_pred) local pos = self.object:getpos() - local pred = target_list or (function(itemstring) return true end) + local pred = target_pred 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 diff --git a/modules/farming_module.lua b/modules/farming_module.lua index 4817eb6..9968de4 100644 --- a/modules/farming_module.lua +++ b/modules/farming_module.lua @@ -72,7 +72,7 @@ maidroid.register_module("maidroid:farming_module", { elseif pos.x == self.preposition.x or pos.z == self.preposition.z then _aux.change_dir(self) elseif forward_node.name == "air" - and minetest.get_item_group(inetest.get_node(forward_under_pos).name, "wet") > 0 + and minetest.get_item_group(minetest.get_node(forward_under_pos).name, "wet") > 0 and has_seed_item(self) then self.state = state.plant self.object:set_animation(maidroid.animations.mine, 15, 0) @@ -85,6 +85,7 @@ maidroid.register_module("maidroid:farming_module", { 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 + minetest.remove_node(forward_pos) local inv = minetest.get_inventory{type = "detached", name = self.invname} local stacks = minetest.get_node_drops(forward_node.name) for _, stack in ipairs(stacks) do