forked from MineClone5/MineClone5
Merge pull request 'MineClone 5 Release Version 0.71.9' (#50) from testing into production
Reviewed-on: MineClone5/MineClone5#50
This commit is contained in:
commit
3acde8c400
|
@ -58,26 +58,27 @@ function mcl_loot.get_loot(loot_definitions, pr)
|
||||||
end
|
end
|
||||||
if item then
|
if item then
|
||||||
local itemstring = item.itemstring
|
local itemstring = item.itemstring
|
||||||
local itemstack = item.itemstack
|
|
||||||
if itemstring then
|
if itemstring then
|
||||||
|
local stack = ItemStack(itemstring)
|
||||||
|
|
||||||
if item.amount_min and item.amount_max then
|
if item.amount_min and item.amount_max then
|
||||||
itemstring = itemstring .. " " .. pr:next(item.amount_min, item.amount_max)
|
stack:set_count(pr:next(item.amount_min, item.amount_max))
|
||||||
end
|
end
|
||||||
|
|
||||||
if item.wear_min and item.wear_max then
|
if item.wear_min and item.wear_max then
|
||||||
-- Sadly, PseudoRandom only allows very narrow ranges, so we set wear in steps of 10
|
-- Sadly, PseudoRandom only allows very narrow ranges, so we set wear in steps of 10
|
||||||
local wear_min = math.floor(item.wear_min / 10)
|
local wear_min = math.floor(item.wear_min / 10)
|
||||||
local wear_max = math.floor(item.wear_max / 10)
|
local wear_max = math.floor(item.wear_max / 10)
|
||||||
local wear = pr:next(wear_min, wear_max) * 10
|
|
||||||
|
|
||||||
if not item.amount_min and not item.amount_max then
|
stack:set_wear(pr:next(wear_min, wear_max) * 10)
|
||||||
itemstring = itemstring .. " 1"
|
|
||||||
end
|
|
||||||
|
|
||||||
itemstring = itemstring .. " " .. tostring(wear)
|
|
||||||
end
|
end
|
||||||
table.insert(items, itemstring)
|
|
||||||
elseif itemstack then
|
if item.func then
|
||||||
table.insert(items, itemstack)
|
item.func(stack, pr)
|
||||||
|
end
|
||||||
|
|
||||||
|
table.insert(items, stack)
|
||||||
else
|
else
|
||||||
minetest.log("error", "[mcl_loot] INTERNAL ERROR! Failed to select random loot item!")
|
minetest.log("error", "[mcl_loot] INTERNAL ERROR! Failed to select random loot item!")
|
||||||
end
|
end
|
||||||
|
|
|
@ -31,12 +31,14 @@ local spawn_children_on_die = function(child_mob, children_count, spawn_distance
|
||||||
speed_penalty = 0.5
|
speed_penalty = 0.5
|
||||||
end
|
end
|
||||||
local mob = minetest.add_entity(newpos, child_mob)
|
local mob = minetest.add_entity(newpos, child_mob)
|
||||||
if (not mother_stuck) then
|
if mob then
|
||||||
mob:set_velocity(vector.multiply(dir, eject_speed * speed_penalty))
|
if (not mother_stuck) then
|
||||||
|
mob:set_velocity(vector.multiply(dir, eject_speed * speed_penalty))
|
||||||
|
end
|
||||||
|
mob:set_yaw(angle - math.pi/2)
|
||||||
|
table.insert(children, mob)
|
||||||
|
angle = angle + (math.pi*2)/children_count
|
||||||
end
|
end
|
||||||
mob:set_yaw(angle - math.pi/2)
|
|
||||||
table.insert(children, mob)
|
|
||||||
angle = angle + (math.pi*2)/children_count
|
|
||||||
end
|
end
|
||||||
-- If mother was murdered, children attack the killer after 1 second
|
-- If mother was murdered, children attack the killer after 1 second
|
||||||
if self.state == "attack" then
|
if self.state == "attack" then
|
||||||
|
|
|
@ -409,7 +409,7 @@ local init_trades = function(self, inv)
|
||||||
local offered_stack = ItemStack({name = offered_item, count = offered_count})
|
local offered_stack = ItemStack({name = offered_item, count = offered_count})
|
||||||
if mcl_enchanting.is_enchanted(offered_item) then
|
if mcl_enchanting.is_enchanted(offered_item) then
|
||||||
if mcl_enchanting.is_book(offered_item) then
|
if mcl_enchanting.is_book(offered_item) then
|
||||||
offered_stack = mcl_enchanting.get_uniform_randomly_enchanted_book({"soul_speed"})
|
mcl_enchanting.enchant_uniform_randomly(offered_stack, {"soul_speed"})
|
||||||
else
|
else
|
||||||
mcl_enchanting.enchant_randomly(offered_stack, math.random(5, 19), false, false, true)
|
mcl_enchanting.enchant_randomly(offered_stack, math.random(5, 19), false, false, true)
|
||||||
mcl_enchanting.unload_enchantments(offered_stack)
|
mcl_enchanting.unload_enchantments(offered_stack)
|
||||||
|
|
|
@ -19,6 +19,7 @@ local set_node = minetest.set_node
|
||||||
local sound_play = minetest.sound_play
|
local sound_play = minetest.sound_play
|
||||||
local add_particlespawner = minetest.add_particlespawner
|
local add_particlespawner = minetest.add_particlespawner
|
||||||
local after = minetest.after
|
local after = minetest.after
|
||||||
|
local add_entity = minetest.add_entity
|
||||||
local get_objects_inside_radius = minetest.get_objects_inside_radius
|
local get_objects_inside_radius = minetest.get_objects_inside_radius
|
||||||
local get_item_group = minetest.get_item_group
|
local get_item_group = minetest.get_item_group
|
||||||
|
|
||||||
|
@ -206,7 +207,7 @@ lightning.register_on_strike(function(pos, pos2, objects)
|
||||||
if get_node(pos2).name == "air" then
|
if get_node(pos2).name == "air" then
|
||||||
-- Low chance for a lightning to spawn skeleton horse + skeletons
|
-- Low chance for a lightning to spawn skeleton horse + skeletons
|
||||||
if skeleton_lightning then
|
if skeleton_lightning then
|
||||||
minetest.add_entity(pos2, "mobs_mc:skeleton_horse")
|
add_entity(pos2, "mobs_mc:skeleton_horse")
|
||||||
|
|
||||||
local angle, posadd
|
local angle, posadd
|
||||||
angle = math.random(0, math.pi*2)
|
angle = math.random(0, math.pi*2)
|
||||||
|
|
|
@ -96,8 +96,9 @@ minetest.register_abm({
|
||||||
chance = 1,
|
chance = 1,
|
||||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||||
local light = minetest.get_node_light(pos, nil)
|
local light = minetest.get_node_light(pos, nil)
|
||||||
|
local time = minetest.get_us_time()
|
||||||
|
|
||||||
if light >= 12 and minetest.get_timeofday() > 0.2 and minetest.get_timeofday() < 0.8 then
|
if light >= 14 and time > 6000 then
|
||||||
minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_on", param2=node.param2})
|
minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_on", param2=node.param2})
|
||||||
mesecon.receptor_on(pos, mesecon.rules.pplate)
|
mesecon.receptor_on(pos, mesecon.rules.pplate)
|
||||||
end
|
end
|
||||||
|
@ -111,8 +112,9 @@ minetest.register_abm({
|
||||||
chance = 1,
|
chance = 1,
|
||||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||||
local light = minetest.get_node_light(pos, nil)
|
local light = minetest.get_node_light(pos, nil)
|
||||||
|
local time = minetest.get_us_time()
|
||||||
|
|
||||||
if light < 12 then
|
if light < 14 and time > 18000 then
|
||||||
minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_off", param2=node.param2})
|
minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_off", param2=node.param2})
|
||||||
mesecon.receptor_off(pos, mesecon.rules.pplate)
|
mesecon.receptor_off(pos, mesecon.rules.pplate)
|
||||||
end
|
end
|
||||||
|
@ -203,8 +205,9 @@ minetest.register_abm({
|
||||||
chance = 1,
|
chance = 1,
|
||||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||||
local light = minetest.get_node_light(pos, nil)
|
local light = minetest.get_node_light(pos, nil)
|
||||||
|
local time = minetest.get_us_time()
|
||||||
|
|
||||||
if light < 12 then
|
if light < 14 and time > 18000 then
|
||||||
minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_inverted_on", param2=node.param2})
|
minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_inverted_on", param2=node.param2})
|
||||||
mesecon.receptor_on(pos, mesecon.rules.pplate)
|
mesecon.receptor_on(pos, mesecon.rules.pplate)
|
||||||
end
|
end
|
||||||
|
@ -218,8 +221,9 @@ minetest.register_abm({
|
||||||
chance = 1,
|
chance = 1,
|
||||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||||
local light = minetest.get_node_light(pos, nil)
|
local light = minetest.get_node_light(pos, nil)
|
||||||
|
local time = minetest.get_us_time()
|
||||||
|
|
||||||
if light >= 12 and minetest.get_timeofday() > 0.8 and minetest.get_timeofday() < 0.2 then
|
if light >= 14 and time > 6000 then
|
||||||
minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_inverted_off", param2=node.param2})
|
minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_inverted_off", param2=node.param2})
|
||||||
mesecon.receptor_off(pos, mesecon.rules.pplate)
|
mesecon.receptor_off(pos, mesecon.rules.pplate)
|
||||||
end
|
end
|
||||||
|
|
|
@ -123,7 +123,7 @@ function mcl_enchanting.can_enchant(itemstack, enchantment, level)
|
||||||
if itemname == "" then
|
if itemname == "" then
|
||||||
return false, "item missing"
|
return false, "item missing"
|
||||||
end
|
end
|
||||||
local supported, primary = mcl_enchanting.item_supports_enchantment(itemstack:get_name(), enchantment)
|
local supported, primary = mcl_enchanting.item_supports_enchantment(itemname, enchantment)
|
||||||
if not supported then
|
if not supported then
|
||||||
return false, "item not supported"
|
return false, "item not supported"
|
||||||
end
|
end
|
||||||
|
@ -132,7 +132,7 @@ function mcl_enchanting.can_enchant(itemstack, enchantment, level)
|
||||||
end
|
end
|
||||||
if level > enchantment_def.max_level then
|
if level > enchantment_def.max_level then
|
||||||
return false, "level too high", enchantment_def.max_level
|
return false, "level too high", enchantment_def.max_level
|
||||||
elseif level < 1 then
|
elseif level < 1 then
|
||||||
return false, "level too small", 1
|
return false, "level too small", 1
|
||||||
end
|
end
|
||||||
local item_enchantments = mcl_enchanting.get_enchantments(itemstack)
|
local item_enchantments = mcl_enchanting.get_enchantments(itemstack)
|
||||||
|
@ -295,115 +295,125 @@ function mcl_enchanting.initialize()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_enchanting.get_possible_enchantments(itemstack, enchantment_level, treasure)
|
function mcl_enchanting.random(pr, ...)
|
||||||
local possible_enchantments, weights, accum_weight = {}, {}, 0
|
local r = pr and pr:next(...) or math.random(...)
|
||||||
for enchantment, enchantment_def in pairs(mcl_enchanting.enchantments) do
|
|
||||||
local _, _, _, primary = mcl_enchanting.can_enchant(itemstack, enchantment, 1)
|
if pr and not ({...})[1] then
|
||||||
if primary or treasure then
|
r = r / 32767
|
||||||
table.insert(possible_enchantments, enchantment)
|
|
||||||
accum_weight = accum_weight + enchantment_def.weight
|
|
||||||
weights[enchantment] = accum_weight
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return possible_enchantments, weights, accum_weight
|
|
||||||
|
return r
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_enchanting.generate_random_enchantments(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted)
|
function mcl_enchanting.get_random_enchantment(itemstack, treasure, weighted, exclude, pr)
|
||||||
|
local possible = {}
|
||||||
|
|
||||||
|
for enchantment, enchantment_def in pairs(mcl_enchanting.enchantments) do
|
||||||
|
local can_enchant, _, _, primary = mcl_enchanting.can_enchant(itemstack, enchantment, 1)
|
||||||
|
|
||||||
|
if can_enchant and (primary or treasure) and (not exclude or table.indexof(exclude, enchantment) == -1) then
|
||||||
|
local weight = weighted and enchantment_def.weight or 1
|
||||||
|
|
||||||
|
for i = 1, weight do
|
||||||
|
table.insert(possible, enchantment)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return #possible > 0 and possible[mcl_enchanting.random(pr, 1, #possible)]
|
||||||
|
end
|
||||||
|
|
||||||
|
function mcl_enchanting.generate_random_enchantments(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr)
|
||||||
local itemname = itemstack:get_name()
|
local itemname = itemstack:get_name()
|
||||||
|
|
||||||
if not mcl_enchanting.can_enchant_freshly(itemname) and not ignore_already_enchanted then
|
if not mcl_enchanting.can_enchant_freshly(itemname) and not ignore_already_enchanted then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
itemstack = ItemStack(itemstack)
|
itemstack = ItemStack(itemstack)
|
||||||
|
|
||||||
local enchantability = minetest.get_item_group(itemname, "enchantability")
|
local enchantability = minetest.get_item_group(itemname, "enchantability")
|
||||||
enchantability = 1 + math.random(0, math.floor(enchantability / 4)) + math.random(0, math.floor(enchantability / 4))
|
enchantability = 1 + mcl_enchanting.random(pr, 0, math.floor(enchantability / 4)) + mcl_enchanting.random(pr, 0, math.floor(enchantability / 4))
|
||||||
|
|
||||||
enchantment_level = enchantment_level + enchantability
|
enchantment_level = enchantment_level + enchantability
|
||||||
enchantment_level = enchantment_level + enchantment_level * (math.random() + math.random() - 1) * 0.15
|
enchantment_level = enchantment_level + enchantment_level * (mcl_enchanting.random(pr) + mcl_enchanting.random(pr) - 1) * 0.15
|
||||||
enchantment_level = math.max(math.floor(enchantment_level + 0.5), 1)
|
enchantment_level = math.max(math.floor(enchantment_level + 0.5), 1)
|
||||||
|
|
||||||
local enchantments = {}
|
local enchantments = {}
|
||||||
local description
|
local description
|
||||||
|
|
||||||
enchantment_level = enchantment_level * 2
|
enchantment_level = enchantment_level * 2
|
||||||
|
|
||||||
repeat
|
repeat
|
||||||
enchantment_level = math.floor(enchantment_level / 2)
|
enchantment_level = math.floor(enchantment_level / 2)
|
||||||
|
|
||||||
if enchantment_level == 0 then
|
if enchantment_level == 0 then
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
local possible, weights, accum_weight = mcl_enchanting.get_possible_enchantments(itemstack, enchantment_level, treasure)
|
|
||||||
local selected_enchantment, enchantment_power
|
local selected_enchantment = mcl_enchanting.get_random_enchantment(itemstack, treasure, true, nil, pr)
|
||||||
if #possible > 0 then
|
|
||||||
local r = math.random(accum_weight)
|
if not selected_enchantment then
|
||||||
for _, enchantment in ipairs(possible) do
|
|
||||||
if weights[enchantment] >= r then
|
|
||||||
selected_enchantment = enchantment
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
local enchantment_def = mcl_enchanting.enchantments[selected_enchantment]
|
|
||||||
local power_range_table = enchantment_def.power_range_table
|
|
||||||
for i = enchantment_def.max_level, 1, -1 do
|
|
||||||
local power_range = power_range_table[i]
|
|
||||||
if enchantment_level >= power_range[1] and enchantment_level <= power_range[2] then
|
|
||||||
enchantment_power = i
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if not description then
|
|
||||||
if not enchantment_power then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
description = mcl_enchanting.get_enchantment_description(selected_enchantment, enchantment_power)
|
|
||||||
end
|
|
||||||
if enchantment_power then
|
|
||||||
enchantments[selected_enchantment] = enchantment_power
|
|
||||||
mcl_enchanting.enchant(itemstack, selected_enchantment, enchantment_power)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
until not no_reduced_bonus_chance and math.random() >= (enchantment_level + 1) / 50
|
|
||||||
|
local enchantment_def = mcl_enchanting.enchantments[selected_enchantment]
|
||||||
|
local power_range_table = enchantment_def.power_range_table
|
||||||
|
|
||||||
|
local enchantment_power
|
||||||
|
|
||||||
|
for i = enchantment_def.max_level, 1, -1 do
|
||||||
|
local power_range = power_range_table[i]
|
||||||
|
if enchantment_level >= power_range[1] and enchantment_level <= power_range[2] then
|
||||||
|
enchantment_power = i
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if not description then
|
||||||
|
if not enchantment_power then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
description = mcl_enchanting.get_enchantment_description(selected_enchantment, enchantment_power)
|
||||||
|
end
|
||||||
|
|
||||||
|
if enchantment_power then
|
||||||
|
enchantments[selected_enchantment] = enchantment_power
|
||||||
|
mcl_enchanting.enchant(itemstack, selected_enchantment, enchantment_power)
|
||||||
|
end
|
||||||
|
|
||||||
|
until not no_reduced_bonus_chance and mcl_enchanting.random(pr) >= (enchantment_level + 1) / 50
|
||||||
|
|
||||||
return enchantments, description
|
return enchantments, description
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_enchanting.generate_random_enchantments_reliable(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted)
|
function mcl_enchanting.generate_random_enchantments_reliable(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr)
|
||||||
local enchantments
|
local enchantments
|
||||||
|
|
||||||
repeat
|
repeat
|
||||||
enchantments = mcl_enchanting.generate_random_enchantments(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted)
|
enchantments = mcl_enchanting.generate_random_enchantments(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr)
|
||||||
until enchantments
|
until enchantments
|
||||||
|
|
||||||
return enchantments
|
return enchantments
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_enchanting.enchant_randomly(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted)
|
function mcl_enchanting.enchant_randomly(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr)
|
||||||
|
local enchantments = mcl_enchanting.generate_random_enchantments_reliable(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr)
|
||||||
|
|
||||||
mcl_enchanting.set_enchanted_itemstring(itemstack)
|
mcl_enchanting.set_enchanted_itemstring(itemstack)
|
||||||
mcl_enchanting.set_enchantments(itemstack, mcl_enchanting.generate_random_enchantments_reliable(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted))
|
mcl_enchanting.set_enchantments(itemstack, enchantments)
|
||||||
|
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_enchanting.get_randomly_enchanted_book(enchantment_level, treasure, no_reduced_bonus_chance)
|
function mcl_enchanting.enchant_uniform_randomly(stack, exclude, pr)
|
||||||
return mcl_enchanting.enchant_randomly(ItemStack("mcl_books:book"), enchantment_level, treasure, no_reduced_bonus_chance, true)
|
local enchantment = mcl_enchanting.get_random_enchantment(stack, true, false, exclude, pr)
|
||||||
end
|
|
||||||
|
|
||||||
function mcl_enchanting.get_uniform_randomly_enchanted_book(except, pr)
|
if enchantment then
|
||||||
except = except or except
|
mcl_enchanting.enchant(stack, enchantment, mcl_enchanting.random(pr, 1, mcl_enchanting.enchantments[enchantment].max_level))
|
||||||
local stack = ItemStack("mcl_enchanting:book_enchanted")
|
|
||||||
local list = {}
|
|
||||||
for enchantment in pairs(mcl_enchanting.enchantments) do
|
|
||||||
if table.indexof(except, enchantment) == -1 then
|
|
||||||
table.insert(list, enchantment)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
local index, level
|
|
||||||
if pr then
|
|
||||||
index = pr:next(1,#list)
|
|
||||||
else
|
|
||||||
index = math.random(#list)
|
|
||||||
end
|
|
||||||
local enchantment = list[index]
|
|
||||||
local enchantment_def = mcl_enchanting.enchantments[enchantment]
|
|
||||||
if pr then
|
|
||||||
level = pr:next(1, enchantment_def.max_level)
|
|
||||||
else
|
|
||||||
level = math.random(enchantment_def.max_level)
|
|
||||||
end
|
|
||||||
mcl_enchanting.enchant(stack, enchantment, level)
|
|
||||||
return stack
|
return stack
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,9 @@ local fish = function(itemstack, player, pointed_thing)
|
||||||
{ itemstring = "mcl_fishing:salmon_raw", weight = 25 },
|
{ itemstring = "mcl_fishing:salmon_raw", weight = 25 },
|
||||||
{ itemstring = "mcl_fishing:clownfish_raw", weight = 2 },
|
{ itemstring = "mcl_fishing:clownfish_raw", weight = 2 },
|
||||||
{ itemstring = "mcl_fishing:pufferfish_raw", weight = 13 },
|
{ itemstring = "mcl_fishing:pufferfish_raw", weight = 13 },
|
||||||
}
|
},
|
||||||
|
stacks_min = 1,
|
||||||
|
stacks_max = 1,
|
||||||
}, pr)
|
}, pr)
|
||||||
elseif r <= junk_value then
|
elseif r <= junk_value then
|
||||||
-- Junk
|
-- Junk
|
||||||
|
@ -88,21 +90,29 @@ local fish = function(itemstack, player, pointed_thing)
|
||||||
{ itemstring = "mcl_mobitems:bone", weight = 10 },
|
{ itemstring = "mcl_mobitems:bone", weight = 10 },
|
||||||
{ itemstring = "mcl_dye:black", weight = 1, amount_min = 10, amount_max = 10 },
|
{ itemstring = "mcl_dye:black", weight = 1, amount_min = 10, amount_max = 10 },
|
||||||
{ itemstring = "mcl_mobitems:string", weight = 10 }, -- TODO: Tripwire Hook
|
{ itemstring = "mcl_mobitems:string", weight = 10 }, -- TODO: Tripwire Hook
|
||||||
}
|
},
|
||||||
|
stacks_min = 1,
|
||||||
|
stacks_max = 1,
|
||||||
}, pr)
|
}, pr)
|
||||||
else
|
else
|
||||||
-- Treasure
|
-- Treasure
|
||||||
items = mcl_loot.get_loot({
|
items = mcl_loot.get_loot({
|
||||||
items = {
|
items = {
|
||||||
-- TODO: Enchanted Bow
|
{ itemstring = "mcl_bows:bow", wear_min = 49144, wear_max = 65535, func = function(stack, pr)
|
||||||
{ itemstring = "mcl_bows:bow", wear_min = 49144, wear_max = 65535 }, -- 75%-100% damage
|
mcl_enchanting.enchant_randomly(stack, 30, true, false, false, pr)
|
||||||
{ itemstack = mcl_enchanting.get_randomly_enchanted_book(30, true, true)},
|
end }, -- 75%-100% damage
|
||||||
-- TODO: Enchanted Fishing Rod
|
{ itemstring = "mcl_books:book", func = function(stack, pr)
|
||||||
{ itemstring = "mcl_fishing:fishing_rod", wear_min = 49144, wear_max = 65535 }, -- 75%-100% damage
|
mcl_enchanting.enchant_randomly(stack, 30, true, true, false, pr)
|
||||||
|
end },
|
||||||
|
{ itemstring = "mcl_fishing:fishing_rod", wear_min = 49144, wear_max = 65535, func = function(stack, pr)
|
||||||
|
mcl_enchanting.enchant_randomly(stack, 30, true, false, false, pr)
|
||||||
|
end }, -- 75%-100% damage
|
||||||
{ itemstring = "mcl_mobs:nametag", },
|
{ itemstring = "mcl_mobs:nametag", },
|
||||||
{ itemstring = "mcl_mobitems:saddle", },
|
{ itemstring = "mcl_mobitems:saddle", },
|
||||||
{ itemstring = "mcl_flowers:waterlily", },
|
{ itemstring = "mcl_flowers:waterlily", },
|
||||||
}
|
},
|
||||||
|
stacks_min = 1,
|
||||||
|
stacks_max = 1,
|
||||||
}, pr)
|
}, pr)
|
||||||
end
|
end
|
||||||
local item
|
local item
|
||||||
|
|
|
@ -350,7 +350,7 @@ minetest.register_abm({
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
|
|
||||||
for _,object in pairs(minetest.get_objects_inside_radius(pos, 2)) do
|
for _,object in pairs(minetest.get_objects_inside_radius(pos, 2)) do
|
||||||
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
|
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and not object:get_luaentity()._removed then
|
||||||
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
|
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
|
||||||
-- Item must get sucked in when the item just TOUCHES the block above the hopper
|
-- Item must get sucked in when the item just TOUCHES the block above the hopper
|
||||||
-- This is the reason for the Y calculation.
|
-- This is the reason for the Y calculation.
|
||||||
|
|
|
@ -242,6 +242,11 @@ local function destroy_nether_portal(pos, node)
|
||||||
check_remove({x = pos.x, y = pos.y + 1, z = pos.z})
|
check_remove({x = pos.x, y = pos.y + 1, z = pos.z})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local on_rotate
|
||||||
|
if minetest.get_modpath("screwdriver") then
|
||||||
|
on_rotate = screwdriver.disallow
|
||||||
|
end
|
||||||
|
|
||||||
minetest.register_node(PORTAL, {
|
minetest.register_node(PORTAL, {
|
||||||
description = S("Nether Portal"),
|
description = S("Nether Portal"),
|
||||||
_doc_items_longdesc = S("A Nether portal teleports creatures and objects to the hot and dangerous Nether dimension (and back!). Enter at your own risk!"),
|
_doc_items_longdesc = S("A Nether portal teleports creatures and objects to the hot and dangerous Nether dimension (and back!). Enter at your own risk!"),
|
||||||
|
@ -291,6 +296,7 @@ minetest.register_node(PORTAL, {
|
||||||
groups = { creative_breakable = 1, portal = 1, not_in_creative_inventory = 1 },
|
groups = { creative_breakable = 1, portal = 1, not_in_creative_inventory = 1 },
|
||||||
sounds = mcl_sounds.node_sound_glass_defaults(),
|
sounds = mcl_sounds.node_sound_glass_defaults(),
|
||||||
after_destruct = destroy_nether_portal,
|
after_destruct = destroy_nether_portal,
|
||||||
|
on_rotate = on_rotate,
|
||||||
|
|
||||||
_mcl_hardness = -1,
|
_mcl_hardness = -1,
|
||||||
_mcl_blast_resistance = 0,
|
_mcl_blast_resistance = 0,
|
||||||
|
|
|
@ -63,6 +63,67 @@ local surround_vectors = {
|
||||||
{ x=0, y=0, z=1 },
|
{ x=0, y=0, z=1 },
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local loottable =
|
||||||
|
{
|
||||||
|
{
|
||||||
|
stacks_min = 1,
|
||||||
|
stacks_max = 3,
|
||||||
|
items = {
|
||||||
|
{ itemstring = "mcl_mobs:nametag", weight = 20 },
|
||||||
|
{ itemstring = "mcl_mobitems:saddle", weight = 20 },
|
||||||
|
{ itemstring = "mcl_jukebox:record_1", weight = 15 },
|
||||||
|
{ itemstring = "mcl_jukebox:record_4", weight = 15 },
|
||||||
|
{ itemstring = "mobs_mc:iron_horse_armor", weight = 15 },
|
||||||
|
{ itemstring = "mcl_core:apple_gold", weight = 15 },
|
||||||
|
{ itemstring = "mcl_books:book", weight = 10, func = function(stack, pr)
|
||||||
|
mcl_enchanting.enchant_uniform_randomly(stack, {"soul_speed"}, pr)
|
||||||
|
end },
|
||||||
|
{ itemstring = "mobs_mc:gold_horse_armor", weight = 10 },
|
||||||
|
{ itemstring = "mobs_mc:diamond_horse_armor", weight = 5 },
|
||||||
|
{ itemstring = "mcl_core:apple_gold_enchanted", weight = 2 },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
stacks_min = 1,
|
||||||
|
stacks_max = 4,
|
||||||
|
items = {
|
||||||
|
{ itemstring = "mcl_farming:wheat_item", weight = 20, amount_min = 1, amount_max = 4 },
|
||||||
|
{ itemstring = "mcl_farming:bread", weight = 20 },
|
||||||
|
{ itemstring = "mcl_core:coal_lump", weight = 15, amount_min = 1, amount_max = 4 },
|
||||||
|
{ itemstring = "mesecons:redstone", weight = 15, amount_min = 1, amount_max = 4 },
|
||||||
|
{ itemstring = "mcl_farming:beetroot_seeds", weight = 10, amount_min = 2, amount_max = 4 },
|
||||||
|
{ itemstring = "mcl_farming:melon_seeds", weight = 10, amount_min = 2, amount_max = 4 },
|
||||||
|
{ itemstring = "mcl_farming:pumpkin_seeds", weight = 10, amount_min = 2, amount_max = 4 },
|
||||||
|
{ itemstring = "mcl_core:iron_ingot", weight = 10, amount_min = 1, amount_max = 4 },
|
||||||
|
{ itemstring = "mcl_buckets:bucket_empty", weight = 10 },
|
||||||
|
{ itemstring = "mcl_core:gold_ingot", weight = 5, amount_min = 1, amount_max = 4 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
stacks_min = 3,
|
||||||
|
stacks_max = 3,
|
||||||
|
items = {
|
||||||
|
{ itemstring = "mcl_mobitems:bone", weight = 10, amount_min = 1, amount_max = 8 },
|
||||||
|
{ itemstring = "mcl_mobitems:gunpowder", weight = 10, amount_min = 1, amount_max = 8 },
|
||||||
|
{ itemstring = "mcl_mobitems:rotten_flesh", weight = 10, amount_min = 1, amount_max = 8 },
|
||||||
|
{ itemstring = "mcl_mobitems:string", weight = 10, amount_min = 1, amount_max = 8 },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Bonus loot for v6 mapgen: Otherwise unobtainable saplings.
|
||||||
|
if mg_name == "v6" then
|
||||||
|
table.insert(loottable, {
|
||||||
|
stacks_min = 1,
|
||||||
|
stacks_max = 3,
|
||||||
|
items = {
|
||||||
|
{ itemstring = "mcl_core:birchsapling", weight = 1, amount_min = 1, amount_max = 2 },
|
||||||
|
{ itemstring = "mcl_core:acaciasapling", weight = 1, amount_min = 1, amount_max = 2 },
|
||||||
|
{ itemstring = "", weight = 6 },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
local function ecb_spawn_dungeon(blockpos, action, calls_remaining, param)
|
local function ecb_spawn_dungeon(blockpos, action, calls_remaining, param)
|
||||||
if calls_remaining >= 1 then return end
|
if calls_remaining >= 1 then return end
|
||||||
|
|
||||||
|
@ -310,66 +371,6 @@ local function ecb_spawn_dungeon(blockpos, action, calls_remaining, param)
|
||||||
|
|
||||||
set_node(pos, {name="mcl_chests:chest", param2=facedir})
|
set_node(pos, {name="mcl_chests:chest", param2=facedir})
|
||||||
local meta = get_meta(pos)
|
local meta = get_meta(pos)
|
||||||
|
|
||||||
local loottable =
|
|
||||||
{
|
|
||||||
{
|
|
||||||
stacks_min = 1,
|
|
||||||
stacks_max = 3,
|
|
||||||
items = {
|
|
||||||
{ itemstring = "mcl_mobs:nametag", weight = 20 },
|
|
||||||
{ itemstring = "mcl_mobitems:saddle", weight = 20 },
|
|
||||||
{ itemstring = "mcl_jukebox:record_1", weight = 15 },
|
|
||||||
{ itemstring = "mcl_jukebox:record_4", weight = 15 },
|
|
||||||
{ itemstring = "mobs_mc:iron_horse_armor", weight = 15 },
|
|
||||||
{ itemstring = "mcl_core:apple_gold", weight = 15 },
|
|
||||||
{ itemstack = mcl_enchanting.get_uniform_randomly_enchanted_book({"soul_speed"}, pr), weight = 10 },
|
|
||||||
{ itemstring = "mobs_mc:gold_horse_armor", weight = 10 },
|
|
||||||
{ itemstring = "mobs_mc:diamond_horse_armor", weight = 5 },
|
|
||||||
{ itemstring = "mcl_core:apple_gold_enchanted", weight = 2 },
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
stacks_min = 1,
|
|
||||||
stacks_max = 4,
|
|
||||||
items = {
|
|
||||||
{ itemstring = "mcl_farming:wheat_item", weight = 20, amount_min = 1, amount_max = 4 },
|
|
||||||
{ itemstring = "mcl_farming:bread", weight = 20 },
|
|
||||||
{ itemstring = "mcl_core:coal_lump", weight = 15, amount_min = 1, amount_max = 4 },
|
|
||||||
{ itemstring = "mesecons:redstone", weight = 15, amount_min = 1, amount_max = 4 },
|
|
||||||
{ itemstring = "mcl_farming:beetroot_seeds", weight = 10, amount_min = 2, amount_max = 4 },
|
|
||||||
{ itemstring = "mcl_farming:melon_seeds", weight = 10, amount_min = 2, amount_max = 4 },
|
|
||||||
{ itemstring = "mcl_farming:pumpkin_seeds", weight = 10, amount_min = 2, amount_max = 4 },
|
|
||||||
{ itemstring = "mcl_core:iron_ingot", weight = 10, amount_min = 1, amount_max = 4 },
|
|
||||||
{ itemstring = "mcl_buckets:bucket_empty", weight = 10 },
|
|
||||||
{ itemstring = "mcl_core:gold_ingot", weight = 5, amount_min = 1, amount_max = 4 },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
stacks_min = 3,
|
|
||||||
stacks_max = 3,
|
|
||||||
items = {
|
|
||||||
{ itemstring = "mcl_mobitems:bone", weight = 10, amount_min = 1, amount_max = 8 },
|
|
||||||
{ itemstring = "mcl_mobitems:gunpowder", weight = 10, amount_min = 1, amount_max = 8 },
|
|
||||||
{ itemstring = "mcl_mobitems:rotten_flesh", weight = 10, amount_min = 1, amount_max = 8 },
|
|
||||||
{ itemstring = "mcl_mobitems:string", weight = 10, amount_min = 1, amount_max = 8 },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Bonus loot for v6 mapgen: Otherwise unobtainable saplings.
|
|
||||||
if mg_name == "v6" then
|
|
||||||
table_insert(loottable, {
|
|
||||||
stacks_min = 1,
|
|
||||||
stacks_max = 3,
|
|
||||||
items = {
|
|
||||||
{ itemstring = "mcl_core:birchsapling", weight = 1, amount_min = 1, amount_max = 2 },
|
|
||||||
{ itemstring = "mcl_core:acaciasapling", weight = 1, amount_min = 1, amount_max = 2 },
|
|
||||||
{ itemstring = "", weight = 6 },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
minetest.log("action", "[mcl_dungeons] Filling chest " .. tostring(c) .. " at " .. minetest.pos_to_string(pos))
|
minetest.log("action", "[mcl_dungeons] Filling chest " .. tostring(c) .. " at " .. minetest.pos_to_string(pos))
|
||||||
mcl_loot.fill_inventory(meta:get_inventory(), "main", mcl_loot.get_multi_loot(loottable, pr), pr)
|
mcl_loot.fill_inventory(meta:get_inventory(), "main", mcl_loot.get_multi_loot(loottable, pr), pr)
|
||||||
end
|
end
|
||||||
|
|
|
@ -454,7 +454,9 @@ local function temple_placement_callback(p1, p2, size, rotation, pr)
|
||||||
{ itemstring = "mcl_mobitems:bone", weight = 25, amount_min = 4, amount_max=6 },
|
{ itemstring = "mcl_mobitems:bone", weight = 25, amount_min = 4, amount_max=6 },
|
||||||
{ itemstring = "mcl_mobitems:rotten_flesh", weight = 25, amount_min = 3, amount_max=7 },
|
{ itemstring = "mcl_mobitems:rotten_flesh", weight = 25, amount_min = 3, amount_max=7 },
|
||||||
{ itemstring = "mcl_mobitems:spider_eye", weight = 25, amount_min = 1, amount_max=3 },
|
{ itemstring = "mcl_mobitems:spider_eye", weight = 25, amount_min = 1, amount_max=3 },
|
||||||
{ itemstack = mcl_enchanting.get_uniform_randomly_enchanted_book({"soul_speed"}, pr), weight = 20, },
|
{ itemstring = "mcl_books:book", weight = 20, func = function(stack, pr)
|
||||||
|
mcl_enchanting.enchant_uniform_randomly(stack, {"soul_speed"}, pr)
|
||||||
|
end },
|
||||||
{ itemstring = "mcl_mobitems:saddle", weight = 20, },
|
{ itemstring = "mcl_mobitems:saddle", weight = 20, },
|
||||||
{ itemstring = "mcl_core:apple_gold", weight = 20, },
|
{ itemstring = "mcl_core:apple_gold", weight = 20, },
|
||||||
{ itemstring = "mcl_core:gold_ingot", weight = 15, amount_min = 2, amount_max = 7 },
|
{ itemstring = "mcl_core:gold_ingot", weight = 15, amount_min = 2, amount_max = 7 },
|
||||||
|
|
|
@ -66,7 +66,9 @@ function tsm_railcorridors.get_treasures(pr)
|
||||||
items = {
|
items = {
|
||||||
{ itemstring = "mcl_mobs:nametag", weight = 30 },
|
{ itemstring = "mcl_mobs:nametag", weight = 30 },
|
||||||
{ itemstring = "mcl_core:apple_gold", weight = 20 },
|
{ itemstring = "mcl_core:apple_gold", weight = 20 },
|
||||||
{ itemstack = mcl_enchanting.get_uniform_randomly_enchanted_book({"soul_speed"}, pr), weight = 10 },
|
{ itemstring = "mcl_books:book", weight = 10, func = function(stack, pr)
|
||||||
|
mcl_enchanting.enchant_uniform_randomly(stack, {"soul_speed"}, pr)
|
||||||
|
end },
|
||||||
{ itemstring = "", weight = 5},
|
{ itemstring = "", weight = 5},
|
||||||
{ itemstring = "mcl_core:pick_iron", weight = 5 },
|
{ itemstring = "mcl_core:pick_iron", weight = 5 },
|
||||||
{ itemstring = "mcl_core:apple_gold_enchanted", weight = 1 },
|
{ itemstring = "mcl_core:apple_gold_enchanted", weight = 1 },
|
||||||
|
|
Loading…
Reference in New Issue