Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into forkhausen

Browse source
This commit is contained in:
Alexander Minges 2020-05-08 22:57:00 +02:00
commit 6f30b57cbe
7 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mods/ENTITIES/mobs_mc/guardian.lua
View file

@ -81,7 +81,9 @@ mobs:register_mob("mobs_mc:guardian", {
view_range = 16,
})
mobs:spawn_specific("mobs_mc:guardian", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 25000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water - 10)
-- Spawning disabled due to size issues
-- TODO: Re-enable spawning
--mobs:spawn_specific("mobs_mc:guardian", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 25000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water - 10)
-- spawn eggs
mobs:register_egg("mobs_mc:guardian", S("Guardian"), "mobs_mc_spawn_icon_guardian.png", 0)

4
mods/ENTITIES/mobs_mc/guardian_elder.lua
View file

@ -88,7 +88,9 @@ mobs:register_mob("mobs_mc:guardian_elder", {
view_range = 16,
})
mobs:spawn_specific("mobs_mc:guardian_elder", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 40000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water-18)
-- Spawning disabled due to size issues
-- TODO: Re-enable spawning
-- mobs:spawn_specific("mobs_mc:guardian_elder", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 40000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water-18)
-- spawn eggs
mobs:register_egg("mobs_mc:guardian_elder", S("Elder Guardian"), "mobs_mc_spawn_icon_guardian_elder.png", 0)

12
mods/ENTITIES/mobs_mc/villager.lua
View file

@ -488,6 +488,9 @@ local function show_trade_formspec(playername, trader, tradenum)
end
local inv = minetest.get_inventory({type="detached", name="mobs_mc:trade_"..playername})
if not inv then
return
end
local wanted1 = inv:get_stack("wanted", 1)
local wanted2 = inv:get_stack("wanted", 2)
local offered = inv:get_stack("offered", 1)
@ -624,6 +627,9 @@ local return_fields = function(player)
local name = player:get_player_name()
local inv_t = minetest.get_inventory({type="detached", name = "mobs_mc:trade_"..name})
local inv_p = player:get_inventory()
if not inv_t or not inv_p then
return
end
for i=1, inv_t:get_size("input") do
local stack = inv_t:get_stack("input", i)
return_item(stack, player, player:get_pos(), inv_p)
@ -660,6 +666,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
local tradenum = player_tradenum[name] + dir
local inv = minetest.get_inventory({type="detached", name="mobs_mc:trade_"..name})
if not inv then
return
end
set_trade(trader, player, inv, tradenum)
update_offer(inv, player, false)
show_trade_formspec(name, trader, player_tradenum[name])
@ -983,6 +992,9 @@ mobs:register_mob("mobs_mc:villager", {
player_trading_with[name] = self
local inv = minetest.get_inventory({type="detached", name="mobs_mc:trade_"..name})
if not inv then
return
end
set_trade(self, clicker, inv, 1)