From 4493ffbb8169a810dbad6c6614831cd3fcd9ec51 Mon Sep 17 00:00:00 2001 From: BrunoMine Date: Sun, 5 Apr 2020 14:48:24 -0300 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20de=20erro=20ao=20retornar?= =?UTF-8?q?=20para=20inventario?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/en.mo | Bin 3585 -> 3585 bytes locale/en.po | 16 +++++++++------- locale/en.po~ | 5 +++-- locale/pt.mo | Bin 3672 -> 3674 bytes locale/pt.po | 14 ++++++++------ locale/pt.po~ | 5 +++-- locale/template.pot | 4 ++-- locale/xpro..tr | 20 ++++++++++---------- locale/xpro.en.tr | 20 ++++++++++---------- locale/xpro.pt.tr | 20 ++++++++++---------- ranking.lua | 9 +-------- sfinv.lua | 2 +- shop.lua | 7 +------ 13 files changed, 58 insertions(+), 64 deletions(-) diff --git a/locale/en.mo b/locale/en.mo index 2bc6ddd3d8cb639f22a07d9ca61654084f05e58a..6a9abef0196f0c01a83e7e1c604fe36029a77572 100644 GIT binary patch delta 1433 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

l1b Ie}1L@1`7iQ6aWAK literal 3672 zcmeH|ON=U<9t_j-pv(-kWN3-R=%uS@YUr+NtEwj> zvLb3Ci6JB!6J1C&(SVYW7#GAu7o)f^Q4=F8BVtS>CTiTU!G-@{efpt^Yd74~sqdb1 z?&I8ZPgno2Wd3Uk&4%0$ac)q`fFI1q3oUb#QVYPWa0{4%J^(HOcY>U^AG`&e75_2O zUjY}w{<`R=z@^a7fQ!IS!JEM^!8^cjL9YL^`2PSGL%$~aLJX#VDaiS&z}vy~ARg6+ z7x&A9jAughB8W#lEqWQe6M9YT$3Vt)T=cg@(Bk_MC`UQ~tehqT|MerW*GRS?dfwzGRpzt1+g7<=5Am{ai4}y7cHCPt= zaj*;eN!sTr^&!afT*M~i_aOKC2`|>sZy@W4$-+>z5~ROd^j;95sD9B$LEhJH5RY>3 z;<;-e>u46_{FgyI>Q%fL|0&VWg7lvk{WFmF`whr-egwJS6_D}#Df%_>&&Oi)F9vxp z%RtWS1{qh6=p!Ju(qTxcCdAKPmo_=!ZeZ6@#4r zJjgnF3FJ9Xfvlr5AVN^*LDta)kn=8stfMO+>u50s)7}HJjy8iRqh#$>;3E*$3uDYe zlCdBg^ZW1i01P`J+~d9uCq8#-9Kswh{}yBf!Wv@hgKU9lNIzr{vJPTHmO~zfq#=0- z?|m&~0J0LY4Z?OK1mUYO2#%NJV=KtEq5-uLyj%K1Ab%5V%tf;?Z+AhKLAoK#3v>7o zgl%&JYKO2B!%#LrG957lI32i00=LY1#aaX^da6a+isnX18PZFhA4(eG4>?LnPgTa8Ag zpmNCQdR5!8TUBFj7zS8V*zUA?Me((0E8Cwz;3o6}T?t|&Lp|2WNs~CAJBvi}cxg4^ zl?~5ECWo8|rj2%R6by)TEy=ZN8VjLY^@2!E8priQgV#v?>M_tf^3w#z8>_KCUyZahO0?5l2#TbEmOY znq#8+0sK1fTlvo+$$tC$iYI@6omw9U$F$YfFz zCW@`8(D+dWR}y08gz?LDQ+BN>*Hk<7oUX;GNqcg%y?HjBN#${1l&m%NTn(GV?rhvs zs~FGk)1^ZujNEu&@6?#JwLOk|9dtu$)Gq}NlAqIC4|s8EpEd6KZrBK-5V(#P>)v!G zy*X8=)I(FT#)7bloAGOj8V&UJ=|*>8jjy`~bariD>iS3O`bUcYE!RI%|Jz6EZ!fC^ AlmGw# diff --git a/locale/pt.po b/locale/pt.po index d8a846d..ed38eb1 100644 --- a/locale/pt.po +++ b/locale/pt.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-05 03:01-0300\n" -"PO-Revision-Date: 2020-04-05 02:59-0300\n" +"POT-Creation-Date: 2020-04-05 14:42-0300\n" +"PO-Revision-Date: 2020-04-05 14:47-0300\n" "Last-Translator: \n" "Language-Team: \n" "Language: pt\n" @@ -191,8 +191,8 @@ msgid "Diamante VI" msgstr "Diamante VI" #: ranking.lua shop.lua -msgid "Voltar" -msgstr "Voltar" +msgid "Fechar" +msgstr "Fechar" #: ranking.lua msgid "Pontos" @@ -299,14 +299,16 @@ msgid "Valor não numérico '@1'." msgstr "Valor não numérico '@1'." #: comandos.lua -#, fuzzy msgid "XP subtraído. Novo montante é @1." -msgstr "XP subtraido. Novo montante é @1." +msgstr "XP subtraído. Novo montante é @1." #: comandos.lua msgid "XP adicionado. Novo montante é @1." msgstr "XP adicionado. Novo montante é @1." +#~ msgid "Voltar" +#~ msgstr "Voltar" + #~ msgid "XP" #~ msgstr "XP" diff --git a/locale/pt.po~ b/locale/pt.po~ index e7d779f..d8a846d 100644 --- a/locale/pt.po~ +++ b/locale/pt.po~ @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-05 02:41-0300\n" +"POT-Creation-Date: 2020-04-05 03:01-0300\n" "PO-Revision-Date: 2020-04-05 02:59-0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -299,7 +299,8 @@ msgid "Valor não numérico '@1'." msgstr "Valor não numérico '@1'." #: comandos.lua -msgid "XP subtraido. Novo montante é @1." +#, fuzzy +msgid "XP subtraído. Novo montante é @1." msgstr "XP subtraido. Novo montante é @1." #: comandos.lua diff --git a/locale/template.pot b/locale/template.pot index cd6562f..9931f61 100644 --- a/locale/template.pot +++ b/locale/template.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-05 03:01-0300\n" +"POT-Creation-Date: 2020-04-05 14:42-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -190,7 +190,7 @@ msgid "Diamante VI" msgstr "" #: ranking.lua shop.lua -msgid "Voltar" +msgid "Fechar" msgstr "" #: ranking.lua diff --git a/locale/xpro..tr b/locale/xpro..tr index 288b5cc..a154dd9 100644 --- a/locale/xpro..tr +++ b/locale/xpro..tr @@ -10,21 +10,19 @@ Full inventory=Full inventory Diamond VI=Diamond VI Stone V=Stone V Cost: @1 XPCash=Cost: @1 XPCash -Diamond V=Diamond V -XP subtracted. New amount is @1.=XP subtracted. New amount is @1. +Stone I=Stone I Bronze V=Bronze V Stone VI=Stone VI Steel III=Steel III Buy=Buy Score=Score -Player does not exist.=Player does not exist. +Novice II=Novice II Wood VII=Wood VII [ | ]=[ | ] Wood III=Wood III Diamond I=Diamond I Steel I=Steel I Stone IV=Stone IV -XP added. New amount is @1.=XP added. New amount is @1. Acquired=Acquired Wood II=Wood II Steel VI=Steel VI @@ -41,11 +39,13 @@ Awards Store=Awards Store Novice III=Novice III Mese V=Mese V -@1XP=-@1XP +Added XP. New amount is @1.=Added XP. New amount is @1. Bronze VI=Bronze VI Diamond IV=Diamond IV Manage player XP=Manage player XP Minimum level: @1=Minimum level: @1 Mese III=Mese III +Subtracted XP. New amount is @1.=Subtracted XP. New amount is @1. Progress=Progress XP Cash: @1=XP Cash: @1 Insufficient XPCash=Insufficient XPCash @@ -58,16 +58,16 @@ Bronze III=Bronze III Wood VI=Wood VI Score: @1=Score: @1 Bronze II=Bronze II -Return=Return -Novice II=Novice II -Stone I=Stone I -Mese II=Mese II +Wood IV=Wood IV +Player does not exist.=Player does not exist. League @1=League @1 Stone III=Stone III +Mese II=Mese II +Diamond V=Diamond V Player=Player -Wood IV=Wood IV -Steel II=Steel II League: @1=League: @1 +Steel II=Steel II +Close=Close Level @1=Level @1 Choose an item=Choose an item Stone II=Stone II diff --git a/locale/xpro.en.tr b/locale/xpro.en.tr index 288b5cc..a154dd9 100644 --- a/locale/xpro.en.tr +++ b/locale/xpro.en.tr @@ -10,21 +10,19 @@ Full inventory=Full inventory Diamond VI=Diamond VI Stone V=Stone V Cost: @1 XPCash=Cost: @1 XPCash -Diamond V=Diamond V -XP subtracted. New amount is @1.=XP subtracted. New amount is @1. +Stone I=Stone I Bronze V=Bronze V Stone VI=Stone VI Steel III=Steel III Buy=Buy Score=Score -Player does not exist.=Player does not exist. +Novice II=Novice II Wood VII=Wood VII [ | ]=[ | ] Wood III=Wood III Diamond I=Diamond I Steel I=Steel I Stone IV=Stone IV -XP added. New amount is @1.=XP added. New amount is @1. Acquired=Acquired Wood II=Wood II Steel VI=Steel VI @@ -41,11 +39,13 @@ Awards Store=Awards Store Novice III=Novice III Mese V=Mese V -@1XP=-@1XP +Added XP. New amount is @1.=Added XP. New amount is @1. Bronze VI=Bronze VI Diamond IV=Diamond IV Manage player XP=Manage player XP Minimum level: @1=Minimum level: @1 Mese III=Mese III +Subtracted XP. New amount is @1.=Subtracted XP. New amount is @1. Progress=Progress XP Cash: @1=XP Cash: @1 Insufficient XPCash=Insufficient XPCash @@ -58,16 +58,16 @@ Bronze III=Bronze III Wood VI=Wood VI Score: @1=Score: @1 Bronze II=Bronze II -Return=Return -Novice II=Novice II -Stone I=Stone I -Mese II=Mese II +Wood IV=Wood IV +Player does not exist.=Player does not exist. League @1=League @1 Stone III=Stone III +Mese II=Mese II +Diamond V=Diamond V Player=Player -Wood IV=Wood IV -Steel II=Steel II League: @1=League: @1 +Steel II=Steel II +Close=Close Level @1=Level @1 Choose an item=Choose an item Stone II=Stone II diff --git a/locale/xpro.pt.tr b/locale/xpro.pt.tr index 3046b10..0bb14b9 100644 --- a/locale/xpro.pt.tr +++ b/locale/xpro.pt.tr @@ -10,21 +10,19 @@ Full inventory=Inventario lotado Diamond VI=Diamante VI Stone V=Pedra V Cost: @1 XPCash=Custo: @1 CashXP -Diamond V=Diamante V -XP subtracted. New amount is @1.=XP subtraido. Novo montante é @1. +Stone I=Pedra I Bronze V=Bronze V Stone VI=Pedra VI Steel III=Ferro III Buy=Comprar Score=Pontos -Player does not exist.=Jogador inexistente. +Novice II=Novato II Wood VII=Madeira VII [ | ]=[ | ] Wood III=Madeira III Diamond I=Diamante I Steel I=Ferro I Stone IV=Pedra IV -XP added. New amount is @1.=XP adicionado. Novo montante é @1. Acquired=Adiquirido Wood II=Madeira II Steel VI=Ferro VI @@ -41,11 +39,13 @@ Awards Store=Loja de Itens por XP Novice III=Novato III Mese V=Mese V -@1XP=-@1XP +Added XP. New amount is @1.=XP adicionado. Novo montante é @1. Bronze VI=Bronze VI Diamond IV=Diamante IV Manage player XP=Administrar XP dos jogadores Minimum level: @1=Nivel mínimo: @1 Mese III=Mese III +Subtracted XP. New amount is @1.=XP subtraído. Novo montante é @1. Progress=Progresso XP Cash: @1=Cash XP: @1 Insufficient XPCash=Cash XP insuficiente @@ -58,16 +58,16 @@ Bronze III=Bronze III Wood VI=Madeira VI Score: @1=Pontos: @1 Bronze II=Bronze II -Return=Voltar -Novice II=Novato II -Stone I=Pedra I -Mese II=Mese II +Wood IV=Madeira IV +Player does not exist.=Jogador inexistente. League @1=Liga @1 Stone III=Pedra III +Mese II=Mese II +Diamond V=Diamante V Player=Jogador -Wood IV=Madeira IV -Steel II=Ferro II League: @1=Liga: @1 +Steel II=Ferro II +Close=Fechar Level @1=Nivel @1 Choose an item=Escolha um Item Stone II=Pedra II diff --git a/ranking.lua b/ranking.lua index 34ff445..905be40 100644 --- a/ranking.lua +++ b/ranking.lua @@ -120,7 +120,7 @@ local update_formspec = function() xpro.ranking_formspec = "size[7,7]" ..default.gui_bg ..default.gui_bg_img - .."button[5,-0.2;2,1;back;"..S("Voltar").."]" + .."button_exit[5,-0.2;2,1;close;"..S("Fechar").."]" .."label[0.6,0.4;"..S("Pontos").."]" .."label[2.4,0.4;"..S("Jogador").."]" @@ -143,13 +143,6 @@ local update_formspec = function() end update_formspec() -minetest.register_on_player_receive_fields(function(player, formname, fields) - if formname == "xpro:ranking" then - if fields.back then - xpro.show_inventory_formspec(player) - end - end -end) xpro.register_on_add_xp(function(name, xp_added) --if xpro.ranking diff --git a/sfinv.lua b/sfinv.lua index 5add929..eb8285a 100644 --- a/sfinv.lua +++ b/sfinv.lua @@ -76,7 +76,7 @@ xpro.update_inventory_formspec = function(player) sfinv.set_player_inventory_formspec(player) end --- Abrir inventario na aba de niveis +-- Abrir inventario na aba de niveis [Não funciona pois o exibir formspec não significa abrir o inventario, os botões sfinv não funcionarão assim] xpro.show_inventory_formspec = function(player) minetest.show_formspec(player:get_player_name(), "", player:get_inventory_formspec()) end diff --git a/shop.lua b/shop.lua index e8d140c..bdbe82f 100644 --- a/shop.lua +++ b/shop.lua @@ -58,7 +58,7 @@ xpro.acessar_shop = function(name, aviso) local formspec = "size[8,6]" ..default.gui_bg ..default.gui_bg_img - .."button[6,0;2,1;back;"..S("Voltar").."]" + .."button_exit[6,0;2,1;close;"..S("Fechar").."]" .."label[0,0;"..S("Loja de Itens por XP").."]" .."label[0,0.5;"..S("Cash XP: @1", xp_disp).."]" .."textlist[3.2,1;4.5,5;menu;"..string_menu_shop.."]" @@ -121,11 +121,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) xpro.update_inventory_formspec(minetest.get_player_by_name(name)) end end - - -- Retornar ao inventario - -- Return to inventory - elseif fields.back then - xpro.show_inventory_formspec(player) end end end)