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 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 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)