Version 3.2.0

This commit is contained in:
Andrea
2024-12-27 11:33:07 +01:00
parent 2335f45b71
commit fcfd6f64d7
8 changed files with 120 additions and 99 deletions

View File

@ -11,31 +11,28 @@ function spears_throw (itemstack, player, pointed_thing)
local pointed_a = pointed_thing.above
local pointed_b = pointed_thing.under
if pointed_thing.type == "node" and vector.distance(pointed_a, throw_pos) < 1 then -- Stick into node
local node = minetest.get_node(pointed_b)
local node = core.get_node(pointed_b)
local check_node = spears_check_node(node.name)
if check_node == nil then
return false
elseif check_node == 'cracky' then
minetest.sound_play("default_metal_footstep", {pos = pointed_a}, true)
core.sound_play("default_metal_footstep", {pos = pointed_a}, true)
return false
elseif check_node == 'sticky' then
local spear_object = minetest.add_entity(vector.divide(vector.add(vector.multiply(pointed_a, 2), pointed_b), 3), spear)
local spear_object = core.add_entity(vector.divide(vector.add(vector.multiply(pointed_a, 2), pointed_b), 3), spear)
spear_object:set_rotation(rotation)
spear_object:get_luaentity()._wear = wear
spear_object:get_luaentity()._stickpos = pointed_b
minetest.sound_play("default_place_node", {pos = pointed_a}, true)
core.sound_play("default_place_node", {pos = pointed_a}, true)
return false
end
else -- Throw
local throw_speed = tonumber(minetest.settings:get("spears_throw_speed") or 13)
--while vector.distance(player_pos, throw_pos) < 1.2 do
-- throw_pos = vector.add(throw_pos, vector.multiply(direction, 0.1))
--end
local throw_speed = tonumber(core.settings:get("spears_throw_speed"))
local player_vel = player:get_velocity()
local spear_object = minetest.add_entity(throw_pos, spear)
local spear_object = core.add_entity(throw_pos, spear)
spear_object:set_velocity(vector.add(player_vel, vector.multiply(direction, throw_speed)))
spear_object:set_rotation(rotation)
minetest.sound_play("spears_throw", {pos = player_pos}, true)
core.sound_play("spears_throw", {pos = player_pos}, true)
spear_object:get_luaentity()._wear = wear
spear_object:get_luaentity()._stickpos = nil
spear_object:get_luaentity()._owner = player:get_luaentity()
@ -78,60 +75,60 @@ function spears_set_entity(spear_type, base_damage, toughness)
local velocity = self.object:get_velocity()
local speed = vector.length(velocity)
if self._stickpos ~= nil then -- Spear is stuck
local node = minetest.get_node(self._stickpos)
local node = core.get_node(self._stickpos)
local check_node = spears_check_node(node.name)
if check_node ~= 'sticky' then -- Fall when node is removed
self.object:remove()
minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
core.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
return false
end
else -- Spear is flying
local direction = vector.normalize(velocity)
local yaw = minetest.dir_to_yaw(direction)
local yaw = core.dir_to_yaw(direction)
local pitch = math.acos(velocity.y/speed) - math.pi/3
local spearhead_pos = vector.add(pos, vector.multiply(direction, 0.5))
self.object:set_rotation({x = 0, y = yaw + math.pi/2, z = pitch})
-- Hit a target?
local objects_in_radius = minetest.get_objects_inside_radius(spearhead_pos, 1)
local objects_in_radius = core.get_objects_inside_radius(spearhead_pos, 1)
for _,object in ipairs(objects_in_radius) do
if spears_check_target(self, object, spearhead_pos) and object:get_armor_groups().fleshy then
local damage = (speed + base_damage)^1.15 - 20
object:punch(self.object, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy=damage},}, direction)
self.object:remove()
minetest.sound_play("spears_hit", {pos = pos}, true)
core.sound_play("spears_hit", {pos = pos}, true)
wear = spears_wear(wear, toughness)
minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
core.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
return true
end
end
-- Hit a node?
local node = minetest.get_node(spearhead_pos)
local node = core.get_node(spearhead_pos)
local check_node = spears_check_node(node.name)
if check_node == nil then
self.object:remove()
minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
core.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
elseif check_node ~= 'through' then
wear = spears_wear(wear, toughness)
if wear >= 65535 then
minetest.sound_play("default_tool_breaks", {pos = pos}, true)
core.sound_play("default_tool_breaks", {pos = pos}, true)
self.object:remove()
minetest.add_item(pos, {name='defaut:stick'})
core.add_item(pos, {name='defaut:stick'})
return false
elseif check_node == 'cracky' then
minetest.sound_play("default_metal_footstep", {pos = pos}, true)
core.sound_play("default_metal_footstep", {pos = pos}, true)
self.object:remove()
minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
core.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
return false
elseif check_node == 'sticky' then
self.object:set_acceleration({x = 0, y = 0, z = 0})
self.object:set_velocity({x = 0, y = 0, z = 0})
minetest.sound_play("default_place_node", {pos = pos}, true)
core.sound_play("default_place_node", {pos = pos}, true)
self._stickpos = spearhead_pos
self._wear = wear
end
else -- Get drag
local viscosity = minetest.registered_nodes[node.name].liquid_viscosity
local drag_coeff = tonumber(minetest.settings:get("spears_drag_coeff") or 0.1)
local viscosity = core.registered_nodes[node.name].liquid_viscosity
local drag_coeff = tonumber(core.settings:get("spears_drag_coeff"))
local drag = math.max(viscosity, drag_coeff)
local acceleration = vector.multiply(velocity, -drag)
acceleration.y = acceleration.y - 10 * ((7 - drag) / 7)
@ -144,8 +141,8 @@ function spears_set_entity(spear_type, base_damage, toughness)
end
function spears_check_node(node_name)
local node = minetest.registered_nodes[node_name]
local cracky_limit = tonumber(minetest.settings:get("spears_node_cracky_limit") or 3)
local node = core.registered_nodes[node_name]
local cracky_limit = tonumber(core.settings:get("spears_node_cracky_limit"))
if node == nil then
return nil
elseif node.groups.cracky ~= nil and node.groups.cracky < cracky_limit then
@ -158,7 +155,7 @@ function spears_check_node(node_name)
end
function spears_wear(initial_wear, toughness)
if not minetest.settings:get_bool("creative_mode") then
if not core.settings:get_bool("creative_mode") then
local wear = initial_wear + 65535/toughness
return wear
else