forked from VoxeLibre/VoxeLibre
Villager: Prevent locking of all trades
This is done by adding an "emergency unlock" which unlocks everything else when the last trade was locked.
This commit is contained in:
parent
ed52e49408
commit
51ff6b1725
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
-- TODO: Particles
|
-- TODO: Particles
|
||||||
-- TODO: 4s Regeneration I after trade unlock
|
-- TODO: 4s Regeneration I after trade unlock
|
||||||
-- FIXME: Possible to lock all trades
|
|
||||||
|
|
||||||
-- intllib
|
-- intllib
|
||||||
local MP = minetest.get_modpath(minetest.get_current_modname())
|
local MP = minetest.get_modpath(minetest.get_current_modname())
|
||||||
|
@ -360,6 +359,9 @@ local init_profession = function(self)
|
||||||
if not self._max_trade_tier then
|
if not self._max_trade_tier then
|
||||||
self._max_trade_tier = 1
|
self._max_trade_tier = 1
|
||||||
end
|
end
|
||||||
|
if not self._locked_trades then
|
||||||
|
self._locked_trades = 0
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local init_trades = function(self, inv)
|
local init_trades = function(self, inv)
|
||||||
|
@ -842,22 +844,28 @@ local trade_inventory = {
|
||||||
-- Otherwise, 20% chance to unlock if used freshly reset trade
|
-- Otherwise, 20% chance to unlock if used freshly reset trade
|
||||||
unlock_stuff = true
|
unlock_stuff = true
|
||||||
end
|
end
|
||||||
|
-- DEBUG
|
||||||
|
unlock_stuff = false
|
||||||
|
local update_formspec = false
|
||||||
if unlock_stuff then
|
if unlock_stuff then
|
||||||
-- First-time trade unlock all trades and unlock next trade tier
|
-- First-time trade unlock all trades and unlock next trade tier
|
||||||
if trade.tier + 1 > trader._max_trade_tier then
|
if trade.tier + 1 > trader._max_trade_tier then
|
||||||
trader._max_trade_tier = trader._max_trade_tier + 1
|
trader._max_trade_tier = trader._max_trade_tier + 1
|
||||||
update_max_tradenum(trader)
|
update_max_tradenum(trader)
|
||||||
show_trade_formspec(name, trader, tradenum)
|
update_formspec = true
|
||||||
end
|
end
|
||||||
for t=1, #trades do
|
for t=1, #trades do
|
||||||
trades[t].locked = false
|
trades[t].locked = false
|
||||||
trades[t].trade_counter = 0
|
trades[t].trade_counter = 0
|
||||||
end
|
end
|
||||||
|
trader._locked_trades = 0
|
||||||
-- Also heal trader for unlocking stuff
|
-- Also heal trader for unlocking stuff
|
||||||
-- TODO: Replace by Regeneration I
|
-- TODO: Replace by Regeneration I
|
||||||
trader.health = math.min(trader.hp_max, trader.health + 4)
|
trader.health = math.min(trader.hp_max, trader.health + 4)
|
||||||
end
|
end
|
||||||
trade.trade_counter = trade.trade_counter + 1
|
trade.trade_counter = trade.trade_counter + 1
|
||||||
|
-- Semi-randomly lock trade for repeated trade (not if there's only 1 trade)
|
||||||
|
if trader._max_tradenum > 1 then
|
||||||
if trade.trade_counter >= 12 then
|
if trade.trade_counter >= 12 then
|
||||||
trade.locked = true
|
trade.locked = true
|
||||||
elseif trade.trade_counter >= 2 then
|
elseif trade.trade_counter >= 2 then
|
||||||
|
@ -866,10 +874,29 @@ local trade_inventory = {
|
||||||
trade.locked = true
|
trade.locked = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
trader._trades = minetest.serialize(trades)
|
|
||||||
if trade.locked then
|
if trade.locked then
|
||||||
inv:set_stack("output", 1, "")
|
inv:set_stack("output", 1, "")
|
||||||
|
update_formspec = true
|
||||||
|
trader._locked_trades = trader._locked_trades + 1
|
||||||
|
-- Check if we managed to lock ALL available trades. Rare but possible.
|
||||||
|
if trader._locked_trades >= trader._max_tradenum then
|
||||||
|
-- Emergency unlock! Unlock all other trades except the current one
|
||||||
|
for t=1, #trades do
|
||||||
|
if t ~= tradenum then
|
||||||
|
trades[t].locked = false
|
||||||
|
trades[t].trade_counter = 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
trader._locked_trades = 1
|
||||||
|
-- Also heal trader for unlocking stuff
|
||||||
|
-- TODO: Replace by Regeneration I
|
||||||
|
trader.health = math.min(trader.hp_max, trader.health + 4)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
trader._trades = minetest.serialize(trades)
|
||||||
|
if update_formspec then
|
||||||
show_trade_formspec(name, trader, tradenum)
|
show_trade_formspec(name, trader, tradenum)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue