From 4c11d3ce2edd0bc0fd45795069ec45e038229360 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Sat, 11 Feb 2017 21:24:30 -0700 Subject: add support for intllib and loot mods --- shop.lua | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'shop.lua') diff --git a/shop.lua b/shop.lua index 08bfac7..07209e8 100644 --- a/shop.lua +++ b/shop.lua @@ -1,33 +1,37 @@ +-- internationalization boilerplate +local MP = minetest.get_modpath(minetest.get_current_modname()) +local S, NS = dofile(MP.."/intllib.lua") + default.shop = {} default.shop.current_shop = {} default.shop.formspec = { customer = function(pos) local list_name = "nodemeta:"..pos.x..','..pos.y..','..pos.z local formspec = "size[8,9.5]".. - "label[0,0;Customer gives (pay here !)]".. + "label[0,0;" .. S("Customer gives (pay here!)") .. "]".. "list[current_player;customer_gives;0,0.5;3,2;]".. - "label[0,2.5;Customer gets]".. + "label[0,2.5;" .. S("Customer gets:") .. "]".. "list[current_player;customer_gets;0,3;3,2;]".. - "label[5,0;Owner wants]".. + "label[5,0;" .. S("Owner wants:") .. "]".. "list["..list_name..";owner_wants;5,0.5;3,2;]".. - "label[5,2.5;Owner gives]".. + "label[5,2.5;" .. S("Owner gives:") .. "]".. "list["..list_name..";owner_gives;5,3;3,2;]".. "list[current_player;main;0,5.5;8,4;]".. - "button[3,2;2,1;exchange;Exchange]" + "button[3,2;2,1;exchange;" .. S("Exchange") .. "]" return formspec end, owner = function(pos) local list_name = "nodemeta:"..pos.x..','..pos.y..','..pos.z local formspec = "size[8,9.5]".. - "label[0,0;Customers gave:]".. + "label[0,0;" .. S("Customers gave:") .. "]".. "list["..list_name..";customers_gave;0,0.5;3,2;]".. - "label[0,2.5;Your stock:]".. + "label[0,2.5;" .. S("Your stock:") .. "]".. "list["..list_name..";stock;0,3;3,2;]".. - "label[5,0;You want:]".. + "label[5,0;" .. S("You want:") .. "]".. "list["..list_name..";owner_wants;5,0.5;3,2;]".. - "label[5,2.5;In exchange, you give:]".. + "label[5,2.5;" .. S("In exchange, you give:") .. "]".. "list["..list_name..";owner_gives;5,3;3,2;]".. - "label[0,5;Owner, Use(E)+Place(RMB) for customer interface]".. + "label[0,5;" .. S("Owner, Use (E)+Place (right mouse button) for customer interface") .. "]".. "list[current_player;main;0,5.5;8,4;]" return formspec end, @@ -81,10 +85,10 @@ default.shop.exchange = function(meta) end minetest.register_node("currency:shop", { - description = "Shop", + description = S("Shop"), paramtype2 = "facedir", tiles = {"shop_top.png", - "shop_top.png", + "shop_top.png", "shop_side.png", "shop_side.png", "shop_side.png", @@ -95,7 +99,7 @@ minetest.register_node("currency:shop", { after_place_node = function(pos, placer, itemstack) local owner = placer:get_player_name() local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Exchange shop (owned by "..owner..")") + meta:set_string("infotext", S("Exchange shop (owned by @1)", owner)) meta:set_string("owner",owner) --[[meta:set_string("pl1","") meta:set_string("pl2","")]] @@ -144,7 +148,7 @@ minetest.register_on_player_receive_fields(function(sender, formname, fields) local pos = default.shop.current_shop[name] local meta = minetest.get_meta(pos) if meta:get_string("owner") == name then - minetest.chat_send_player(name,"This is your own shop, you can't exchange to yourself !") + minetest.chat_send_player(name,S("This is your own shop, you can't exchange to yourself!")) else local minv = meta:get_inventory() local pinv = sender:get_inventory() @@ -181,12 +185,12 @@ minetest.register_on_player_receive_fields(function(sender, formname, fields) minv:remove_item("stock",item) pinv:add_item("customer_gets",item) end - minetest.chat_send_player(name,"Exchanged!") + minetest.chat_send_player(name,S("Exchanged!")) else if owners_fault then - minetest.chat_send_player(name,"Exchange can not be done, contact the shop owner.") + minetest.chat_send_player(name,S("Exchange can not be done, contact the shop owner.")) else - minetest.chat_send_player(name,"Exchange can not be done, check if you put all items !") + minetest.chat_send_player(name,S("Exchange can not be done, check if you put all items!")) end end end -- cgit v1.2.3 From 70e998e04019e3f9a2f2aace05ca826b1afbca46 Mon Sep 17 00:00:00 2001 From: Carter Kolwey Date: Wed, 22 Mar 2017 19:39:44 -0500 Subject: Add pipeworks support to shop Tubes place items into "Your Stock", and filters (must be owned by the shop owner) take from "Customers Gave" --- shop.lua | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'shop.lua') diff --git a/shop.lua b/shop.lua index 08bfac7..36765a3 100644 --- a/shop.lua +++ b/shop.lua @@ -90,7 +90,7 @@ minetest.register_node("currency:shop", { "shop_side.png", "shop_front.png"}, inventory_image = "shop_front.png", - groups = {choppy=2,oddly_breakable_by_hand=2}, + groups = {choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1}, sounds = default.node_sound_wood_defaults(), after_place_node = function(pos, placer, itemstack) local owner = placer:get_player_name() @@ -104,7 +104,23 @@ minetest.register_node("currency:shop", { inv:set_size("stock", 3*2) inv:set_size("owner_wants", 3*2) inv:set_size("owner_gives", 3*2) + if minetest.get_modpath("pipeworks") then pipeworks.after_place(pos) end end, + after_dig_node = (pipeworks and pipeworks.after_dig), + tube = { + insert_object = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:add_item("stock",stack) + end, + can_insert = function(pos,node,stack,direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:room_for_item("stock", stack) + end, + input_inventory = "customers_gave", + connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1} + }, on_rightclick = function(pos, node, clicker, itemstack) clicker:get_inventory():set_size("customer_gives", 3*2) clicker:get_inventory():set_size("customer_gets", 3*2) -- cgit v1.2.3 From 85a74f32ac56859f0dfe0962bf8cc2d323334733 Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Mon, 15 May 2017 16:07:08 -0700 Subject: Test for global 'pipeworks' before calling --- shop.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'shop.lua') diff --git a/shop.lua b/shop.lua index 36765a3..a11bdbc 100644 --- a/shop.lua +++ b/shop.lua @@ -33,6 +33,8 @@ default.shop.formspec = { end, } +local have_pipeworks = minetest.global_exists("pipeworks") + default.shop.check_privilege = function(listname,playername,meta) --[[if listname == "pl1" then if playername ~= meta:get_string("pl1") then @@ -104,9 +106,9 @@ minetest.register_node("currency:shop", { inv:set_size("stock", 3*2) inv:set_size("owner_wants", 3*2) inv:set_size("owner_gives", 3*2) - if minetest.get_modpath("pipeworks") then pipeworks.after_place(pos) end + if have_pipeworks then pipeworks.after_place(pos) end end, - after_dig_node = (pipeworks and pipeworks.after_dig), + after_dig_node = (have_pipeworks and pipeworks and pipeworks.after_dig), tube = { insert_object = function(pos, node, stack, direction) local meta = minetest.get_meta(pos) -- cgit v1.2.3