diff --git a/init.lua b/init.lua index d32a297..857292c 100644 --- a/init.lua +++ b/init.lua @@ -12,7 +12,7 @@ dofile(modpath.."/item_strongbox.lua") dofile(modpath.."/item_miner_cash.lua") --- dofile(modpath.."/item_barter_table.lua") +dofile(modpath.."/item_barter_table.lua") dofile(modpath.."/item_dispensing_machine.lua") -- --dofile(path.."/item_rent_door.lua") diff --git a/item_barter_table.lua b/item_barter_table.lua index cf99967..213e954 100644 --- a/item_barter_table.lua +++ b/item_barter_table.lua @@ -1,52 +1,32 @@ -lunotrades.balcaodeescambo = {} -lunotrades.balcaodeescambo.formspec = { ---[[ - main = "size[8,9]".. - "list[current_name;pl1;0,0;3,4;]".. - "list[current_name;pl2;5,0;3,4;]".. - "list[current_player;main;0,5;8,4;]", - pl1 = { - start = "button[3,1;2,1;pl1_start;Oferecer]", - player = function(name) return "label[3,0;"..name.."]" end, - accept1 = "button[3,1;2,1;pl1_accept1;Confirmar]".. - "button[3,2;2,1;pl1_cancel;Cancelar]", - accept2 = "button[3,1;2,1;pl1_accept2;Trocar]".. - "button[3,2;2,1;pl1_cancel;Cancelar]", - }, - pl2 = { - start = "button[4,1;2,1;pl2_start;Oferecer]", - player = function(name) return "label[4,0;"..name.."]" end, - accept1 = "button[4,1;2,1;pl2_accept1;Confirmar]".. - "button[4,2;2,1;pl2_cancel;Cancelar]", - accept2 = "button[4,1;2,1;pl2_accept2;Trocar]".. - "button[4,2;2,1;pl2_cancel;Cancelar]", - }, ---]] - main = "size[10,9.5]".. - "label[3.5,0;MESA DE ESCAMBO (P2P)]".. - "list[current_name;pl1;0,1;3,4;]".. - "list[current_name;pl2;7,1;3,4;]".. - "label[1,5;Seu inventario:]".. - "list[current_player;main;1,5.5;8,4;]", - pl1 = { - start = "button[3,1;2.0,1;pl1_start;Abrir]", - player = function(name) return "label[0,0.5;"..name.." oferece:]" end, - accept1 = "button[3,1;2,1;pl1_accept1;Oferecer]".. - "button[3,2;2,1;pl1_cancel;Cancelar]", - accept2 = "button[3,1;2,1;pl1_accept2;Confirmar]".. - "button[3,2;2,1;pl1_cancel;Cancelar]", - }, - pl2 = { - start = "button[5,1;2.0,1;pl2_start;Abrir]", - player = function(name) return "label[7,0.5;"..name.." oferece:]" end, - accept1 = "button[5,1;2,1;pl2_accept1;Oferecer]".. - "button[5,2;2,1;pl2_cancel;Cancelar]", - accept2 = "button[5,1;2,1;pl2_accept2;Confirmar]".. - "button[5,2;2,1;pl2_cancel;Cancelar]", - }, +modMinerTrade.bartertable = { + formspec = { + main = "size[10,9.5]".. + "label[3.5,0;MESA DE ESCAMBO\n(Jogador para Jogador)]".. + "list[current_name;pl1;0,1;3,4;]".. + "list[current_name;pl2;7,1;3,4;]".. + "label[1,5;Seu inventario:]".. + "list[current_player;main;1,5.5;8,4;]", + pl1 = { + start = "button[3,1;2.0,1;pl1_start;Abrir]", + player = function(name) return "label[0,0.5;"..name.." oferece:]" end, + accept1 = "button[3,1;2,1;pl1_accept1;Oferecer]".. + "button[3,2;2,1;pl1_cancel;Cancelar]", + accept2 = "button[3,1;2,1;pl1_accept2;Confirmar]".. + "button[3,2;2,1;pl1_cancel;Cancelar]", + }, + pl2 = { + start = "button[5,1;2.0,1;pl2_start;Abrir]", + player = function(name) return "label[7,0.5;"..name.." oferece:]" end, + accept1 = "button[5,1;2,1;pl2_accept1;Oferecer]".. + "button[5,2;2,1;pl2_cancel;Cancelar]", + accept2 = "button[5,1;2,1;pl2_accept2;Confirmar]".. + "button[5,2;2,1;pl2_cancel;Cancelar]", + }, + } } -lunotrades.balcaodeescambo.getPrivilegios = function(listname,playername,meta) + +modMinerTrade.bartertable.getPrivilegios = function(listname,playername,meta) if listname == "pl1" then if playername ~= meta:get_string("pl1") then return false @@ -64,26 +44,26 @@ lunotrades.balcaodeescambo.getPrivilegios = function(listname,playername,meta) return true end -lunotrades.balcaodeescambo.update_formspec = function(meta) - local formspec = lunotrades.balcaodeescambo.formspec.main --10:18:33: ERROR[ServerThread]: Assignment to undeclared global "formspec" inside a function at /home/lunovox/.minetest/mods/lunotrades/balcaodeescambo.lua:68. +modMinerTrade.bartertable.update_formspec = function(meta) + local formspec = modMinerTrade.bartertable.formspec.main --10:18:33: ERROR[ServerThread]: Assignment to undeclared global "formspec" inside a function at /home/lunovox/.minetest/mods/lunotrades/bartertable.lua:68. local pl_formspec = function (n) if meta:get_int(n.."step")==0 then - formspec = formspec .. lunotrades.balcaodeescambo.formspec[n].start + formspec = formspec .. modMinerTrade.bartertable.formspec[n].start else - formspec = formspec .. lunotrades.balcaodeescambo.formspec[n].player(meta:get_string(n)) + formspec = formspec .. modMinerTrade.bartertable.formspec[n].player(meta:get_string(n)) if meta:get_int(n.."step") == 1 then - formspec = formspec .. lunotrades.balcaodeescambo.formspec[n].accept1 + formspec = formspec .. modMinerTrade.bartertable.formspec[n].accept1 elseif meta:get_int(n.."step") == 2 then - formspec = formspec .. lunotrades.balcaodeescambo.formspec[n].accept2 + formspec = formspec .. modMinerTrade.bartertable.formspec[n].accept2 end end end - pl_formspec("pl1") --10:18:33: ERROR[ServerThread]: Assignment to undeclared global "pl_formspec" inside a function at /home/lunovox/.minetest/mods/lunotrades/balcaodeescambo.lua:80. + pl_formspec("pl1") --10:18:33: ERROR[ServerThread]: Assignment to undeclared global "pl_formspec" inside a function at /home/lunovox/.minetest/mods/lunotrades/bartertable.lua:80. pl_formspec("pl2") meta:set_string("formspec",formspec) end -lunotrades.balcaodeescambo.getInventario = function(inv,list,playername) +modMinerTrade.bartertable.getInventario = function(inv,list,playername) local player = minetest.env:get_player_by_name(playername) if player then for k,v in ipairs(inv:get_list(list)) do @@ -93,26 +73,26 @@ lunotrades.balcaodeescambo.getInventario = function(inv,list,playername) end end -lunotrades.balcaodeescambo.cancel = function(meta) - lunotrades.balcaodeescambo.getInventario(meta:get_inventory(),"pl1",meta:get_string("pl1")) - lunotrades.balcaodeescambo.getInventario(meta:get_inventory(),"pl2",meta:get_string("pl2")) +modMinerTrade.bartertable.cancel = function(meta) + modMinerTrade.bartertable.getInventario(meta:get_inventory(),"pl1",meta:get_string("pl1")) + modMinerTrade.bartertable.getInventario(meta:get_inventory(),"pl2",meta:get_string("pl2")) meta:set_string("pl1","") meta:set_string("pl2","") meta:set_int("pl1step",0) meta:set_int("pl2step",0) end -lunotrades.balcaodeescambo.exchange = function(meta) - lunotrades.balcaodeescambo.getInventario(meta:get_inventory(),"pl1",meta:get_string("pl2")) - lunotrades.balcaodeescambo.getInventario(meta:get_inventory(),"pl2",meta:get_string("pl1")) +modMinerTrade.bartertable.exchange = function(meta) + modMinerTrade.bartertable.getInventario(meta:get_inventory(),"pl1",meta:get_string("pl2")) + modMinerTrade.bartertable.getInventario(meta:get_inventory(),"pl2",meta:get_string("pl1")) meta:set_string("pl1","") meta:set_string("pl2","") meta:set_int("pl1step",0) meta:set_int("pl2step",0) end -minetest.register_node("lunotrades:balcaodeescambo", { - description = "Mesa de Escambo (Player to Player)", +minetest.register_node("minertrade:bartertable", { + description = "Mesa de Escambo (Jogador para Jogador)", tiles = {"balcao_topo.png", "balcao1_baixo.png", "balcao1_lado.png"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), @@ -121,7 +101,7 @@ minetest.register_node("lunotrades:balcaodeescambo", { meta:set_string("infotext", "Mesa de Escambo (Player to Player)") meta:set_string("pl1","") meta:set_string("pl2","") - lunotrades.balcaodeescambo.update_formspec(meta) + modMinerTrade.bartertable.update_formspec(meta) local inv = meta:get_inventory() inv:set_size("pl1", 3*4) inv:set_size("pl2", 3*4) @@ -146,60 +126,49 @@ minetest.register_node("lunotrades:balcaodeescambo", { if meta:get_int(n.."step")==2 and fields[n.."_accept2"] then minetest.sound_play("sfx_alert", {object=sender, max_hear_distance=5.0,}) meta:set_int(n.."step",3) - if n == "pl1" and meta:get_int("pl2step") == 3 then lunotrades.balcaodeescambo.exchange(meta) end - if n == "pl2" and meta:get_int("pl1step") == 3 then lunotrades.balcaodeescambo.exchange(meta) end + if n == "pl1" and meta:get_int("pl2step") == 3 then modMinerTrade.bartertable.exchange(meta) end + if n == "pl2" and meta:get_int("pl1step") == 3 then modMinerTrade.bartertable.exchange(meta) end end if fields[n.."_cancel"] then minetest.sound_play("sfx_alert", {object=sender, max_hear_distance=5.0,}) - lunotrades.balcaodeescambo.cancel(meta) + modMinerTrade.bartertable.cancel(meta) end end end - pl_receive_fields("pl1") --10:18:33: ERROR[ServerThread]: Assignment to undeclared global "pl_receive_fields" inside a function at /home/lunovox/.minetest/mods/lunotrades/balcaodeescambo.lua:156. + pl_receive_fields("pl1") --10:18:33: ERROR[ServerThread]: Assignment to undeclared global "pl_receive_fields" inside a function at /home/lunovox/.minetest/mods/lunotrades/bartertable.lua:156. pl_receive_fields("pl2") -- End - lunotrades.balcaodeescambo.update_formspec(meta) + modMinerTrade.bartertable.update_formspec(meta) end, allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) local meta = minetest.env:get_meta(pos) - if not lunotrades.balcaodeescambo.getPrivilegios(from_list,player:get_player_name(),meta) then return 0 end - if not lunotrades.balcaodeescambo.getPrivilegios(to_list,player:get_player_name(),meta) then return 0 end + if not modMinerTrade.bartertable.getPrivilegios(from_list,player:get_player_name(),meta) then return 0 end + if not modMinerTrade.bartertable.getPrivilegios(to_list,player:get_player_name(),meta) then return 0 end return count end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) local meta = minetest.env:get_meta(pos) - if not lunotrades.balcaodeescambo.getPrivilegios(listname,player:get_player_name(),meta) then return 0 end + if not modMinerTrade.bartertable.getPrivilegios(listname,player:get_player_name(),meta) then return 0 end return stack:get_count() end, allow_metadata_inventory_take = function(pos, listname, index, stack, player) local meta = minetest.env:get_meta(pos) - if not lunotrades.balcaodeescambo.getPrivilegios(listname,player:get_player_name(),meta) then return 0 end + if not modMinerTrade.bartertable.getPrivilegios(listname,player:get_player_name(),meta) then return 0 end return stack:get_count() end, }) ---[[ minetest.register_craft({ - output = 'lunotrades:balcaodeescambo', - recipe = { - {"group:wood" ,"group:wood" ,"group:wood"}, - {"default:stick" ,"wool:red" ,"default:stick"}, - {"default:stick" ,"wool:red" ,"default:stick"}, - } -}) -]]-- -minetest.register_craft({ - output = 'lunotrades:balcaodeescambo', + output = 'minertrade:bartertable', recipe = { {"group:wood" ,"group:wood"}, {"group:wood" ,"group:wood"}, } }) - - -minetest.register_alias("balcaodeescambo" , "lunotrades:balcaodeescambo") -minetest.register_alias("balcaodetroca" , "lunotrades:balcaodeescambo") -minetest.register_alias("mesadeescambo" , "lunotrades:balcaodeescambo") -minetest.register_alias("mesadetroca" , "lunotrades:balcaodeescambo") +minetest.register_alias("bartertable" , "minertrade:bartertable") +minetest.register_alias("balcaodeescambo" , "minertrade:bartertable") +minetest.register_alias("balcaodetroca" , "minertrade:bartertable") +minetest.register_alias("mesadeescambo" , "minertrade:bartertable") +minetest.register_alias("mesadetroca" , "minertrade:bartertable") diff --git a/screenshot.png b/screenshot.png index a9ce05f..993a8e9 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/screenshot2.png b/screenshot2.png deleted file mode 100644 index de7892f..0000000 Binary files a/screenshot2.png and /dev/null differ