FaceDeer/commoditymarket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix player-specific sound_play calls

Browse Source
This commit is contained in:
FaceDeer 2019-08-20 01:25:40 -06:00
parent b04c0e8c71
commit 14ef5b7d2e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default_markets.lua
View File

@ -56,7 +56,7 @@ minetest.register_node("commoditymarket:kings_market", {
commoditymarket.show_market("kings", clicker:get_player_name()) commoditymarket.show_market("kings", clicker:get_player_name())
else else
minetest.chat_send_player(clicker:get_player_name(), S("At this time of day the King's Market is closed.")) minetest.chat_send_player(clicker:get_player_name(), S("At this time of day the King's Market is closed."))
minetest.sound_play({name = "commoditymarket_error", gain = 0.1, to_player=clicker:get_player_name()}) minetest.sound_play({name = "commoditymarket_error", gain = 0.1}, {to_player=clicker:get_player_name()})
end end
end, end,
}) })
@ -100,7 +100,7 @@ minetest.register_node("commoditymarket:night_market", {
commoditymarket.show_market("night", clicker:get_player_name()) commoditymarket.show_market("night", clicker:get_player_name())
else else
minetest.chat_send_player(clicker:get_player_name(), S("At this time of day the Night Market is closed.")) minetest.chat_send_player(clicker:get_player_name(), S("At this time of day the Night Market is closed."))
minetest.sound_play({name = "commoditymarket_error", gain = 0.1, to_player=clicker:get_player_name()}) minetest.sound_play({name = "commoditymarket_error", gain = 0.1}, {to_player=clicker:get_player_name()})
end end
end, end,
}) })

12
market.lua
View File

@ -193,7 +193,7 @@ local add_sell = function(market, account, item, price, quantity)
-- validate that this sell order is possible -- validate that this sell order is possible
if sell_limit_exceeded or price < 0 or quantity < 1 or not remove_inventory_from_account(account, item, quantity) then if sell_limit_exceeded or price < 0 or quantity < 1 or not remove_inventory_from_account(account, item, quantity) then
minetest.sound_play({name = "commoditymarket_error", gain = 0.1, to_player=account.name}) minetest.sound_play({name = "commoditymarket_error", gain = 0.1}, {to_player=account.name})
if sell_limit_exceeded then if sell_limit_exceeded then
minetest.chat_send_player(account.name, S("You have too many items listed for sale in this market, please cancel some sell orders to make room for new ones.")) minetest.chat_send_player(account.name, S("You have too many items listed for sale in this market, please cancel some sell orders to make room for new ones."))
elseif price < 0 then elseif price < 0 then
@ -245,7 +245,7 @@ local add_sell = function(market, account, item, price, quantity)
market.orders_for_items[item].sell_volume = market.orders_for_items[item].sell_volume + quantity market.orders_for_items[item].sell_volume = market.orders_for_items[item].sell_volume + quantity
end end
minetest.sound_play({name = "commoditymarket_register_opened", gain = 0.1, to_player=account.name}) minetest.sound_play({name = "commoditymarket_register_opened", gain = 0.1}, {to_player=account.name})
return true return true
end end
@ -259,7 +259,7 @@ local cancel_sell = function(market, item, order)
market.orders_for_items[item].sell_volume = market.orders_for_items[item].sell_volume - quantity market.orders_for_items[item].sell_volume = market.orders_for_items[item].sell_volume - quantity
add_inventory_to_account(market, account, item, quantity) add_inventory_to_account(market, account, item, quantity)
minetest.sound_play({name = "commoditymarket_register_closed", gain = 0.1, to_player=account.name}) minetest.sound_play({name = "commoditymarket_register_closed", gain = 0.1}, {to_player=account.name})
end end
----------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------
@ -290,7 +290,7 @@ local add_buy = function(market, account, item, price, quantity)
price = tonumber(price) price = tonumber(price)
quantity = tonumber(quantity) quantity = tonumber(quantity)
if price < 0 or quantity < 1 or not test_buy(market, account.balance, item, price, quantity) then if price < 0 or quantity < 1 or not test_buy(market, account.balance, item, price, quantity) then
minetest.sound_play({name = "commoditymarket_error", gain = 0.1, to_player=account.name}) minetest.sound_play({name = "commoditymarket_error", gain = 0.1}, {to_player=account.name})
if price < 0 then if price < 0 then
minetest.chat_send_player(account.name, S("You can't pay less than nothing for an item.")) minetest.chat_send_player(account.name, S("You can't pay less than nothing for an item."))
elseif quantity < 1 then elseif quantity < 1 then
@ -344,7 +344,7 @@ local add_buy = function(market, account, item, price, quantity)
market.orders_for_items[item].buy_volume = market.orders_for_items[item].buy_volume + quantity market.orders_for_items[item].buy_volume = market.orders_for_items[item].buy_volume + quantity
end end
minetest.sound_play({name = "commoditymarket_register_opened", gain = 0.1, to_player=account.name}) minetest.sound_play({name = "commoditymarket_register_opened", gain = 0.1}, {to_player=account.name})
return true return true
end end
@ -360,7 +360,7 @@ local cancel_buy = function(market, item, order)
account.balance = account.balance + price*quantity account.balance = account.balance + price*quantity
minetest.sound_play({name = "commoditymarket_register_closed", gain = 0.1, to_player=account.name}) minetest.sound_play({name = "commoditymarket_register_closed", gain = 0.1}, {to_player=account.name})
end end
----------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------