Merge remote-tracking branch 'upstream/master'

fix deployer issue nalc/nalc-server-mods#104
fix deprecated function
fix bad/Nonexistent collision detection on mobs/players, use collision box for very good detection
add translation client side

CHANGELOG

@@ -1,3 +1,7 @@
+Version 2.4:
+- Functions rewrite, fixed many vector/variable declarations and unknown node handling
+- Added pigiron support
+
 Version 2.3:
 - Updated to Minetest 5.6.0 API
 - Changed receipts to avoid being confused with arrows

defaults.lua

@@ -5,3 +5,12 @@ DISABLE_BRONZE_SPEAR = false
 DISABLE_DIAMOND_SPEAR = false
 DISABLE_OBSIDIAN_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

functions.lua

@@ -7,30 +7,39 @@ function spears_throw (itemstack, player, pointed_thing)
 	local pitch = player:get_look_vertical()
 	local yaw = player:get_look_horizontal()
 	local rotation = vector.new(0, yaw + math.pi/2, pitch + math.pi/6)
-	-- Stick into node
+	local wear = itemstack:get_wear()
-	if pointed_thing.type == "node" then
+	local pointed_a = pointed_thing.above
-		local node = minetest.get_node(pointed_thing.under)
+	local pointed_b = pointed_thing.under	
-		if minetest.registered_nodes[node.name].walkable and vector.distance(pointed_thing.above, throw_pos) < 1 then
+	if pointed_thing.type == "node" and vector.distance(pointed_a, throw_pos) < 1 then -- Stick into node
-			local spear_object = minetest.add_entity(vector.divide(vector.add(vector.multiply(pointed_thing.above, 2), pointed_thing.under), 3), spear)
+		local node = minetest.get_node(pointed_b)
+		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:get_luaentity()._wear = itemstack:get_wear()
+			spear_object:get_luaentity()._wear = wear
-			spear_object:get_luaentity()._stickpos = pointed_thing.under
+			spear_object:get_luaentity()._stickpos = pointed_b
-			return
+			minetest.sound_play("default_place_node", {pos = pointed_a}, true)
+			return false
 		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
-	-- 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_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
 
 function spears_set_entity(spear_type, base_damage, toughness)
@@ -41,6 +50,7 @@ function spears_set_entity(spear_type, base_damage, toughness)
 			visual_size = {x = 0.3, y = 0.3, z = 0.3},
 			wield_item = "spears:spear_" .. spear_type,
 			collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
+			lastpos={},
 		},
 
 		on_activate = function (self, staticdata, dtime_s)
@@ -59,36 +69,27 @@ function spears_set_entity(spear_type, base_damage, toughness)
 		end,
 
 		on_step = function(self, dtime)
-			if not self._wear then
+			local wear = self._wear
+			if wear == nil then
 				self.object:remove()
-				return
+				return false
 			end
 			local pos = self.object:get_pos()
 			local velocity = self.object:get_velocity()
 			local speed = vector.length(velocity)
-			-- Spear is stuck ?
+			if self._stickpos ~= nil then -- Spear is stuck
-			if self._stickpos then
 				local node = minetest.get_node(self._stickpos)
-				local node_cracky = minetest.registered_nodes[node.name].groups.cracky
+				local check_node = spears_check_node(node.name)
-				if node_cracky and node_cracky < 3 then
+				if check_node ~= SPEARS_NODE_STICKY then -- Fall when node is removed
-					minetest.sound_play("default_metal_footstep", {pos = pos}, true)
 					self.object:remove()
-					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = self._wear})
+					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
-				elseif not self._node_walkable then
+					return false
-					minetest.sound_play("default_place_node", {pos = 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(pos, {name='spears:spear_' .. spear_type, wear = self._wear})
-					return
 				end
 			else -- Spear is flying
 				local direction = vector.normalize(velocity)
 				local yaw = minetest.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))
-				local node = minetest.get_node(spearhead_pos)
 				self.object:set_rotation({x = 0, y = yaw + math.pi/2, z = pitch})
 				-- Hit someone?
 				local objects_in_radius = minetest.get_objects_inside_radius(spearhead_pos, 0.6)
@@ -98,26 +99,39 @@ 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)
 						self.object:remove()
 						minetest.sound_play("spears_hit", {pos = pos}, true)
-						minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = self._wear + 65535/toughness})
+						wear = spears_wear(wear, toughness)
-						return
+						minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
+						return true
 					end
 				end
-				-- Hit a node?	
+				-- Hit a node?
-				if node and minetest.registered_nodes[node.name].walkable
+				local node = minetest.get_node(spearhead_pos)
-				and not minetest.registered_nodes[node.name].buildable_to
+				local check_node = spears_check_node(node.name)
-				and not (minetest.registered_nodes[node.name].groups.slab and spearhead_pos.y % 1 < 0.5)
+				if check_node == SPEARS_NODE_UNKNOWN then
-				then -- Stick
+					self.object:remove()
-					self.object:set_acceleration({x = 0, y = 0, z = 0})
+					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
-					self.object:set_velocity({x = 0, y = 0, z = 0})
+				elseif check_node ~= SPEARS_NODE_THROUGH then
-					self._wear = self._wear + 65535/toughness
+					wear = spears_wear(wear, toughness)
-					if self._wear >= 65535 then
+					if wear >= 65535 then
 						minetest.sound_play("default_tool_breaks", {pos = pos}, true)
 						self.object:remove()
-						return
+						minetest.add_item(pos, {name='defaut:stick'})
+						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
-					self._stickpos = spearhead_pos
+				else -- Get drag
-				else  -- Get drag
+					local viscosity = minetest.registered_nodes[node.name].liquid_viscosity
-					local drag = math.max(minetest.registered_nodes[node.name].liquid_viscosity, 0.1)
+					local drag = math.max(viscosity, SPEARS_DRAG_COEFF)
 					local acceleration = vector.multiply(velocity, -drag)
 					acceleration.y = acceleration.y - 10 * ((7 - drag) / 7)
 					self.object:set_acceleration(acceleration)
@@ -127,3 +141,26 @@ function spears_set_entity(spear_type, base_damage, toughness)
 	}
 	return SPEAR_ENTITY
 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

locale/spears.fr.tr

@@ -0,0 +1,9 @@
+# textdomain: spears
+
+Stone spear=Lance en pierre
+Steel spear=Lance en acier
+Copper spear=Lance en cuivre
+Bronze spear=Lance en bronze
+Obsidian spear=Lance en obsidienne
+Diamond spear=Lance en diamant
+Golden spear=Lance en or

locale/template.txt

@@ -0,0 +1,11 @@
+# textdomain: spears
+
+Stone spear=
+Steel spear=
+Copper spear=
+Bronze spear=
+Obsidian spear= 
+Diamond spear=
+Golden spear=
+ 
+ 

mod.conf

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

spears.conf.example

@@ -5,3 +5,4 @@ DISABLE_BRONZE_SPEAR = true
 DISABLE_DIAMOND_SPEAR = true
 DISABLE_OBSIDIAN_SPEAR = true
 DISABLE_GOLD_SPEAR = true
+SPEARS_THROW_SPEED = 13

tools.lua

@@ -1,7 +1,10 @@
+
+local S = minetest.get_translator("spears")
+
 function spears_register_spear(spear_type, desc, base_damage, toughness, material)
 
 	minetest.register_tool("spears:spear_" .. spear_type, {
-		description = desc .. " spear",
+		description = S(desc .. " spear"),
                 wield_image = "spears_spear_" .. spear_type .. ".png^[transform4",
 		inventory_image = "spears_spear_" .. spear_type .. ".png",
 		wield_scale= {x = 1.5, y = 1.5, z = 1.5},
@@ -13,6 +16,13 @@ function spears_register_spear(spear_type, desc, base_damage, toughness, materia
 			return itemstack
 		end,
 		on_place = function(itemstack, user, pointed_thing)
+			if pointed_thing.type == "node" then
+				local node = minetest.get_node(pointed_thing.under)
+				if minetest.registered_nodes[node.name] and (node.name == "itemframes:pedestal" or node.name == "itemframes:frame") then
+				    minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack)
+				    return itemstack
+				end
+			end
 			spears_throw(itemstack, user, pointed_thing)
 			if not minetest.settings:get_bool("creative_mode") then
 				itemstack:take_item()
@@ -58,17 +68,31 @@ if not DISABLE_STONE_SPEAR then
 	spears_register_spear('stone', 'Stone', 4, 20, 'group:stone')
 end
 
-if not DISABLE_STEEL_SPEAR then
+if minetest.get_modpath("pigiron") then
-	spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot')
+	if not DISABLE_IRON_SPEAR then
+		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
 
-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
 	spears_register_spear('obsidian', 'Obsidian', 8, 30, 'default:obsidian')