mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-08-26 11:57:23 +02:00
Merge pull request 'Fix villagers positional sounds' (#2556) from villager_sounds into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2556 Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
This commit is contained in:
commit
f7ffa6f700
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -816,7 +816,7 @@ local function show_trade_formspec(playername, trader, tradenum)
|
|||||||
.."listring[current_player;main]"
|
.."listring[current_player;main]"
|
||||||
.."listring["..tradeinv..";input]"
|
.."listring["..tradeinv..";input]"
|
||||||
.."listring[current_player;main]"
|
.."listring[current_player;main]"
|
||||||
minetest.sound_play("mobs_mc_villager_trade", {to_player = playername}, true)
|
minetest.sound_play("mobs_mc_villager_trade", {to_player = playername,object=trader.object}, true)
|
||||||
minetest.show_formspec(playername, tradeinv_name, formspec)
|
minetest.show_formspec(playername, tradeinv_name, formspec)
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -878,13 +878,13 @@ local function update_offer(inv, player, sound)
|
|||||||
(trade.locked == false)) then
|
(trade.locked == false)) then
|
||||||
inv:set_stack("output", 1, inv:get_stack("offered", 1))
|
inv:set_stack("output", 1, inv:get_stack("offered", 1))
|
||||||
if sound then
|
if sound then
|
||||||
minetest.sound_play("mobs_mc_villager_accept", {to_player = name}, true)
|
minetest.sound_play("mobs_mc_villager_accept", {to_player = name,object=trader.object}, true)
|
||||||
end
|
end
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
inv:set_stack("output", 1, ItemStack(""))
|
inv:set_stack("output", 1, ItemStack(""))
|
||||||
if sound then
|
if sound then
|
||||||
minetest.sound_play("mobs_mc_villager_deny", {to_player = name}, true)
|
minetest.sound_play("mobs_mc_villager_deny", {to_player = name,object=trader.object}, true)
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@ -1084,7 +1084,8 @@ local trade_inventory = {
|
|||||||
if not wanted2:is_empty() then
|
if not wanted2:is_empty() then
|
||||||
inv:remove_item("input", inv:get_stack("wanted", 2))
|
inv:remove_item("input", inv:get_stack("wanted", 2))
|
||||||
end
|
end
|
||||||
minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()}, true)
|
local trader = player_trading_with[name]
|
||||||
|
minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name(),object=trader.object}, true)
|
||||||
end
|
end
|
||||||
update_offer(inv, player, true)
|
update_offer(inv, player, true)
|
||||||
end,
|
end,
|
||||||
@ -1194,10 +1195,11 @@ local trade_inventory = {
|
|||||||
elseif listname == "input" then
|
elseif listname == "input" then
|
||||||
update_offer(inv, player, false)
|
update_offer(inv, player, false)
|
||||||
end
|
end
|
||||||
|
local trader = player_trading_with[name]
|
||||||
if accept then
|
if accept then
|
||||||
minetest.sound_play("mobs_mc_villager_accept", {to_player = name}, true)
|
minetest.sound_play("mobs_mc_villager_accept", {to_player = name,object=trader.object}, true)
|
||||||
else
|
else
|
||||||
minetest.sound_play("mobs_mc_villager_deny", {to_player = name}, true)
|
minetest.sound_play("mobs_mc_villager_deny", {to_player = name,object=trader.object}, true)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user