Merge branch 'master' into 'master'

Added fallback value in minetest.log

Closes #8

See merge request echoes91/spears!5

CHANGELOG

@@ -1,3 +1,6 @@
+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

defaults.lua

@@ -3,9 +3,9 @@
 --	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)

functions.lua

@@ -131,7 +131,7 @@ function spears_set_entity(spear_type, base_damage, toughness)
 					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)

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
@@ -11,4 +11,4 @@ dofile(minetest.get_modpath("spears").."/functions.lua")
 
 dofile(minetest.get_modpath("spears").."/tools.lua")
 
-minetest.log("action", "[MOD] Spears loaded with throwing speed " .. minetest.settings:get("spears_throw_speed") .. " and drag coeff. " .. minetest.settings:get("spears_drag_coeff"))
+minetest.log("action", "[MOD] Spears loaded with throwing speed " .. (minetest.settings:get("spears_throw_speed") or 13) .. " and drag coeff. " .. (minetest.settings:get("spears_drag_coeff") or 0.1))

locale/spears.eo.tr

@@ -1,9 +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
+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