1
0
mirror of https://gitlab.com/echoes91/spears.git synced 2025-07-02 23:50:20 +02:00

3 Commits

Author SHA1 Message Date
66c69c5265 Fix undeclared global variable warning at startup
DISABLE_GOLD_SPEAR
2020-06-20 16:31:26 +02:00
662e637595 Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-06-14 22:16:47 +02:00
63d339a686 Corrige avertissement sur variable globale 2018-12-24 01:14:12 +01:00
10 changed files with 72 additions and 154 deletions

View File

@ -1,8 +1,3 @@
Version 2.3:
- Updated to Minetest 5.6.0 API
- Changed receipts to avoid being confused with arrows
- Various cleansing and fixes
Version 2.2: Version 2.2:
- "Hit detection" based on spearhead position - "Hit detection" based on spearhead position
- Spears go through buildable_to nodes (snow) - Spears go through buildable_to nodes (snow)

7
README
View File

@ -12,17 +12,14 @@ How to install:
http://wiki.minetest.com/wiki/Installing_Mods http://wiki.minetest.com/wiki/Installing_Mods
How to use the mod: How to use the mod:
Craft a spear with | | | (material) | Craft a spear with | stick | stick | (material) |, works also mirrored.
| | stick | |
| stick | | |,
works also mirrored.
Spears can be thrown using right mouse button, they either hurt someone or stick where they land on; damage depends on speed and material, flight trajectory is ballistic with (unrealistic) drag. Spears can be thrown using right mouse button, they either hurt someone or stick where they land on; damage depends on speed and material, flight trajectory is ballistic with (unrealistic) drag.
Spears can be used to fight, but are slower and weaker than swords. Spears can be used to fight, but are slower and weaker than swords.
Spears can be used to dig, but are slower and weaker and pickaxes. Spears can be used to dig, but are slower and weaker and pickaxes.
If you miss the target it's your fault, the spear is fine. If you miss the target it's your fault, the spear is fine.
You can grab a spear on the fly (or maybe wait until it falls?). You can grab a spear on the fly (or maybe wait until it falls?).
You can stick a spear into a block, but if you remove the block then the spear falls (obviously). You can stick a spear into a block, but if you remove the block then the spear falls (obviously).
This mod contains the word "spear" more than 100 times, if you want the exact number you can count them. This mod contains the word "spear" more than 100 times, if you want the exact number count them yourself.
If you feel clever, throw a spear right above you and look at it to see what happens. If you feel clever, throw a spear right above you and look at it to see what happens.
You can even throw a spear from above down to your foes, it's even easier to hit. You can even throw a spear from above down to your foes, it's even easier to hit.
Someone once reported to have hit its own foot but it takes practice to do that. Someone once reported to have hit its own foot but it takes practice to do that.

View File

@ -5,12 +5,3 @@ DISABLE_BRONZE_SPEAR = false
DISABLE_DIAMOND_SPEAR = false DISABLE_DIAMOND_SPEAR = false
DISABLE_OBSIDIAN_SPEAR = false DISABLE_OBSIDIAN_SPEAR = false
DISABLE_GOLD_SPEAR = false DISABLE_GOLD_SPEAR = false
DISABLE_IRON_SPEAR = false
SPEARS_THROW_SPEED = 13
SPEARS_V_ZERO = {x = 0, y = 0, z = 0}
SPEARS_DRAG_COEFF = 0.1
SPEARS_NODE_UNKNOWN = nil
SPEARS_NODE_THROUGH = 0
SPEARS_NODE_STICKY = 1
SPEARS_NODE_CRACKY = 2
SPEARS_NODE_CRACKY_LIMIT = 3

1
depends.txt Normal file
View File

@ -0,0 +1 @@
default

View File

@ -7,39 +7,30 @@ function spears_throw (itemstack, player, pointed_thing)
local pitch = player:get_look_vertical() local pitch = player:get_look_vertical()
local yaw = player:get_look_horizontal() local yaw = player:get_look_horizontal()
local rotation = vector.new(0, yaw + math.pi/2, pitch + math.pi/6) local rotation = vector.new(0, yaw + math.pi/2, pitch + math.pi/6)
local wear = itemstack:get_wear() -- Plant into node
local pointed_a = pointed_thing.above if pointed_thing.type == "node" then
local pointed_b = pointed_thing.under local node = minetest.get_node(pointed_thing.under)
if pointed_thing.type == "node" and vector.distance(pointed_a, throw_pos) < 1 then -- Stick into node if minetest.registered_nodes[node.name].walkable and vector.distance(pointed_thing.above, throw_pos) < 1 then
local node = minetest.get_node(pointed_b) local spear_object = minetest.add_entity(vector.divide(vector.add(vector.multiply(pointed_thing.above, 2), pointed_thing.under), 3), spear)
local check_node = spears_check_node(node.name)
if check_node == SPEARS_NODE_UNKNOWN then
return false
elseif check_node == SPEARS_NODE_CRACKY then
minetest.sound_play("default_metal_footstep", {pos = pointed_a}, true)
return false
elseif check_node == SPEARS_NODE_STICKY then
local spear_object = minetest.add_entity(vector.divide(vector.add(vector.multiply(pointed_a, 2), pointed_b), 3), spear)
spear_object:set_rotation(rotation) spear_object:set_rotation(rotation)
spear_object:get_luaentity()._wear = wear spear_object:get_luaentity()._wear = itemstack:get_wear()
spear_object:get_luaentity()._stickpos = pointed_b spear_object:get_luaentity()._stickpos = pointed_thing.under
minetest.sound_play("default_place_node", {pos = pointed_a}, true) return
return false
end end
else -- Avoid hitting yourself and throw
local throw_speed = SPEARS_THROW_SPEED
while vector.distance(player_pos, throw_pos) < 1.2 do
throw_pos = vector.add(throw_pos, vector.multiply(direction, 0.1))
end
local player_vel = player:get_velocity()
local spear_object = minetest.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)
spear_object:get_luaentity()._wear = wear
spear_object:get_luaentity()._stickpos = nil
return true
end end
-- Avoid hitting yourself and throw
local throw_speed = 12
while vector.distance(player_pos, throw_pos) < 1.2 do
throw_pos = vector.add(throw_pos, vector.multiply(direction, 0.1))
end
local player_vel = player:get_player_velocity()
local spear_object = minetest.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)
spear_object:get_luaentity()._wear = itemstack:get_wear()
spear_object:get_luaentity()._stickpos = nil
return true
end end
function spears_set_entity(spear_type, base_damage, toughness) function spears_set_entity(spear_type, base_damage, toughness)
@ -68,27 +59,36 @@ function spears_set_entity(spear_type, base_damage, toughness)
end, end,
on_step = function(self, dtime) on_step = function(self, dtime)
local wear = self._wear if not self._wear then
if wear == nil then
self.object:remove() self.object:remove()
return false return
end end
local pos = self.object:get_pos()
local velocity = self.object:get_velocity() local velocity = self.object:get_velocity()
local speed = vector.length(velocity) local speed = vector.length(velocity)
if self._stickpos ~= nil then -- Spear is stuck -- Spear is stuck ?
if self._stickpos then
local node = minetest.get_node(self._stickpos) local node = minetest.get_node(self._stickpos)
local check_node = spears_check_node(node.name) local node_cracky = minetest.registered_nodes[node.name].groups.cracky
if check_node ~= SPEARS_NODE_STICKY then -- Fall when node is removed if node_cracky and node_cracky < 3 then
minetest.sound_play("default_metal_footstep", {pos = pos}, true)
self.object:remove() self.object:remove()
minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear}) minetest.add_item(self.object:get_pos(), {name='spears:spear_' .. spear_type, wear = self._wear})
return false elseif not self._node_walkable then
minetest.sound_play("default_place_node", {pos = throw_pos}, true)
end
self._node_walkable = minetest.registered_nodes[node.name].walkable
if not node or not self._node_walkable then -- Fall when node is removed
self.object:remove()
minetest.add_item(self.object:get_pos(), {name='spears:spear_' .. spear_type, wear = self._wear})
return
end end
else -- Spear is flying else -- Spear is flying
local direction = vector.normalize(velocity) local direction = vector.normalize(velocity)
local yaw = minetest.dir_to_yaw(direction) local yaw = minetest.dir_to_yaw(direction)
local pitch = math.acos(velocity.y/speed) - math.pi/3 local pitch = math.acos(velocity.y/speed) - math.pi/3
local pos = self.object:get_pos()
local spearhead_pos = vector.add(pos, vector.multiply(direction, 0.5)) local spearhead_pos = vector.add(pos, vector.multiply(direction, 0.5))
local node = minetest.get_node(spearhead_pos)
self.object:set_rotation({x = 0, y = yaw + math.pi/2, z = pitch}) self.object:set_rotation({x = 0, y = yaw + math.pi/2, z = pitch})
-- Hit someone? -- Hit someone?
local objects_in_radius = minetest.get_objects_inside_radius(spearhead_pos, 0.6) local objects_in_radius = minetest.get_objects_inside_radius(spearhead_pos, 0.6)
@ -98,39 +98,26 @@ function spears_set_entity(spear_type, base_damage, toughness)
object:punch(self.object, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy=damage},}, direction) object:punch(self.object, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy=damage},}, direction)
self.object:remove() self.object:remove()
minetest.sound_play("spears_hit", {pos = pos}, true) minetest.sound_play("spears_hit", {pos = pos}, true)
wear = spears_wear(wear, toughness) minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = self._wear + 65535/toughness})
minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear}) return
return true
end end
end end
-- Hit a node? -- Hit a node?
local node = minetest.get_node(spearhead_pos) if node and minetest.registered_nodes[node.name].walkable
local check_node = spears_check_node(node.name) and not minetest.registered_nodes[node.name].buildable_to
if check_node == SPEARS_NODE_UNKNOWN then and not (minetest.registered_nodes[node.name].groups.slab and spearhead_pos.y % 1 < 0.5)
self.object:remove() then -- Stick
minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear}) self.object:set_acceleration({x = 0, y = 0, z = 0})
elseif check_node ~= SPEARS_NODE_THROUGH then self.object:set_velocity({x = 0, y = 0, z = 0})
wear = spears_wear(wear, toughness) self._wear = self._wear + 65535/toughness
if wear >= 65535 then if self._wear >= 65535 then
minetest.sound_play("default_tool_breaks", {pos = pos}, true) minetest.sound_play("default_tool_breaks", {pos = pos}, true)
self.object:remove() self.object:remove()
minetest.add_item(pos, {name='defaut:stick'}) return
return false
elseif check_node == SPEARS_NODE_CRACKY then
minetest.sound_play("default_metal_footstep", {pos = pos}, true)
self.object:remove()
minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
return false
elseif check_node == SPEARS_NODE_STICKY then
self.object:set_acceleration(SPEARS_V_ZERO)
self.object:set_velocity(SPEARS_V_ZERO)
minetest.sound_play("default_place_node", {pos = pos}, true)
self._stickpos = spearhead_pos
self._wear = wear
end end
else -- Get drag self._stickpos = spearhead_pos
local viscosity = minetest.registered_nodes[node.name].liquid_viscosity else -- Get drag
local drag = math.max(viscosity, SPEARS_DRAG_COEFF) local drag = math.max(minetest.registered_nodes[node.name].liquid_viscosity, 0.1)
local acceleration = vector.multiply(velocity, -drag) local acceleration = vector.multiply(velocity, -drag)
acceleration.y = acceleration.y - 10 * ((7 - drag) / 7) acceleration.y = acceleration.y - 10 * ((7 - drag) / 7)
self.object:set_acceleration(acceleration) self.object:set_acceleration(acceleration)
@ -140,26 +127,3 @@ function spears_set_entity(spear_type, base_damage, toughness)
} }
return SPEAR_ENTITY return SPEAR_ENTITY
end end
function spears_check_node(node_name)
local node = minetest.registered_nodes[node_name]
if node == nil then
return SPEARS_NODE_UNKNOWN
elseif node.groups.cracky ~= nil and node.groups.cracky < SPEARS_NODE_CRACKY_LIMIT then
return SPEARS_NODE_CRACKY
elseif node.walkable and not node.buildable then
return SPEARS_NODE_STICKY
else
return SPEARS_NODE_THROUGH
end
end
function spears_wear(initial_wear, toughness)
if not minetest.settings:get_bool("creative_mode") then
local wear = initial_wear + 65535/toughness
return wear
else
local wear = initial_wear
return wear
end
end

View File

@ -11,8 +11,5 @@ dofile(minetest.get_modpath("spears").."/functions.lua")
dofile(minetest.get_modpath("spears").."/tools.lua") dofile(minetest.get_modpath("spears").."/tools.lua")
local log_mods = minetest.settings:get_bool("log_mods")
if minetest.settings:get_bool("log_mods") then minetest.log("action", "[spears] loaded.")
minetest.log("action", "[MOD] Spears loaded")
end

View File

@ -1,7 +0,0 @@
name = spears
depends = default
description = Add spears to Minetest, versatile weapons that can be thrown
author = Echoes91
title = Spears
min_minetest_version = 5.4

View File

@ -3,6 +3,4 @@ DISABLE_STEEL_SPEAR = true
DISABLE_COPPER_SPEAR = true DISABLE_COPPER_SPEAR = true
DISABLE_BRONZE_SPEAR = true DISABLE_BRONZE_SPEAR = true
DISABLE_DIAMOND_SPEAR = true DISABLE_DIAMOND_SPEAR = true
DISABLE_OBSIDIAN_SPEAR = true DISABLE_OBSIDIAN_SPEAR = true
DISABLE_GOLD_SPEAR = true
SPEARS_THROW_SPEED = 13

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 B

View File

@ -7,14 +7,14 @@ function spears_register_spear(spear_type, desc, base_damage, toughness, materia
wield_scale= {x = 1.5, y = 1.5, z = 1.5}, wield_scale= {x = 1.5, y = 1.5, z = 1.5},
on_secondary_use = function(itemstack, user, pointed_thing) on_secondary_use = function(itemstack, user, pointed_thing)
spears_throw(itemstack, user, pointed_thing) spears_throw(itemstack, user, pointed_thing)
if not minetest.settings:get_bool("creative_mode") then if not minetest.setting_getbool("creative_mode") then
itemstack:take_item() itemstack:take_item()
end end
return itemstack return itemstack
end, end,
on_place = function(itemstack, user, pointed_thing) on_place = function(itemstack, user, pointed_thing)
spears_throw(itemstack, user, pointed_thing) spears_throw(itemstack, user, pointed_thing)
if not minetest.settings:get_bool("creative_mode") then if not minetest.setting_getbool("creative_mode") then
itemstack:take_item() itemstack:take_item()
end end
return itemstack return itemstack
@ -38,18 +38,14 @@ function spears_register_spear(spear_type, desc, base_damage, toughness, materia
minetest.register_craft({ minetest.register_craft({
output = 'spears:spear_' .. spear_type, output = 'spears:spear_' .. spear_type,
recipe = { recipe = {
{"", "", material}, {'group:stick', 'group:stick', material},
{"", "group:stick", ""},
{"group:stick", "", ""}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = 'spears:spear_' .. spear_type, output = 'spears:spear_' .. spear_type,
recipe = { recipe = {
{material, "", ""}, {material, 'group:stick', 'group:stick'},
{"", "group:stick", ""},
{"", "", "group:stick"}
} }
}) })
end end
@ -58,31 +54,17 @@ if not DISABLE_STONE_SPEAR then
spears_register_spear('stone', 'Stone', 4, 20, 'group:stone') spears_register_spear('stone', 'Stone', 4, 20, 'group:stone')
end end
if minetest.get_modpath("pigiron") then if not DISABLE_STEEL_SPEAR then
if not DISABLE_IRON_SPEAR then spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot')
spears_register_spear('iron', 'Iron', 5.5, 30, 'pigiron:iron_ingot')
end
if not DISABLE_STEEL_SPEAR then
spears_register_spear('steel', 'Steel', 6, 35, 'default:steel_ingot')
end
if not DISABLE_COPPER_SPEAR then
spears_register_spear('copper', 'Copper', 4.8, 30, 'default:copper_ingot')
end
if not DISABLE_BRONZE_SPEAR then
spears_register_spear('bronze', 'Bronze', 5.5, 35, 'default:bronze_ingot')
end
else
if not DISABLE_STEEL_SPEAR then
spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot')
end
if not DISABLE_COPPER_SPEAR then
spears_register_spear('copper', 'Copper', 5, 30, 'default:copper_ingot')
end
if not DISABLE_BRONZE_SPEAR then
spears_register_spear('bronze', 'Bronze', 6, 35, 'default:bronze_ingot')
end
end end
if not DISABLE_COPPER_SPEAR then
spears_register_spear('copper', 'Copper', 5, 35, 'default:copper_ingot')
end
if not DISABLE_BRONZE_SPEAR then
spears_register_spear('bronze', 'Bronze', 6, 35, 'default:bronze_ingot')
end
if not DISABLE_OBSIDIAN_SPEAR then if not DISABLE_OBSIDIAN_SPEAR then
spears_register_spear('obsidian', 'Obsidian', 8, 30, 'default:obsidian') spears_register_spear('obsidian', 'Obsidian', 8, 30, 'default:obsidian')