Fixed circular dependencies

#4

toolranks/depends.txt

@@ -0,0 +1,2 @@
+default
+

toolranks/init.lua

@@ -0,0 +1,117 @@
+local mod_storage = minetest.get_mod_storage()
+
+toolranks = {}
+
+toolranks.colors = {
+  grey = minetest.get_color_escape_sequence("#9d9d9d"),
+  green = minetest.get_color_escape_sequence("#1eff00"),
+  gold = minetest.get_color_escape_sequence("#ffdf00"),
+  white = minetest.get_color_escape_sequence("#ffffff")
+}
+
+function toolranks.get_tool_type(description)
+  if not description then
+    return "tool"
+  elseif string.find(description, "Pickaxe") then
+    return "pickaxe"
+  elseif string.find(description, "Axe") then
+    return "axe"
+  elseif string.find(description, "Shovel") then
+    return "shovel"
+  elseif string.find(description, "Hoe") then
+    return "hoe"
+  else
+    return "tool"
+  end
+end
+
+function toolranks.create_description(name, uses, level)
+  local description = name
+  local tooltype    = toolranks.get_tool_type(description)
+
+  local newdesc = toolranks.colors.green .. description .. "\n" ..
+                  toolranks.colors.gold .. "Level " .. (level or 1) .. " " .. tooltype .. "\n" ..
+                  toolranks.colors.grey .. "Nodes dug: " .. (uses or 0)
+
+  return newdesc
+end
+
+function toolranks.get_level(uses)
+  if uses <= 200 then
+    return 1
+  elseif uses < 400 then
+    return 2
+  elseif uses < 1000 then
+    return 3
+  elseif uses < 2000 then
+    return 4
+  elseif uses < 3200 then
+    return 5
+  else
+    return 6
+  end
+end
+
+function toolranks.new_afteruse(itemstack, user, node, digparams)
+  local itemmeta  = itemstack:get_meta() -- Metadata
+  local itemdef   = itemstack:get_definition() -- Item Definition
+  local itemdesc  = itemdef.original_description -- Original Description
+  local dugnodes  = tonumber(itemmeta:get_string("dug")) or 0 -- Number of nodes dug
+  local lastlevel = tonumber(itemmeta:get_string("lastlevel")) or 1 -- Level the tool had
+                                                                    -- on the last dig
+  local most_digs = mod_storage:get_int("most_digs") or 0
+  local most_digs_user = mod_storage:get_string("most_digs_user") or 0
+  
+  -- Only count nodes that spend the tool
+  if(digparams.wear > 0) then
+   dugnodes = dugnodes + 1
+   itemmeta:set_string("dug", dugnodes)
+  end
+  if(dugnodes > most_digs) then
+    most_digs = dugnodes
+    if(most_digs_user ~= user:get_player_name()) then -- Avoid spam.
+      most_digs_user = user:get_player_name()
+      minetest.chat_send_all("Most used tool is now a " .. toolranks.colors.green .. itemdesc 
+                             .. toolranks.colors.white .. " owned by " .. user:get_player_name()
+                             .. " with " .. dugnodes .. " uses.")
+    end
+    mod_storage:set_int("most_digs", dugnodes)
+    mod_storage:set_string("most_digs_user", user:get_player_name())
+  end
+  if(itemstack:get_wear() > 60135) then
+    minetest.chat_send_player(user:get_player_name(), "Your tool is about to break!")
+    minetest.sound_play("default_tool_breaks", {
+      to_player = user:get_player_name(),
+      gain = 2.0,
+    })
+  end
+  local level = toolranks.get_level(dugnodes)
+
+  if lastlevel < level then
+    local levelup_text = "Your " .. toolranks.colors.green ..
+                         itemdesc .. toolranks.colors.white ..
+                         " just leveled up!"
+    minetest.sound_play("toolranks_levelup", {
+      to_player = user:get_player_name(),
+      gain = 2.0,
+    })
+    minetest.chat_send_player(user:get_player_name(), levelup_text)
+    itemmeta:set_string("lastlevel", level)
+  end
+
+  local newdesc   = toolranks.create_description(itemdesc, dugnodes, level)
+
+  itemmeta:set_string("description", newdesc)
+  local wear = digparams.wear
+  if level > 1 then
+    wear = digparams.wear / (1 + level / 4)
+  end
+
+  --minetest.chat_send_all("wear="..wear.."Original wear: "..digparams.wear.." 1+level/4="..1+level/4)
+  -- Uncomment for testing ^
+
+  itemstack:add_wear(wear)
+
+  return itemstack
+end
+

toolranks/mod.conf

@@ -0,0 +1 @@
+name = toolranks

toolranks_tools/depends.txt

@@ -1,2 +1,3 @@
 default
+toolranks
 moreores?

toolranks_tools/init.lua

@@ -1,118 +1,3 @@
-local mod_storage = minetest.get_mod_storage()
-
-toolranks = {}
-
-toolranks.colors = {
-  grey = minetest.get_color_escape_sequence("#9d9d9d"),
-  green = minetest.get_color_escape_sequence("#1eff00"),
-  gold = minetest.get_color_escape_sequence("#ffdf00"),
-  white = minetest.get_color_escape_sequence("#ffffff")
-}
-
-function toolranks.get_tool_type(description)
-  if string.find(description, "Pickaxe") then
-    return "pickaxe"
-  elseif string.find(description, "Axe") then
-    return "axe"
-  elseif string.find(description, "Shovel") then
-    return "shovel"
-  elseif string.find(description, "Hoe") then
-    return "hoe"
-  else
-    return "tool"
-  end
-end
-
-function toolranks.create_description(name, uses, level)
-  local description = name
-  local tooltype    = toolranks.get_tool_type(description)
-
-  local newdesc = toolranks.colors.green .. description .. "\n" ..
-                  toolranks.colors.gold .. "Level " .. (level or 1) .. " " .. tooltype .. "\n" ..
-                  toolranks.colors.grey .. "Nodes dug: " .. (uses or 0)
-
-  return newdesc
-end
-
-function toolranks.get_level(uses)
-  if uses <= 200 then
-    return 1
-  elseif uses < 400 then
-    return 2
-  elseif uses < 1000 then
-    return 3
-  elseif uses < 2000 then
-    return 4
-  elseif uses < 3200 then
-    return 5
-  else
-    return 6
-  end
-end
-
-function toolranks.new_afteruse(itemstack, user, node, digparams)
-  local itemmeta  = itemstack:get_meta() -- Metadata
-  local itemdef   = itemstack:get_definition() -- Item Definition
-  local itemdesc  = itemdef.original_description -- Original Description
-  local dugnodes  = tonumber(itemmeta:get_string("dug")) or 0 -- Number of nodes dug
-  local lastlevel = tonumber(itemmeta:get_string("lastlevel")) or 1 -- Level the tool had
-                                                                    -- on the last dig
-  local most_digs = mod_storage:get_int("most_digs") or 0
-  local most_digs_user = mod_storage:get_string("most_digs_user") or 0
-  
-  -- Only count nodes that spend the tool
-  if(digparams.wear > 0) then
-   dugnodes = dugnodes + 1
-   itemmeta:set_string("dug", dugnodes)
-  end
-  if(dugnodes > most_digs) then
-    most_digs = dugnodes
-    if(most_digs_user ~= user:get_player_name()) then -- Avoid spam.
-      most_digs_user = user:get_player_name()
-      minetest.chat_send_all("Most used tool is now a " .. toolranks.colors.green .. itemdesc 
-                             .. toolranks.colors.white .. " owned by " .. user:get_player_name()
-                             .. " with " .. dugnodes .. " uses.")
-    end
-    mod_storage:set_int("most_digs", dugnodes)
-    mod_storage:set_string("most_digs_user", user:get_player_name())
-  end
-  if(itemstack:get_wear() > 60135) then
-    minetest.chat_send_player(user:get_player_name(), "Your tool is about to break!")
-    minetest.sound_play("default_tool_breaks", {
-      to_player = user:get_player_name(),
-      gain = 2.0,
-    })
-  end
-  local level = toolranks.get_level(dugnodes)
-
-  if lastlevel < level then
-    local levelup_text = "Your " .. toolranks.colors.green ..
-                         itemdesc .. toolranks.colors.white ..
-                         " just leveled up!"
-    minetest.sound_play("toolranks_levelup", {
-      to_player = user:get_player_name(),
-      gain = 2.0,
-    })
-    minetest.chat_send_player(user:get_player_name(), levelup_text)
-    itemmeta:set_string("lastlevel", level)
-  end
-
-  local newdesc   = toolranks.create_description(itemdesc, dugnodes, level)
-
-  itemmeta:set_string("description", newdesc)
-  local wear = digparams.wear
-  if level > 1 then
-    wear = digparams.wear / (1 + level / 4)
-  end
-
-  --minetest.chat_send_all("wear="..wear.."Original wear: "..digparams.wear.." 1+level/4="..1+level/4)
-  -- Uncomment for testing ^
-
-  itemstack:add_wear(wear)
-
-  return itemstack
-end
-
 minetest.override_item("default:pick_diamond", {
   original_description = "Diamond Pickaxe",
   description = toolranks.create_description("Diamond Pickaxe", 0, 1),
@@ -220,6 +105,11 @@ if minetest.get_modpath("moreores") then
     description = toolranks.create_description("Mithril Shovel", 0, 1),
     after_use = toolranks.new_afteruse})
 
+  minetest.override_item("moreores:sword_mithril", {
+    original_description = "Mithril Sword",
+    description = toolranks.create_description("Mithril Sword", 0, 1),
+    after_use = toolranks.new_afteruse})
+
   minetest.override_item("moreores:pick_silver", {
     original_description = "Silver Pickaxe",
     description = toolranks.create_description("Silver Pickaxe", 0, 1),
@@ -234,4 +124,41 @@ if minetest.get_modpath("moreores") then
     original_description = "Silver Shovel",
     description = toolranks.create_description("Silver Shovel", 0, 1),
     after_use = toolranks.new_afteruse})
+
+  minetest.override_item("moreores:sword_silver", {
+    original_description = "Silver Sword",
+    description = toolranks.create_description("Silver Sword", 0, 1),
+    after_use = toolranks.new_afteruse})
 end
+
+-- add swords for snappy nodes
+minetest.override_item("default:sword_wood", {
+	original_description = "Wooden Sword",
+	description = toolranks.create_description("Wooden Sword", 0, 1),
+	after_use = toolranks.new_afteruse})
+
+minetest.override_item("default:sword_stone", {
+	original_description = "Stone Sword",
+	description = toolranks.create_description("Stone Sword", 0, 1),
+	after_use = toolranks.new_afteruse})
+
+minetest.override_item("default:sword_steel", {
+	original_description = "Steel Sword",
+	description = toolranks.create_description("Steel Sword", 0, 1),
+	after_use = toolranks.new_afteruse})
+
+minetest.override_item("default:sword_bronze", {
+	original_description = "Bronze Sword",
+	description = toolranks.create_description("Bronze Sword", 0, 1),
+	after_use = toolranks.new_afteruse})
+
+minetest.override_item("default:sword_mese", {
+	original_description = "Mese Sword",
+	description = toolranks.create_description("Mese Sword", 0, 1),
+	after_use = toolranks.new_afteruse})
+
+minetest.override_item("default:sword_diamond", {
+	original_description = "Diamond Sword",
+	description = toolranks.create_description("Diamond Sword", 0, 1),
+	after_use = toolranks.new_afteruse})
+

toolranks_tools/mod.conf

@@ -0,0 +1 @@
+name = toolranks_tools