diff --git a/README.md b/README.md index 2029075..c965dbf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -vendor -====== +# `easyvend` -Minetest mod: Vending machines \ No newline at end of file +Minetest mod: Vending and depositing machines diff --git a/vendor.lua b/easyvend.lua similarity index 84% rename from vendor.lua rename to easyvend.lua index 8c7e69e..63474d8 100644 --- a/vendor.lua +++ b/easyvend.lua @@ -18,7 +18,7 @@ --Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --- -vendor.set_formspec = function(pos, player) +easyvend.set_formspec = function(pos, player) local meta = minetest.get_meta(pos) local node = minetest.get_node(pos) @@ -39,7 +39,7 @@ vendor.set_formspec = function(pos, player) .."list[current_player;main;0,3;8,4;]") end -vendor.on_receive_fields_owner = function(pos, formname, fields, sender) +easyvend.on_receive_fields_owner = function(pos, formname, fields, sender) local node = minetest.get_node(pos) local meta = minetest.get_meta(pos) @@ -63,10 +63,10 @@ vendor.on_receive_fields_owner = function(pos, formname, fields, sender) end meta:set_string("itemname", itemname) - vendor.set_formspec(pos, sender) + easyvend.set_formspec(pos, sender) end -vendor.on_receive_fields_customer = function(pos, formname, fields, sender) +easyvend.on_receive_fields_customer = function(pos, formname, fields, sender) if not fields.save then return end @@ -77,7 +77,7 @@ vendor.on_receive_fields_customer = function(pos, formname, fields, sender) local cost = meta:get_int("cost") local itemname=meta:get_string("itemname") local buysell = "sell" - if ( node.name == "vendor:depositor" ) then + if ( node.name == "easyvend:depositor" ) then buysell = "buy" end @@ -108,7 +108,7 @@ vendor.on_receive_fields_customer = function(pos, formname, fields, sender) chest_inv:add_item("main", price) player_inv:add_item("main", stack) minetest.chat_send_player(sender:get_player_name(), "You bought item.") - vendor.sound_vend(pos) + easyvend.sound_vend(pos) elseif chest_inv:contains_item("main", stack) and player_inv:contains_item("main", price) then minetest.chat_send_player(sender:get_player_name(), "No room in inventory!") else @@ -122,7 +122,7 @@ vendor.on_receive_fields_customer = function(pos, formname, fields, sender) chest_inv:add_item("main", stack) player_inv:add_item("main", price) minetest.chat_send_player(sender:get_player_name(), "You sold item.") - vendor.sound_deposit(pos) + easyvend.sound_deposit(pos) elseif chest_inv:contains_item("main", price) and player_inv:contains_item("main", stack) then minetest.chat_send_player(sender:get_player_name(), "No room in inventory!") else @@ -143,7 +143,7 @@ vendor.on_receive_fields_customer = function(pos, formname, fields, sender) end -vendor.after_place_node = function(pos, placer) +easyvend.after_place_node = function(pos, placer) local node = minetest.get_node(pos) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() @@ -161,10 +161,10 @@ vendor.after_place_node = function(pos, placer) meta:set_string("owner", placer:get_player_name() or "") - vendor.set_formspec(pos, placer) + easyvend.set_formspec(pos, placer) end -vendor.can_dig = function(pos, player) +easyvend.can_dig = function(pos, player) local chest = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}) local meta_chest = minetest.get_meta({x=pos.x,y=pos.y-1,z=pos.z}); if chest.name=="default:chest_locked" then @@ -181,26 +181,26 @@ vendor.can_dig = function(pos, player) end end -vendor.on_receive_fields = function(pos, formname, fields, sender) +easyvend.on_receive_fields = function(pos, formname, fields, sender) local meta = minetest.get_meta(pos) local owner = meta:get_string("owner") if sender:get_player_name() == owner then - vendor.on_receive_fields_owner(pos, formname, fields, sender) + easyvend.on_receive_fields_owner(pos, formname, fields, sender) else - vendor.on_receive_fields_customer(pos, formname, fields, sender) + easyvend.on_receive_fields_customer(pos, formname, fields, sender) end end -vendor.sound_vend = function(pos) - minetest.sound_play("vendor_vend", {pos = pos, gain = 1.0, max_hear_distance = 5,}) +easyvend.sound_vend = function(pos) + minetest.sound_play("easyvend_vend", {pos = pos, gain = 1.0, max_hear_distance = 5,}) end -vendor.sound_deposit = function(pos) - minetest.sound_play("vendor_deposit", {pos = pos, gain = 1.0, max_hear_distance = 5,}) +easyvend.sound_deposit = function(pos) + minetest.sound_play("easyvend_deposit", {pos = pos, gain = 1.0, max_hear_distance = 5,}) end -vendor.allow_metadata_inventory_put = function(pos, listname, index, stack, player) +easyvend.allow_metadata_inventory_put = function(pos, listname, index, stack, player) if listname=="item" then local meta = minetest.get_meta(pos); local owner = meta:get_string("owner") @@ -217,10 +217,10 @@ vendor.allow_metadata_inventory_put = function(pos, listname, index, stack, play return 0 end -vendor.allow_metadata_inventory_take = function(pos, listname, index, stack, player) +easyvend.allow_metadata_inventory_take = function(pos, listname, index, stack, player) return 0 end -vendor.allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) +easyvend.allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) return 0 end diff --git a/init.lua b/init.lua index 7d7c15b..25e0765 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,6 @@ --- ---vendor 1.01 ---Copyright (C) 2012 Bad_Command +--easyvend +--Copyright (C) 2012 Bad_Command, 2016 Wuzzy -- --This library is free software; you can redistribute it and/or --modify it under the terms of the GNU Lesser General Public @@ -17,45 +17,45 @@ --Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --- -vendor = {} -vendor.version = 1.02 +easyvend = {} +easyvend.version = 1.02 -dofile(minetest.get_modpath("vendor") .. "/vendor.lua") +dofile(minetest.get_modpath("easyvend") .. "/easyvend.lua") -minetest.register_node("vendor:vendor", { +minetest.register_node("easyvend:vendor", { description = "Vending Machine", - tile_images ={"vendor_side.png", "vendor_side.png", "vendor_side.png", - "vendor_side.png", "vendor_side.png", "vendor_vendor_front.png"}, + tile_images ={"easyvend_side.png", "easyvend_side.png", "easyvend_side.png", + "easyvend_side.png", "easyvend_side.png", "easyvend_vendor_front.png"}, paramtype = "light", paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - after_place_node = vendor.after_place_node, - can_dig = vendor.can_dig, - on_receive_fields = vendor.on_receive_fields, - allow_metadata_inventory_put = vendor.allow_metadata_inventory_put, - allow_metadata_inventory_take = vendor.allow_metadata_inventory_take, - allow_metadata_inventory_move = vendor.allow_metadata_inventory_move, + after_place_node = easyvend.after_place_node, + can_dig = easyvend.can_dig, + on_receive_fields = easyvend.on_receive_fields, + allow_metadata_inventory_put = easyvend.allow_metadata_inventory_put, + allow_metadata_inventory_take = easyvend.allow_metadata_inventory_take, + allow_metadata_inventory_move = easyvend.allow_metadata_inventory_move, }) -minetest.register_node("vendor:depositor", { +minetest.register_node("easyvend:depositor", { description = "Depositing Machine", - tile_images ={"vendor_side.png", "vendor_side.png", "vendor_side.png", - "vendor_side.png", "vendor_side.png", "vendor_depositor_front.png"}, + tile_images ={"easyvend_side.png", "easyvend_side.png", "easyvend_side.png", + "easyvend_side.png", "easyvend_side.png", "easyvend_depositor_front.png"}, paramtype = "light", paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - after_place_node = vendor.after_place_node, - can_dig = vendor.can_dig, - on_receive_fields = vendor.on_receive_fields, - allow_metadata_inventory_put = vendor.allow_metadata_inventory_put, - allow_metadata_inventory_take = vendor.allow_metadata_inventory_take, - allow_metadata_inventory_move = vendor.allow_metadata_inventory_move, + after_place_node = easyvend.after_place_node, + can_dig = easyvend.can_dig, + on_receive_fields = easyvend.on_receive_fields, + allow_metadata_inventory_put = easyvend.allow_metadata_inventory_put, + allow_metadata_inventory_take = easyvend.allow_metadata_inventory_take, + allow_metadata_inventory_move = easyvend.allow_metadata_inventory_move, }) minetest.register_craft({ - output = 'vendor:vendor', + output = 'easyvend:vendor', recipe = { {'default:wood', 'default:wood', 'default:wood'}, {'default:wood', 'default:steel_ingot', 'default:wood'}, @@ -64,10 +64,10 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'vendor:depositor', + output = 'easyvend:depositor', recipe = { {'default:wood', 'default:steel_ingot', 'default:wood'}, {'default:wood', 'default:steel_ingot', 'default:wood'}, {'default:wood', 'default:wood', 'default:wood'}, } -}) \ No newline at end of file +}) diff --git a/mod.conf b/mod.conf new file mode 100644 index 0000000..2630f31 --- /dev/null +++ b/mod.conf @@ -0,0 +1 @@ +name = easyvend diff --git a/sounds/vendor_deposit.ogg b/sounds/easyvend_deposit.ogg similarity index 100% rename from sounds/vendor_deposit.ogg rename to sounds/easyvend_deposit.ogg diff --git a/sounds/vendor_vend.ogg b/sounds/easyvend_vend.ogg similarity index 100% rename from sounds/vendor_vend.ogg rename to sounds/easyvend_vend.ogg diff --git a/textures/vendor_depositor_front.png b/textures/easyvend_depositor_front.png similarity index 100% rename from textures/vendor_depositor_front.png rename to textures/easyvend_depositor_front.png diff --git a/textures/vendor_depositor_front.xcf b/textures/easyvend_depositor_front.xcf similarity index 100% rename from textures/vendor_depositor_front.xcf rename to textures/easyvend_depositor_front.xcf diff --git a/textures/vendor_side.png b/textures/easyvend_side.png similarity index 100% rename from textures/vendor_side.png rename to textures/easyvend_side.png diff --git a/textures/vendor_vendor_front.png b/textures/easyvend_vendor_front.png similarity index 100% rename from textures/vendor_vendor_front.png rename to textures/easyvend_vendor_front.png diff --git a/textures/vendor_vendor_front.xcf b/textures/easyvend_vendor_front.xcf similarity index 100% rename from textures/vendor_vendor_front.xcf rename to textures/easyvend_vendor_front.xcf