From 883568add4548d46f3f4df1d58168621a8a2fe80 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 3 Jun 2018 18:37:53 +0200 Subject: [PATCH] Implement basic villager trading formspec --- mods/ENTITIES/mobs_mc/depends.txt | 1 + .../textures/mobs_mc_trading_formspec_bg.png | Bin 2494 -> 2015 bytes mods/ENTITIES/mobs_mc/villager.lua | 109 ++++++++---------- 3 files changed, 51 insertions(+), 59 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/depends.txt b/mods/ENTITIES/mobs_mc/depends.txt index da8ac70d..2b399cc6 100644 --- a/mods/ENTITIES/mobs_mc/depends.txt +++ b/mods/ENTITIES/mobs_mc/depends.txt @@ -1,3 +1,4 @@ +mcl_init default? mcl_mobs mcl_tnt? 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 a95b09780a4d8dcad60089291441d6b90cdab82f..cfc64aeaa25a5c43a6a1bffed14f5276c105f45d 100644 GIT binary patch literal 2015 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 Jvd$@?2>{y^7u)~< diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 5cb9783c..021e2da5 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -53,9 +53,9 @@ mobs:register_mob("mobs_mc:villager", { run_velocity = 2.4, drops = {}, sounds = { - random = "Villager1", - death = "Villagerdead", - damage = "Villagerhurt1", + random = "mobs_mc_villager_noise", + death = "mobs_mc_villager_death", + damage = "mobs_mc_villager_damage", distance = 16, }, animation = { @@ -78,7 +78,6 @@ mobs:register_mob("mobs_mc:villager", { light_damage = 0, view_range = 16, fear_height = 4, - --[[ on_rightclick = function(self, clicker) local inv inv = minetest.get_inventory({type="detached", name="trading_inv"}) @@ -87,10 +86,9 @@ mobs:register_mob("mobs_mc:villager", { allow_take = function(inv, listname, index, stack, player) if listname == "output" then inv:remove_item("input", inv:get_stack("wanted", 1)) - minetest.sound_play("Villageraccept", {to_player = player:get_player_name()}) + minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()}) end if listname == "input" or listname == "output" then - --return 1000 return 0 else return 0 @@ -106,72 +104,68 @@ mobs:register_mob("mobs_mc:villager", { on_put = function(inv, listname, index, stack, player) if inv:contains_item("input", inv:get_stack("wanted", 1)) then inv:set_stack("output", 1, inv:get_stack("offered", 1)) - minetest.sound_play("Villageraccept", {to_player = player:get_player_name()}) + minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()}) else inv:set_stack("output", 1, ItemStack("")) - minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()}) + minetest.sound_play("mobs_mc_villager_deny", {to_player = player:get_player_name()}) end end, on_move = function(inv, from_list, from_index, to_list, to_index, count, player) if inv:contains_item("input", inv:get_stack("wanted", 1)) then inv:set_stack("output", 1, inv:get_stack("offered", 1)) - minetest.sound_play("Villageraccept", {to_player = player:get_player_name()}) + minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()}) else inv:set_stack("output", 1, ItemStack("")) - minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()}) + minetest.sound_play("mobs_mc_villager_deny", {to_player = player:get_player_name()}) end end, on_take = function(inv, listname, index, stack, player) if inv:contains_item("input", inv:get_stack("wanted", 1)) then inv:set_stack("output", 1, inv:get_stack("offered", 1)) - minetest.sound_play("Villageraccept", {to_player = player:get_player_name()}) + minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()}) else inv:set_stack("output", 1, ItemStack("")) - minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()}) + minetest.sound_play("mobs_mc_villager_deny", {to_player = player:get_player_name()}) end end, }) end - inv:set_size("input", 1) - inv:set_size("output", 1) - inv:set_size("wanted", 1) - inv:set_size("offered", 1) + inv:set_size("input", 2) + inv:set_size("output", 1) + inv:set_size("wanted", 2) + inv:set_size("offered", 1) local trades = { - {"default:apple 12", "default:clay_lump 1"}, - {"default:coal_lump 20", "default:clay_lump 1"}, - {"default:paper 30", "default:clay_lump 1"}, - {"mobs:leather 10", "default:clay_lump 1"}, - {"default:book 2", "default:clay_lump 1"}, - {"default:clay_lump 3", "default:clay_lump 1"}, - {"farming:potato 15", "default:clay_lump 1"}, - {"farming:wheat 20", "default:clay_lump 1"}, - {"farming:carrot 15", "default:clay_lump 1"}, - {"farming:melon_8 8", "default:clay_lump 1"}, - {"mobs:rotten_flesh 40", "default:clay_lump 1"}, - {"default:gold_ingot 10", "default:clay_lump 1"}, - {"farming:cotton 10", "default:clay_lump 1"}, - {"wool:white 15", "default:clay_lump 1"}, - {"farming:pumpkin 8", "default:clay_lump 1"}, + {"mcl_core:apple 12", "mcl_core:emerald 1"}, + {"mcl_core:coal_lump 20", "mcl_core:emerald 1"}, + {"mcl_core:paper 30", "mcl_core:emerald 1"}, + {"mcl_mobitems:leather 10", "mcl_core:emerald 1"}, + {"mcl_books:book 2", "mcl_core:emerald 1"}, + {"mcl_core:emerald 3", "mcl_core:emerald 1"}, + {"mcl_farming:potato_item 15", "mcl_core:emerald 1"}, + {"mcl_farming:wheat_item 20", "mcl_core:emerald 1"}, + {"mcl_farming:carrot_item 15", "mcl_core:emerald 1"}, + {"mcl_farming:melon_item 8", "mcl_core:emerald 1"}, + {"mcl_mobitems:rotten_flesh 40","mcl_core:emerald 1"}, + {"mcl_core:gold_ingot 10", "mcl_core:emerald 1"}, + {"mcl_wool:white 15", "mcl_core:emerald 1"}, + {"mcl_farming:pumpkin 8", "mcl_core:emerald 1"}, - {"default:clay_lump 1", "mobs:beef_cooked 5"}, - {"default:clay_lump 1", "mobs:chicken_cooked 7"}, - {"default:clay_lump 1", "farming:cookie 6"}, - {"default:clay_lump 1", "farming:pumpkin_bread 3"}, - {"default:clay_lump 1", "mobs:arrow 10"}, - {"default:clay_lump 3", "mobs:bow_wood 1"}, - {"default:clay_lump 8", "fishing:pole_wood 1"}, - --{"default:clay_lump 4", "potionspack:healthii 1"}, - {"default:clay_lump 1", "cake:cake 1"}, - {"default:clay_lump 10", "mobs:saddle 1"}, - {"default:clay_lump 10", "clock:1 1"}, - {"default:clay_lumpd 10", "compass:0 1"}, - {"default:clay_lump 1", "default:glass 5"}, - {"default:clay_lump 1", "nether:glowstone 3"}, - {"default:clay_lump 3", "mobs:shears 1"}, - {"default:clay_lump 10", "default:sword_diamond 1"}, - {"default:clay_lump 20", "3d_armor:chestplate_diamond 1"}, + {"mcl_core:emerald 1", "mcl_mobitems:beef_cooked 5"}, + {"mcl_core:emerald 1", "mcl_mobitems:chicken_cooked 7"}, + {"mcl_core:emerald 1", "mcl_farming:cookie 6"}, + {"mcl_core:emerald 1", "mcl_bows:arrow 10"}, + {"mcl_core:emerald 3", "mcl_bows:bow_0 1"}, + {"mcl_core:emerald 1", "mcl_cake:cake 1"}, + {"mcl_core:emerald 10", "mcl_mobitems:saddle 1"}, + {"mcl_core:emerald 10", "mcl_clock:clock_1 1"}, + {"mcl_core:emerald 10", "mcl_compass:compass 1"}, + {"mcl_core:emerald 1", "mcl_core:glass 5"}, + {"mcl_core:emerald 1", "mcl_nether:glowstone 3"}, + {"mcl_core:emerald 3", "mcl_tools:shears 1"}, + {"mcl_core:emerald 10", "mcl_tools:sword_diamond 1"}, + {"mcl_core:emerald 20", "3d_armor:chestplate_diamond 1"}, } local tradenum = math.random(#trades) inv:set_stack("wanted", 1, ItemStack(trades[tradenum][1])) @@ -179,20 +173,17 @@ mobs:register_mob("mobs_mc:villager", { local formspec = "size[9,8.75]".. - "background[-0.19,-0.25;9.41,9.49;trading_formspec_bg.png]".. - "bgcolor[#080808BB;true]".. - "listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]".. + "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]".. "list[current_player;main;0,7.74;9,1;]" - .."list[detached:trading_inv;wanted;2,1;1,1;]" - .."list[detached:trading_inv;offered;5.75,1;1,1;]" - .."list[detached:trading_inv;input;2,2.5;1,1;]" - .."list[detached:trading_inv;output;5.75,2.5;1,1;]" - minetest.sound_play("Villagertrade", {to_player = clicker:get_player_name()}) - minetest.show_formspec(clicker:get_player_name(), "tradespec", formspec) + .."list[detached:trading_inv;wanted;2,1;2,1;]" + .."list[detached:trading_inv;offered;5.76,1;1,1;]" + .."list[detached:trading_inv;input;2,2.5;2,1;]" + .."list[detached:trading_inv;output;5.76,2.55;1,1;]" + minetest.sound_play("mobs_mc_villager_trade", {to_player = clicker:get_player_name()}) + minetest.show_formspec(clicker:get_player_name(), "mobs_mc:trade", formspec) end, - - ]] }) mobs:spawn_specific("mobs_mc:villager", mobs_mc.spawn.village, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 8000, 4, mobs_mc.spawn_height.water+1, mobs_mc.spawn_height.overworld_max)