From a8a65334c526563d37ac3de6768a881bbcf0884d Mon Sep 17 00:00:00 2001
From: Juraj Vajda <juraj.vajda@rituals.com>
Date: Sat, 24 Sep 2016 12:11:25 +0100
Subject: [PATCH] cleanup

---
 axe.lua                           |  8 ++---
 init.lua                          | 25 +++++++++++++---
 pickaxe.lua                       | 49 +++++++++++++++++++++++++++++++
 playeradmin.lua => playeranim.lua |  0
 settings.txt                      |  6 ++--
 5 files changed, 75 insertions(+), 13 deletions(-)
 create mode 100644 pickaxe.lua
 rename playeradmin.lua => playeranim.lua (100%)

diff --git a/axe.lua b/axe.lua
index 39a6c0b..9318545 100644
--- a/axe.lua
+++ b/axe.lua
@@ -23,11 +23,7 @@ minetest.override_item("default:axe_mese", {
 	wield_scale = {x=1.5, y=2, z=1},
 })
 
-minetest.override_item("default:axe_mese", {
-	wield_scale = {x=1.5, y=2, z=1},
-})
-
--- SWORDS MOREORES
+-- AXE MOREORES
 if (minetest.get_modpath("moreores")) then
 	minetest.override_item("moreores:axe_mithril", {
 		wield_scale = {x=1.5, y=2, z=1},
@@ -38,7 +34,7 @@ if (minetest.get_modpath("moreores")) then
 	})
 end
 
--- SWORDS SUPER DIAMONDS
+-- AXE SUPER DIAMONDS
 if (minetest.get_modpath("diamonds")) then
 	minetest.override_item("diamonds:axe", {
 		wield_scale = {x=1.5, y=2, z=1},
diff --git a/init.lua b/init.lua
index 34eeae5..33c2275 100644
--- a/init.lua
+++ b/init.lua
@@ -1,66 +1,83 @@
 -- main settings
 dofile(minetest.get_modpath("enhancements").."/settings.txt")
 
+-- 
 -- tools enhancements
+-- 
 if TOOLS_ENHANCE then
 	dofile(minetest.get_modpath("enhancements").."/swords.lua")
 	dofile(minetest.get_modpath("enhancements").."/axe.lua")
 	dofile(minetest.get_modpath("enhancements").."/shovels.lua")
+	-- dofile(minetest.get_modpath("enhancements").."/pickaxe.lua")
 
 	print("[Mod][enhancements] TOOLS_ENHANCE enabled")
 end
 
+-- 
 -- clean-up unknown nodes and entities (configuration in that file)
+-- 
 if CLEAN_UNKNOWN then
 	dofile(minetest.get_modpath("enhancements").."/clean_unknown.lua")
 
 	print("[Mod][enhancements] CLEAN_UNKNOWN enabled")
 end
 
+-- 
 -- allow external command from outside of minetest (see readme)
+-- 
 if EXTERNAL_CMD then
 	dofile(minetest.get_modpath("enhancements").."/external_cmd.lua")
 
 	print("[Mod][enhancements] EXTERNAL_CMD enabled")
 end
 
+-- 
 -- detect AFK players
+-- 
 if PLAYER_AFK then
 	dofile(minetest.get_modpath("enhancements").."/afk.lua")
 
 	print("[Mod][enhancements] PLAYER_AFK enabled")
 end
 
+-- 
 -- go to and set SPAWN_POINT
+-- 
 if SPAWN_POINT then
 	dofile(minetest.get_modpath("enhancements").."/spawn.lua")
 
 	print("[Mod][enhancements] SPAWN_POINT enabled")
 end
 
+-- 
 -- pick dropped items by holding shift (sneak)
+-- 
 if ITEM_DROP then
 	dofile(minetest.get_modpath("enhancements").."/item_drop.lua")
 
 	print("[Mod][enhancements] ITEM_DROP enabled")
 end
 
+-- 
 -- teleport request to/from another player
+-- 
 if TP_REQUEST then
 	dofile(minetest.get_modpath("enhancements").."/teleport_request.lua")
 
 	print("[Mod][enhancements] TP_REQUEST enabled")
 end
 
+-- 
 -- move player head up/down
-if PLAYER_ADMIN then
-	dofile(minetest.get_modpath("enhancements").."/playeradmin.lua")
+-- 
+if PLAYER_ANIM then
+	dofile(minetest.get_modpath("enhancements").."/playeranim.lua")
 
-	print("[Mod][enhancements] PLAYER_ADMIN enabled")
+	print("[Mod][enhancements] PLAYER_ANIM enabled")
 end
 
 -- manage privileges i areas mod - if using areas mod only for admin purposes
--- WIP DONT ENABLE! 
+-- WIP DON'T ENABLE! 
 if AREAS_ENHANCE and minetest.get_modpath("areas") then
 	dofile(minetest.get_modpath("enhancements").."/areas.lua")
 
diff --git a/pickaxe.lua b/pickaxe.lua
new file mode 100644
index 0000000..fd8752b
--- /dev/null
+++ b/pickaxe.lua
@@ -0,0 +1,49 @@
+-- PICK-AXE DEFAULT
+minetest.override_item("default:pick_diamond", {
+	wield_scale = {x=1.5, y=2, z=1},
+})
+
+minetest.override_item("default:pick_wood", {
+	wield_scale = {x=1.5, y=2, z=1},
+})
+
+minetest.override_item("default:pick_stone", {
+	wield_scale = {x=1.5, y=2, z=1},
+})
+
+minetest.override_item("default:pick_steel", {
+	wield_scale = {x=1.5, y=2, z=1},
+})
+
+minetest.override_item("default:pick_bronze", {
+	wield_scale = {x=1.5, y=2, z=1},
+})
+
+minetest.override_item("default:pick_mese", {
+	wield_scale = {x=1.5, y=2, z=1},
+})
+
+-- PICK-AXE MOREORES
+if (minetest.get_modpath("moreores")) then
+	minetest.override_item("moreores:pick_mithril", {
+		wield_scale = {x=1.5, y=2, z=1},
+	})
+
+	minetest.override_item("moreores:pick_silver", {
+		wield_scale = {x=1.5, y=2, z=1},
+	})
+end
+
+-- PICK-AXE SUPER DIAMONDS
+if (minetest.get_modpath("diamonds")) then
+	minetest.override_item("diamonds:pick", {
+		-- inventory_image="enhancements_diamond_sword.png",
+		wield_scale = {x=1.5, y=2, z=1},
+	})
+
+	minetest.override_item("diamonds:steelpick", {
+		-- inventory_image="enhancements_diamond_steel_sword.png",
+		wield_scale = {x=1.5, y=2, z=1},
+	})
+end
+
diff --git a/playeradmin.lua b/playeranim.lua
similarity index 100%
rename from playeradmin.lua
rename to playeranim.lua
diff --git a/settings.txt b/settings.txt
index ffb2a6f..609840f 100644
--- a/settings.txt
+++ b/settings.txt
@@ -1,9 +1,9 @@
 TOOLS_ENHANCE = true
-CLEAN_UNKNOWN = true
+CLEAN_UNKNOWN = false
 EXTERNAL_CMD = true
-PLAYER_AFK = true
+PLAYER_AFK = false
 SPAWN_POINT = true
 ITEM_DROP = true
 TP_REQUEST = true
-PLAYER_ADMIN = true
+PLAYER_ANIM = false
 AREAS_ENHANCE = false