From f67796b5176895b7ed4739984b717edc4bc9f9d3 Mon Sep 17 00:00:00 2001
From: LoneWolfHT <lonewolf04361@gmail.com>
Date: Wed, 22 Apr 2020 19:36:35 -0700
Subject: [PATCH] Fixes and improvements

---
 .luacheckrc           | 25 +++++++++++--------------
 minetest.conf         |  6 +++---
 mods/combat/melee.lua |  4 ++--
 mods/main/drops.lua   |  2 +-
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/.luacheckrc b/.luacheckrc
index 6b9d25c..1c2a129 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -1,19 +1,16 @@
-unused_args = false
-allow_defined_top = true
-
 globals = {
-    "minetest",
-    "shooter",
-    "skybox",
-    "main",
-    "vc_info",
+	"minetest",
+	"shooter",
+	"skybox",
+	"main",
+	"vc_info",
 }
 
 read_globals = {
-    string = {fields = {"split"}},
-    table = {fields = {"copy", "getn"}},
-    "vector", "ItemStack",
-    "dump", "DIR_DELIM", "VoxelArea", "Settings",
-    "default", "sfinv", "creative", "stairs",
-    "maps",
+	string = {fields = {"split"}},
+	table = {fields = {"copy", "getn"}},
+	"vector", "ItemStack",
+	"dump", "DIR_DELIM", "VoxelArea", "Settings",
+	"default", "sfinv", "creative", "stairs",
+	"maps",
 }
diff --git a/minetest.conf b/minetest.conf
index 7e20163..0fc9fc8 100755
--- a/minetest.conf
+++ b/minetest.conf
@@ -3,7 +3,7 @@ enable_pvp = true
 enable_damage = true
 
 server_name = Voxel Combat
-server_description = Light PvP server with multiple mods.
+server_description = Light PvP server with multiple playing modes.
 server_address = <>
 port = 30000
 max_users = 10
@@ -14,8 +14,8 @@ active_block_range = 1
 disallow_empty_password = true
 enable_rollback_recording = false
 
-basic_privs = shout, interact, zoom
-default_privs = shout, interact, zoom
+basic_privs = shout, interact
+default_privs = shout, interact
 
 max_block_send_distance = 6
 max_simultaneous_block_sends_per_client = 1
diff --git a/mods/combat/melee.lua b/mods/combat/melee.lua
index 1544c06..080c44f 100644
--- a/mods/combat/melee.lua
+++ b/mods/combat/melee.lua
@@ -1,7 +1,7 @@
 minetest.register_tool("combat:knife", {
 	description = "Knife",
 	inventory_image = "combat_knife.png",
-	range = 1,
+	range = 2,
 	wield_scale = {x = 0.7, y = 0.7, z = 0.7},
 	groups = {hold_limit = 1},
 	tool_capabilities = {
@@ -14,7 +14,7 @@ minetest.register_tool("combat:knife", {
 minetest.register_tool("combat:sword", {
 	description = "Sword",
 	inventory_image = "combat_sword.png",
-	range = 2,
+	range = 3,
 	wield_scale = {x = 1.3, y = 1.5, z = 1},
 	groups = {hold_limit = 1},
 	tool_capabilities = {
diff --git a/mods/main/drops.lua b/mods/main/drops.lua
index fe4f672..aa80605 100644
--- a/mods/main/drops.lua
+++ b/mods/main/drops.lua
@@ -28,7 +28,7 @@ minetest.register_globalstep(function(dtime)
 	local dropint = main.current_mode.mode.drop_interval
 	local online_players = #minetest.get_connected_players()
 
-	if dropint and dropstep >= dropint - (online_players * 5) and online_players >= 1 then
+	if dropint and dropstep >= dropint - (online_players * 2) and online_players >= 1 then
 		dropstep = 0
 
 		main.spawn_rand_drop()