Merge remote-tracking branch 'upstream/master'

- /defaults.lua
- /CHANGELOG

CHANGELOG

@@ -1,3 +1,12 @@
+Update 3.1.1
+- Fix all initial settings values and completely deprecate defaults.lua
+
+Version 3.1:
+- Initial l18n translations support
+- Replace stereo sounds with mono
+- Fix behaviour with initial settings
+- Clean reduntant variables and deprecate defaults.lua
+
 Version 3.0:
 - First attempt to detect collisionboxes
 - Implemented settings through settingtypes.txt, deprecating "spears.conf"

defaults.lua

@@ -1,15 +1,15 @@
 -- Seems like defaults in settingtypes.txt are not taken by default
-if minetest.settings:get("spears_throw_speed") == nil then
-	minetest.settings:set("spears_throw_speed", 13)
-end
+--if minetest.settings:get("spears_throw_speed") == nil then
+--	minetest.settings:set("spears_throw_speed", 13)
+--end
 
-if minetest.settings:get("spears_drag_coeff") == nil then
+--[[ if minetest.settings:get("spears_drag_coeff") == nil then
 	minetest.settings:set("spears_drag_coeff", 0.1)
-end
+end ]]
 
-if minetest.settings:get("spears_node_cracky_limit") == nil then
-	minetest.settings:set("spears_node_cracky_limit", 3)
-end
+-- if minetest.settings:get("spears_node_cracky_limit") == nil then
+--	minetest.settings:set("spears_node_cracky_limit", 3)
+-- end
 
 
 -- DISABLE_STONE_SPEAR = false
@@ -21,10 +21,10 @@ end
 -- DISABLE_GOLD_SPEAR = false
 -- DISABLE_IRON_SPEAR = false
 -- SPEARS_THROW_SPEED = 13
-SPEARS_V_ZERO = {x = 0, y = 0, z = 0}
+-- 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
+-- SPEARS_NODE_UNKNOWN = nil
+-- SPEARS_NODE_THROUGH = 0
+-- SPEARS_NODE_STICKY = 1
+-- SPEARS_NODE_CRACKY = 2
+-- SPEARS_NODE_CRACKY_LIMIT = 3

functions.lua

@@ -13,12 +13,12 @@ function spears_throw (itemstack, player, pointed_thing)
 	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 check_node = spears_check_node(node.name)
-		if check_node == SPEARS_NODE_UNKNOWN then
+		if check_node == nil then
 			return false
-		elseif check_node == SPEARS_NODE_CRACKY then
+		elseif check_node == 'cracky' then
 			minetest.sound_play("default_metal_footstep", {pos = pointed_a}, true)
 			return false
-		elseif check_node == SPEARS_NODE_STICKY then
+		elseif check_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 = wear
@@ -26,11 +26,11 @@ function spears_throw (itemstack, player, pointed_thing)
 			minetest.sound_play("default_place_node", {pos = pointed_a}, true)
 			return false
 		end
-	else -- Avoid hitting yourself and throw
-		local throw_speed = tonumber(minetest.settings:get("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
+	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 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)))
@@ -38,6 +38,7 @@ function spears_throw (itemstack, player, pointed_thing)
 		minetest.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()
 		return true
 	end
 end
@@ -50,6 +51,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)
@@ -79,7 +81,7 @@ function spears_set_entity(spear_type, base_damage, toughness)
 			if self._stickpos ~= nil then -- Spear is stuck
 				local node = minetest.get_node(self._stickpos)
 				local check_node = spears_check_node(node.name)
-				if check_node ~= SPEARS_NODE_STICKY then -- Fall when node is removed
+				if check_node ~= 'sticky' then -- Fall when node is removed
 					self.object:remove()
 					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
 					return false
@@ -106,31 +108,31 @@ function spears_set_entity(spear_type, base_damage, toughness)
 				-- Hit a node?
 				local node = minetest.get_node(spearhead_pos)
 				local check_node = spears_check_node(node.name)
-				if check_node == SPEARS_NODE_UNKNOWN then
+				if check_node == nil then
 					self.object:remove()
 					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
-				elseif check_node ~= SPEARS_NODE_THROUGH then
+				elseif check_node ~= 'through' then
 					wear = spears_wear(wear, toughness)
 					if wear >= 65535 then
 						minetest.sound_play("default_tool_breaks", {pos = pos}, true)
 						self.object:remove()
 						minetest.add_item(pos, {name='defaut:stick'})
 						return false
-					elseif check_node == SPEARS_NODE_CRACKY then
+					elseif check_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)
+					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)
 						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"))
+					local drag_coeff = tonumber(minetest.settings:get("spears_drag_coeff") or 0.1)
 					local drag = math.max(viscosity, drag_coeff)
 					local acceleration = vector.multiply(velocity, -drag)
 					acceleration.y = acceleration.y - 10 * ((7 - drag) / 7)
@@ -144,15 +146,15 @@ 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"))
+	local cracky_limit = tonumber(minetest.settings:get("spears_node_cracky_limit") or 3)
 	if node == nil then
-		return SPEARS_NODE_UNKNOWN
+		return nil
 	elseif node.groups.cracky ~= nil and node.groups.cracky < cracky_limit then
-		return SPEARS_NODE_CRACKY
+		return 'cracky'
 	elseif node.walkable and not node.buildable_to then
-		return SPEARS_NODE_STICKY
+		return 'sticky'
 	else
-		return SPEARS_NODE_THROUGH
+		return 'through'
 	end
 end
 

init.lua

@@ -1,4 +1,4 @@
-dofile(minetest.get_modpath("spears").."/defaults.lua")
+-- dofile(minetest.get_modpath("spears").."/defaults.lua")
 
 -- local input = io.open(minetest.get_modpath("spears").."/spears.conf", "r")
 -- if input then

locale/spears.eo.tr

@@ -0,0 +1,9 @@
+# textdomain: spears
+Stone Spear=Ŝtona Ponardego
+Iron Spear=Fera Ponardego
+Steel Spear=Ŝtala Ponardego
+Copper Spear=Kupra Ponardego
+Bronze Spear=Bronza Ponardego
+Obsidian Spear=Obsidiana Ponardego
+Diamond Spear=Diamanta Ponardego
+Golden Spear=Ora Ponardego

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/spears.it.tr

@@ -0,0 +1,9 @@
+# textdomain: spears
+Stone Spear=Lancia di Pietra
+Iron Spear=Lancia di Ferro
+Steel Spear=Lancia di Acciaio
+Copper Spear=Lancia di Rame
+Bronze Spear=Lancia di Bronzo
+Obsidian Spear=Lancia di Ossidiana
+Diamond Spear=Lancia di Diamante
+Golden Spear=Lancia Dorata

locale/template.txt

@@ -0,0 +1,9 @@
+# textdomain: spears
+Stone Spear=
+Iron Spear=
+Steel Spear=
+Copper Spear=
+Bronze Spear=
+Obsidian Spear=
+Diamond Spear=
+Golden Spear=

mod.conf

@@ -5,4 +5,3 @@ description = Add spears to Minetest, versatile weapons that can be thrown
 author = Echoes91
 title = Spears
 min_minetest_version = 5.4
-

tools.lua

@@ -1,7 +1,9 @@
+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 = desc,
                 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 +15,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()
@@ -55,43 +64,42 @@ function spears_register_spear(spear_type, desc, base_damage, toughness, materia
 end
 
 if minetest.settings:get_bool('spears_enable_stone_spear') then
-	spears_register_spear('stone', 'Stone', 4, 20, 'group:stone')
-	minetest.log("info", "[MOD] Stone spear enabled")
+	spears_register_spear('stone', S('Stone Spear'), 4, 20, 'group:stone')
 end
 
 if minetest.get_modpath("pigiron") then
 	if minetest.settings:get_bool('spears_enable_iron_spear') then
-		spears_register_spear('iron', 'Iron', 5.5, 30, 'pigiron:iron_ingot')
+		spears_register_spear('iron', S('Iron Spear'), 5.5, 30, 'pigiron:iron_ingot')
 	end
 	if minetest.settings:get_bool('spears_enable_steel_spear') then
-		spears_register_spear('steel', 'Steel', 6, 35, 'default:steel_ingot')
+		spears_register_spear('steel', S('Steel Spear'), 6, 35, 'default:steel_ingot')
 	end
 	if minetest.settings:get_bool('spears_enable_copper_spear') then
-		spears_register_spear('copper', 'Copper', 4.8, 30, 'default:copper_ingot')
+		spears_register_spear('copper', S('Copper Spear'), 4.8, 30, 'default:copper_ingot')
 	end
 	if minetest.settings:get_bool('spears_enable_bronze_spear') then
-		spears_register_spear('bronze', 'Bronze', 5.5, 35, 'default:bronze_ingot')
+		spears_register_spear('bronze', S('Bronze Spear'), 5.5, 35, 'default:bronze_ingot')
 	end
 else
 	if minetest.settings:get_bool('spears_enable_steel_spear') then
-		spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot')
+		spears_register_spear('steel', S('Steel Spear'), 6, 30, 'default:steel_ingot')
 	end
 	if minetest.settings:get_bool('spears_enable_copper_spear') then
-		spears_register_spear('copper', 'Copper', 5, 30, 'default:copper_ingot')
+		spears_register_spear('copper', S('Copper Spear'), 5, 30, 'default:copper_ingot')
 	end
 	if minetest.settings:get_bool('spears_enable_bronze_spear') then
-		spears_register_spear('bronze', 'Bronze', 6, 35, 'default:bronze_ingot')
+		spears_register_spear('bronze', S('Bronze Spear'), 6, 35, 'default:bronze_ingot')
 	end
 end
 
 if minetest.settings:get_bool('spears_enable_obsidian_spear') then
-	spears_register_spear('obsidian', 'Obsidian', 8, 30, 'default:obsidian')
+	spears_register_spear('obsidian', S('Obsidian Spear'), 8, 30, 'default:obsidian')
 end
 
 if minetest.settings:get_bool('spears_enable_diamond_spear') then
-	spears_register_spear('diamond', 'Diamond', 8, 40, 'default:diamond')
+	spears_register_spear('diamond', S('Diamond Spear'), 8, 40, 'default:diamond')
 end
 
 if minetest.settings:get_bool('spears_enable_gold_spear') then
-	spears_register_spear('gold', 'Golden', 5, 40, 'default:gold_ingot')
+	spears_register_spear('gold', S('Golden Spear'), 5, 40, 'default:gold_ingot')
 end