From a58a01040d4fa2734fac34e09b2bef5b0b2a18d5 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 4 Jun 2018 22:13:24 +0200 Subject: [PATCH] Show villager name in trading formspec --- .../textures/mobs_mc_trading_formspec_bg.png | Bin 2015 -> 1936 bytes mods/ENTITIES/mobs_mc/villager.lua | 14 ++++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_trading_formspec_bg.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_trading_formspec_bg.png index cfc64aeaa25a5c43a6a1bffed14f5276c105f45d..029c686cd63630a5e41a3c6b196cc5a6f87468a3 100644 GIT binary patch literal 1936 zcmcIldrVVj6tBY#Apw!bEEEDHpp^|qU_9;xizo%7(4;mz}&9V_bk>;x3$Zg zs(yP=N>y5NY^Y)w946YT!qne~Quta8OK2b{=XD7F7g1lSs&U3_8pr!`Sz81wbcv($ zKupO!R38J|7m&7NfS+n^^4Ceqw0OH#m8Q*%xoA!GpX1CCV@!Y=`k1l4>(pl(3( zi{IIEge)6qxB&&12vlK675b+)5XH{JXF5pv5iqRXx2@wxU62?{$23n{Rcbm+Hs@JS zgZ%#dAcEgADMpfodL;xgfZ*_;)vfF`8P2+D#M(m-MRN<%(ueJ97GA$G49+|EEyM>3 zPk>}~ieH@YX>2o!%Gz4E2tHKKY_y03SXhy6j&qur83#{$7TWf(&7FBSr786niTna= z@y5WbYBDTl^)iZD|4hnQ6MYD}M3U%-LK~!RuALlq5q^u*O{z%{DU3$z#xmasVhatZ zthJqU01UsbBsocKir_e1?{3cW#F&zlkAeh>h)qT|4%{56qUjpc{_{T0E99X_mP>^m zIp|aI%}e=Tm-lrvU%dU!bdbHh?=C0*UE}XZeQfUBf4yyCv?RE=N;<6+$jTmnbpMOX z%W-PsFz$~5{Rlu#)?jL}Hm_`Y(c`-5YEskc<3V5FQ=Qb@$O|E=q^qU6r?OzZ(pcR^ zBKS%&!K=;Hi&iMRmsBAaN_c&vnc%_&*u$T0-Tm&RQBQ6Tw(XwOMq(w^5L8$@l&XzC zQRy7h0pi4lbRc+w^Si>-C(9TJE7bvJC5k&z3q#a0+17ebgOUtH#S{ins6pEN*qFVN zs}U2Kc{B!5sKM~57;vee{O&%WG3pM~;I{!Fr~~CEC25R8{Tj=v{~0(xJ3ian5O9Sk zQru4Z9Tw*g86j|ebI^|lbt*O%QY0CgV8KL*1RaD5no1?!mcmQT)jU5r^%`JTdG3_& zwpj2jz^)#IQxRqRx5kHGAA|C{9=q-;6^Ii0|60%*6XL|i)O3}gzx>W{yhf17&f%{n zM*NMP^EUovRO!hej+N=Xrg`Gh^d7$XlmOJMUgY V(_+Ji-lYCmxks@`>5=zN{{;)MnGgT~ literal 2015 zcmb_deN0nV6feOAY*ZXiHZdrJFrT7ff`YFD@gpE(!qr$5+|VdCV0A!W%ZH$dEDm^- zY-W$>z*lEN%u}az3>A$IlKE&Ywn9=AGX&C7+BD@uKqQLF?tMiq^Pg?5N&9-vx%Zsk z`TfpmsVyLGws3(^AP~%s{~~6qK;RDGd+rQ(=rIeIgu}<8EeT1n@Cjd&lap<2ZTt4^ zlS-vZr7|uquC}&TrBV$~ZaxXaZaG_lSg_9eFkK+<$c~R$pLEczziWMkarb+Lgl9lU(z(CYd;Tc#>-j5c8l`t=sCRxfUgG0}gy^v5AXRzruib0BZ1 z+dtxTbd+eo>(md%BMqIeit(-@OO@%$+Q_c11ID7~Bcf)?IJuId3DO$}<{-du@eJWK z$#+dNjGizKkBs-V9?W$o%^Zc{U^D+@kNU+eXBB%V9+9_R*^1a?c^@BTHujF`o<2rL z*`q}BlZ1>sKeFawRPoDg&g;x#TY5$WL!c~1<*H!# zAJ&t#R+*BRK&D1qDkdvr`vF5d>)xa%kM+vI5u04zeWxG=s1L~Gs+Au64j%7vgY85b40Zx9R%WvIKyzCBqRb?Sl2X^(6%$O zk<@@z`*flHnT&+p(b8CCd(ujf&u^&x^PK`9rXlrDwl@X(ClC1bLrIn$7M5*`)J9IJ z?d1!Y;6EsF20>o%#DU7hoeyM)+)|9KkeS=xJJ@sEkVu z!6mrju%X#1xp&JJAsg|V2Tm`uh;}lIyppeE*-kZ6w5?RpQZdDbbB>)8iG#wZi|&i)-L6tdH_DuEz{<>GY=kvL29;H(d5J>qkD6R)4t zSL=x>>$EvP>k3kmF;QkDlyis2iWi)HJ1RrM541VY?{_ckjF@|S_x$_94PhlG+J&hB zoz~#1>9NYP@zq(46_@Mxl#4T1RZ6=i4HT(fMQ7jV(qNmYN|2S)l@OGOlqUk-2ffgO zUFs>?o%B|iEj8#QC4ydP!HxY1!#((W;Z7g)!YokHP#nzR?;ViyKIo0t+Z~}Okmk(p zthjW0+NX8bFJWx*y@^4Mjv&K;hN4OH6--%^@~DTRKfCZ!9RQKJRtU1@X#Ouy=tl^4 z>sOAN>9FuXQEq7QyflBAkm^02Z$u7SYuF>t>zW|Bm6KjW-cu zgigXhj(fQ`gD@Ss?yUf**UxXaYbfK3g6RIiHK4W(W1l%@b*wamYF+|HQ!nkve&IfL W?gL*@OJOehpN@|OG3pJwzx@l2CA+Zz diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index e0a203a2..a0415687 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -16,7 +16,7 @@ local player_trading_with = {} --################### VILLAGER --################### --- LIST OF VILLAGES PROFESSIONS AND TRADES +-- LIST OF VILLAGER PROFESSIONS AND TRADES local E1 = { "mcl_core:emerald", 1, 1 } -- one emerald local professions = { farmer = { @@ -361,12 +361,14 @@ local set_trade = function(self, player, inv, concrete_tradenum) end -local function show_trade_formspec(playername) +local function show_trade_formspec(playername, trader) + local profession = professions[trader._profession].name local formspec = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;mobs_mc_trading_formspec_bg.png]".. mcl_vars.inventory_header.. - "list[current_player;main;0,4.5;9,3;9]" + "label[4,0;"..minetest.formspec_escape(profession).."]" + .."list[current_player;main;0,4.5;9,3;9]" .."list[current_player;main;0,7.74;9,1;]" .."button[1,1;0.5,1;prev_trade;<]" .."button[7.26,1;0.5,1;next_trade;>]" @@ -534,7 +536,7 @@ mobs:register_mob("mobs_mc:villager", { player_tradenum[name] = 1 set_trade(self, player, inv, player_tradenum[name]) - show_trade_formspec(name) + show_trade_formspec(name, self) end, on_spawn = function(self) @@ -597,7 +599,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local inv = minetest.get_inventory({type="detached", name="mobs_mc:trade"}) set_trade(trader, player, inv, player_tradenum[name]) update_offer(inv, player, false) - show_trade_formspec(name) + show_trade_formspec(name, trader) elseif fields.prev_trade then local trader = player_trading_with[name] if not trader or not trader.object:get_luaentity() then @@ -607,7 +609,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local inv = minetest.get_inventory({type="detached", name="mobs_mc:trade"}) set_trade(trader, player, inv, player_tradenum[name]) update_offer(inv, player, false) - show_trade_formspec(name) + show_trade_formspec(name, trader) end end end)