From 668bce3772954d0f93996f96d5949ae93091148a Mon Sep 17 00:00:00 2001
From: Raymoo <uguu@installgentoo.com>
Date: Mon, 13 Mar 2017 18:52:06 -0700
Subject: [PATCH] Fix luacheck errors, thanks to kaeza

---
 .luacheckrc          |  9 ++++++++
 init.lua             |  2 +-
 standard_monoids.lua | 53 +++++++++++++-------------------------------
 test.lua             |  2 +-
 4 files changed, 27 insertions(+), 39 deletions(-)
 create mode 100644 .luacheckrc

diff --git a/.luacheckrc b/.luacheckrc
new file mode 100644
index 0000000..ede251e
--- /dev/null
+++ b/.luacheckrc
@@ -0,0 +1,9 @@
+
+read_globals = {
+	"minetest",
+	"vector",
+}
+
+globals = {
+	"player_monoids",
+}
diff --git a/init.lua b/init.lua
index 02b42d6..6527154 100644
--- a/init.lua
+++ b/init.lua
@@ -65,7 +65,7 @@ function mon_meta:add_change(player, value, id)
 	local p_name = player:get_player_name()
 
 	local def = self.def
-        
+
 	local p_effects = self.player_map[p_name]
 	if p_effects == nil then
 		p_effects = {}
diff --git a/standard_monoids.lua b/standard_monoids.lua
index 33d835e..6b36134 100644
--- a/standard_monoids.lua
+++ b/standard_monoids.lua
@@ -5,7 +5,7 @@ local function mult(x, y) return x * y end
 local function mult_fold(elems)
 	local tot = 1
 
-	for k,v in pairs(elems) do
+	for _, v in pairs(elems) do
 		tot = tot * v
 	end
 
@@ -26,7 +26,7 @@ local function v_mult_fold(identity)
 	return function(elems)
 		local tot = identity
 
-		for k, v in pairs(elems) do
+		for _, v in pairs(elems) do
 			tot = v_mult(tot, v)
 		end
 
@@ -39,19 +39,12 @@ local monoid = player_monoids.make_monoid
 -- Speed monoid. Effect values are speed multipliers. Must be nonnegative
 -- numbers.
 player_monoids.speed = monoid({
-	combine = function(x, y) return x * y end,
-	fold = function(elems)
-		local res = 1
-		for k, v in pairs(elems) do
-			res = res * v
-		end
-
-		return res
-	end,
+	combine = mult,
+	fold = mult_fold,
 	identity = 1,
-	apply = function(mult, player)
+	apply = function(multiplier, player)
 		local ov = player:get_physics_override()
-		ov.speed = mult
+		ov.speed = multiplier
 		player:set_physics_override(ov)
 	end,
 })
@@ -60,19 +53,12 @@ player_monoids.speed = monoid({
 -- Jump monoid. Effect values are jump multipliers. Must be nonnegative
 -- numbers.
 player_monoids.jump = monoid({
-	combine = function(x, y) return x * y end,
-	fold = function(elems)
-		local res = 1
-		for k, v in pairs(elems) do
-			res = res * v
-		end
-
-		return res
-	end,
+	combine = mult,
+	fold = mult_fold,
 	identity = 1,
-	apply = function(mult, player)
+	apply = function(multiplier, player)
 		local ov = player:get_physics_override()
-		ov.jump = mult
+		ov.jump = multiplier
 		player:set_physics_override(ov)
 	end,
 })
@@ -80,19 +66,12 @@ player_monoids.jump = monoid({
 
 -- Gravity monoid. Effect values are gravity multipliers.
 player_monoids.gravity = monoid({
-	combine = function(x, y) return x * y end,
-	fold = function(elems)
-		local res = 1
-		for k, v in pairs(elems) do
-			res = res * v
-		end
-
-		return res
-	end,
+	combine = mult,
+	fold = mult_fold,
 	identity = 1,
-	apply = function(mult, player)
+	apply = function(multiplier, player)
 		local ov = player:get_physics_override()
-		ov.gravity = mult
+		ov.gravity = multiplier
 		player:set_physics_override(ov)
 	end,
 })
@@ -103,7 +82,7 @@ player_monoids.gravity = monoid({
 player_monoids.fly = monoid({
 	combine = function(p, q) return p or q end,
 	fold = function(elems)
-		for k, v in pairs(elems) do
+		for _, v in pairs(elems) do
 			if v then return true end
 		end
 
@@ -130,7 +109,7 @@ player_monoids.fly = monoid({
 player_monoids.noclip = monoid({
 	combine = function(p, q) return p or q end,
 	fold = function(elems)
-		for k, v in pairs(elems) do
+		for _, v in pairs(elems) do
 			if v then return true end
 		end
 
diff --git a/test.lua b/test.lua
index eff1491..f006d86 100644
--- a/test.lua
+++ b/test.lua
@@ -11,7 +11,7 @@ local function test(player)
 	local p_name = player:get_player_name()
 
 	minetest.chat_send_player(p_name, "Your speed is: " .. speed:value(player))
-	
+
 	minetest.after(3, function()
 		speed:del_change(player, ch_id)
 		minetest.chat_send_player(p_name, "Your speed is: " .. speed:value(player))