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 zcmcIleM}Q)7=ImZ2nmQ>%wi!x0(!dX2n^v41W^&z>E0PjrV_wG*rX$T90vp9fK9W? ziHgfP1$}XwUDAD}QIVMHCp&2LOQNym~zVz-!0$*sWj_003C6*4Eb6)YR0{ z($bii7`0kmSy`!6Dt%=)zXkv-%Gn7OAkuvELjW9o1dKt;MlTh-5$QB?Lnzp?8sJ(19 z*=|Y;L9r<;jA9dmOMdp~T(2L(=9^B?>yb)Pul!%0%F@PD9?(hC*On!F>Jd18BHZLl zO(nL7!|_%RW@O`9azNJZMDNM#Pw_4-OhSWImoh7O79jK^1CR3TR|u(tPkqYM-l+N4 zfJ29QT?T5F2j!jMX}vj_4cvE@-|x|RuwJa$j5>`g7cjneZBB_Nsy}1m?GR-6aenGbn2bH%U4i%x9f8rpb3QVKn2l(MW^r&U5b{T1H$iApesyxo; z=E3m`H(xb~5!+@?(zN3*qE6P|M$r?ZNPomSQ5BZ&V=-4rWgnxNAwfhuBKe%|ScIkjI3Ko_TB-A^) z6&Wl)<96=*5VeBr5k!iK^LURX%PiTR4D#nR$NvV7 zX0m;7?E)-BVg9|57*V(CX?zCr|Gveg>1ZR0W&?lAySy!Q1qltdDN(!XdgtzDWjvV~ zI}^X<8Fl8AnAfwB;%3Rec%`rFlB5&)StK-14Pos9Av(e{QVKdk*!FE7c`mrNPMN-Y zdB4yT#*8%jniK>p^`6G;=O%P#5C5wo;%7D`-`6&71800VKABWF+#PGkl7ec&woGhStodAFg?$&qD|@FF Y-#AC7?1=1m6MtCcTVa%T^ZN(>1`Dv65C8xG literal 2015 zcmb_de@qj16hBfIwNY`LY+_IbVVs$l`#b zW-~jZg5Nq5VosfwF;p}3^Pg?*{<*yO?!EVU zpZ9q=dOb*-E}kRCFl@T?%lHi#CIT2HnmI{?VHhu75QSmby!A;b37GJVj*hmqwe8%w zQ=w33G@8W3#G0BKtyViQy6!lJVLo{qfDBvZxSxq(lXIoz>-v`H{s}iEC*nZS{X=O}T*KSMk^Fc{7Z5drkGbH6l06r8zP6|n{ zNxf_GoD?3j3=9tUw(iLnQ9MWE1Xw4$*@Jj*vH=4d|@Q4lpT_(Ta;noLttKb^BkE#MzPaaewMZU{eyoV zZ1(qOr?8Hr))W{5t7T;}s#3WNK=N7lS`&51rUD0?DpmKby=g$VTdC5va0 zkYzL$-@fOg{7qNJ@@_3NjT1fl8d|AI zgrQfUv4R=;RiN<*tEdcV2ZA-{9O8Lb=)oCQuTvP-tWdA_Naa-1idX~tQmZmAq&!>ePjA_-6w zd*QGp+vZgxNn7sO-nkm2#BoRTTA0+=!1=?l`y2iBoGRhoY(oxC!60?sb`=_e9}PDp zJ*~=~+kd<+nXyb4PG;cR*18oXJxh4b^*w47zQwvMiKN68vQ>~wo~FNd#vimE@ULAf z;8O$`rr?@7L*CEEy=keqBs&H`a`WURFF4mG)P|z`gv)t;w|j19^vs*vX5SUBi7Y+V zE=~{bbc9{bOwg1MFVAVLtgYW(A=qBuxi zn?G(g4&D)n`~;OwXHc=R(IF`ixeAq@kn&#_z^2jkTK)=vrV$TfE)u}Q48_Y~%Ud?z z_zvTQjZ+XG@zqzGaH1r3aAi~k0dz)T;PEKm(t(&B&xd3tnsY)55OnhIhxP9Mcbph% zyp9kfbaF@r5H{|O5GF!5zFh#C_4AwUdfM`0Z(N^e1*j><*=O!)9ZSs-`j-Ie>lGcj ZFGNqyeh?sODauDbYH0$9*R9$1-CvF+yRiTO diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index e0a203a26..a0415687b 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)