mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-12-27 18:39:34 +01:00
Merge pull request 'master' (#6) from MineClone2/MineClone2:master into master
Reviewed-on: https://git.minetest.land/epCode/MineClone2/pulls/6
This commit is contained in:
epCode
commit
6f8d728035
2 changed files with 93 additions and 22 deletions
|
|
@ -789,15 +789,15 @@ local check_for_death = function(self, cause, cmi_cause)
|
|||
local puncher = cmi_cause.puncher
|
||||
if puncher then
|
||||
wielditem = puncher:get_wielded_item()
|
||||
|
||||
if mod_experience and ((not self.child) or self.type ~= "animal") then
|
||||
mcl_experience.throw_experience(self.object:get_pos(), math.random(self.xp_min, self.xp_max))
|
||||
end
|
||||
end
|
||||
end
|
||||
local cooked = mcl_burning.is_burning(self.object) or mcl_enchanting.has_enchantment(wielditem, "fire_aspect")
|
||||
local looting = mcl_enchanting.get_enchantment(wielditem, "looting")
|
||||
item_drop(self, cooked, looting)
|
||||
|
||||
if mod_experience and ((not self.child) or self.type ~= "animal") and (minetest.get_us_time() - self.xp_timestamp <= 5000000) then
|
||||
mcl_experience.throw_experience(self.object:get_pos(), math.random(self.xp_min, self.xp_max))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -2921,10 +2921,16 @@ local mob_punch = function(self, hitter, tflp, tool_capabilities, dir)
|
|||
return
|
||||
end
|
||||
|
||||
-- is mob protected?
|
||||
if self.protected and hitter:is_player()
|
||||
and minetest.is_protected(self.object:get_pos(), hitter:get_player_name()) then
|
||||
return
|
||||
local is_player = hitter:is_player()
|
||||
|
||||
if is_player then
|
||||
-- is mob protected?
|
||||
if self.protected and minetest.is_protected(self.object:get_pos(), hitter:get_player_name()) then
|
||||
return
|
||||
end
|
||||
|
||||
-- set/update 'drop xp' timestamp if hitted by player
|
||||
self.xp_timestamp = minetest.get_us_time()
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -2933,7 +2939,7 @@ local mob_punch = function(self, hitter, tflp, tool_capabilities, dir)
|
|||
local punch_interval = 1.4
|
||||
|
||||
-- exhaust attacker
|
||||
if mod_hunger and hitter:is_player() then
|
||||
if mod_hunger and is_player then
|
||||
mcl_hunger.exhaust(hitter:get_player_name(), mcl_hunger.EXHAUST_ATTACK)
|
||||
end
|
||||
|
||||
|
|
@ -3082,7 +3088,7 @@ local mob_punch = function(self, hitter, tflp, tool_capabilities, dir)
|
|||
if hitter then
|
||||
luaentity = hitter:get_luaentity()
|
||||
end
|
||||
if hitter and hitter:is_player() then
|
||||
if hitter and is_player then
|
||||
local wielditem = hitter:get_wielded_item()
|
||||
kb = kb + 3 * mcl_enchanting.get_enchantment(wielditem, "knockback")
|
||||
elseif luaentity and luaentity._knockback then
|
||||
|
|
@ -3091,7 +3097,7 @@ local mob_punch = function(self, hitter, tflp, tool_capabilities, dir)
|
|||
|
||||
self.object:set_velocity({
|
||||
x = dir.x * kb,
|
||||
y = dir.y * kb + up,
|
||||
y = dir.y * kb + up * 2,
|
||||
z = dir.z * kb
|
||||
})
|
||||
|
||||
|
|
@ -3719,6 +3725,7 @@ minetest.register_entity(name, {
|
|||
hp_max = scale_difficulty(def.hp_max, 10, 1),
|
||||
xp_min = def.xp_min or 0,
|
||||
xp_max = def.xp_max or 0,
|
||||
xp_timestamp = 0,
|
||||
breath_max = def.breath_max or 15,
|
||||
breathes_in_water = def.breathes_in_water or false,
|
||||
physical = true,
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ local start_pos = minetest.setting_get_pos("static_spawnpoint") or {x = 0, y = 8
|
|||
-- Table of suitable biomes
|
||||
local biome_ids = {}
|
||||
|
||||
local no_trees_area_counter = 0
|
||||
|
||||
-- Bed spawning offsets
|
||||
local node_search_list =
|
||||
{
|
||||
|
|
@ -225,6 +227,33 @@ end
|
|||
-- Spawn position search
|
||||
|
||||
local function next_biome()
|
||||
if #biome_ids < 1 then
|
||||
for _, biome_name in pairs(biomes_white_list) do
|
||||
local biome_id = minetest.get_biome_id(biome_name)
|
||||
if biome_id then
|
||||
table.insert(biome_ids, biome_id)
|
||||
end
|
||||
end
|
||||
if #biome_ids < 1 then
|
||||
next_pos()
|
||||
if math.abs(cp.x) > spawn_limit or math.abs(cp.z) > spawn_limit then
|
||||
check = checks + 1
|
||||
minetest.log("warning", "[mcl_spawn] No white-listed biomes found - search stopped by overlimit")
|
||||
return false
|
||||
end
|
||||
check = check + 1
|
||||
cp.y = minetest.get_spawn_level(cp.x, cp.z) or start_pos.y
|
||||
if cp.y then
|
||||
wsp = {x = cp.x, y = cp.y, z = cp.z}
|
||||
minetest.log("warning", "[mcl_spawn] No white-listed biomes found - using current")
|
||||
return true
|
||||
else
|
||||
minetest.log("warning", "[mcl_spawn] No white-listed biomes found and spawn level is nil - please define start_pos to continue")
|
||||
return false
|
||||
end
|
||||
end
|
||||
minetest.log("action", "[mcl_spawn] Suitable biomes found: "..tostring(#biome_ids))
|
||||
end
|
||||
while check <= checks do
|
||||
local biome_data = minetest.get_biome_data(cp)
|
||||
-- Sometimes biome_data is nil
|
||||
|
|
@ -264,16 +293,56 @@ local function ecb_search_continue(blockpos, action, calls_remaining, param)
|
|||
local nodes = minetest.find_nodes_in_area_under_air(emerge_pos1, emerge_pos2, node_groups_white_list)
|
||||
minetest.log("verbose", "[mcl_spawn] Data emerge callback: "..minetest.pos_to_string(wsp).." - "..tostring(nodes and #nodes) .. " node(s) found under air")
|
||||
if nodes then
|
||||
local trees = get_trees(emerge_pos1, emerge_pos2)
|
||||
if trees then
|
||||
if no_trees_area_counter >= 0 then
|
||||
local trees = get_trees(emerge_pos1, emerge_pos2)
|
||||
if trees and #trees > 0 then
|
||||
no_trees_area_counter = 0
|
||||
if attempts_to_find_pos * 3 < #nodes then
|
||||
-- random
|
||||
for i=1, attempts_to_find_pos do
|
||||
wsp = nodes[math.random(1,#nodes)]
|
||||
if wsp then
|
||||
wsp.y = wsp.y + 1
|
||||
if good_for_respawn(wsp) and can_find_tree(wsp, trees) then
|
||||
minetest.log("action", "[mcl_spawn] Dynamic world spawn randomly determined to be "..minetest.pos_to_string(wsp))
|
||||
searched = true
|
||||
success = true
|
||||
return
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
-- in a sequence
|
||||
for i=1, math.min(#nodes, attempts_to_find_pos) do
|
||||
wsp = nodes[i]
|
||||
if wsp then
|
||||
wsp.y = wsp.y + 1
|
||||
if good_for_respawn(wsp) and can_find_tree(wsp, trees) then
|
||||
minetest.log("action", "[mcl_spawn] Dynamic world spawn determined to be "..minetest.pos_to_string(wsp))
|
||||
searched = true
|
||||
success = true
|
||||
return
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
no_trees_area_counter = no_trees_area_counter + 1
|
||||
if no_trees_area_counter > 10 then
|
||||
minetest.log("verbose", "[mcl_spawn] More than 10 times no trees at all! Won't search trees next 200 calls")
|
||||
no_trees_area_counter = -200
|
||||
end
|
||||
end
|
||||
else -- seems there are no trees but we'll check it later, after next 200 calls
|
||||
no_trees_area_counter = no_trees_area_counter + 1
|
||||
if attempts_to_find_pos * 3 < #nodes then
|
||||
-- random
|
||||
for i=1, attempts_to_find_pos do
|
||||
wsp = nodes[math.random(1,#nodes)]
|
||||
if wsp then
|
||||
wsp.y = wsp.y + 1
|
||||
if good_for_respawn(wsp) and can_find_tree(wsp, trees) then
|
||||
minetest.log("action", "[mcl_spawn] Dynamic world spawn determined to be "..minetest.pos_to_string(wsp))
|
||||
if good_for_respawn(wsp) then
|
||||
minetest.log("action", "[mcl_spawn] Dynamic world spawn randomly determined to be "..minetest.pos_to_string(wsp) .. " (no trees)")
|
||||
searched = true
|
||||
success = true
|
||||
return
|
||||
|
|
@ -286,8 +355,8 @@ local function ecb_search_continue(blockpos, action, calls_remaining, param)
|
|||
wsp = nodes[i]
|
||||
if wsp then
|
||||
wsp.y = wsp.y + 1
|
||||
if good_for_respawn(wsp) and can_find_tree(wsp, trees) then
|
||||
minetest.log("action", "[mcl_spawn] Dynamic world spawn determined to be "..minetest.pos_to_string(wsp))
|
||||
if good_for_respawn(wsp) then
|
||||
minetest.log("action", "[mcl_spawn] Dynamic world spawn determined to be "..minetest.pos_to_string(wsp) .. " (no trees)")
|
||||
searched = true
|
||||
success = true
|
||||
return
|
||||
|
|
@ -425,11 +494,6 @@ end
|
|||
minetest.register_on_respawnplayer(mcl_spawn.spawn)
|
||||
|
||||
function mcl_spawn.shadow_worker()
|
||||
if #biome_ids > 1 then
|
||||
for _, biome_name in pairs(biomes_white_list) do
|
||||
table.insert(biome_ids, minetest.get_biome_id(biome_name))
|
||||
end
|
||||
end
|
||||
if not searched then
|
||||
searched = true
|
||||
mcl_spawn.search()
|
||||
|
|
|
|||
Loading…
Reference in a new issue