Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

.github/workflows/build.yml

@@ -1,13 +0,0 @@
-name: Build
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: apt
-      run: sudo apt-get install -y luarocks
-    - name: luacheck install
-      run: luarocks install --local luacheck
-    - name: luacheck run
-      run: $HOME/.luarocks/bin/luacheck ./

.luacheckrc

@@ -1,18 +0,0 @@
-unused_args = false
-allow_defined_top = true
-
-globals = {
-    "minetest",
-}
-
-read_globals = {
-    string = {fields = {"split"}},
-    table = {fields = {"copy", "getn"}},
-
-    -- Builtin
-    "vector", "ItemStack",
-    "dump", "DIR_DELIM", "VoxelArea", "Settings",
-
-    -- MTG
-    "default", "sfinv", "creative",
-}

README.md

@@ -13,7 +13,7 @@ If so, to support this mod, add this code to your mod, after your tool's code:
 if minetest.get_modpath("toolranks") then
     minetest.override_item("mymod:mytool", {
         original_description = "My Tool",
-        description = toolranks.create_description("My Tool"),
+        description = toolranks.create_description("My Tool", 0, 1),
         after_use = toolranks.new_afteruse
     })
     end

init.lua

@@ -32,19 +32,12 @@ function toolranks.get_tool_type(description)
     elseif string.find(d, "sword") then
       return "sword"
     else
-      return "tool"
+    return "tool"
     end
   end
 end
 
-function toolranks.get_level(uses)
+function toolranks.create_description(name, uses, level)
-  if type(uses) == "number" and uses > 0 then
-    return math.min(max_level, math.floor(uses / level_digs))
-  end
-  return 0
-end
-
-function toolranks.create_description(name, uses)
   local description = name
   local tooltype = toolranks.get_tool_type(description)
   local newdesc = S(
@@ -52,14 +45,18 @@ function toolranks.create_description(name, uses)
     toolranks.colors.green,
     description,
     toolranks.colors.gold,
-    toolranks.get_level(uses),
+    (level or 1),
     S(tooltype),
     toolranks.colors.grey,
-    (type(uses) == "number" and uses or 0)
+    (uses or 0)
   )
   return newdesc
 end
 
+function toolranks.get_level(uses)
+  return math.min(max_level, math.floor(uses / level_digs))
+end
+
 function toolranks.new_afteruse(itemstack, user, node, digparams)
   local itemmeta = itemstack:get_meta()
   local itemdef = itemstack:get_definition()
@@ -110,6 +107,7 @@ function toolranks.new_afteruse(itemstack, user, node, digparams)
       to_player = user:get_player_name(),
       gain = 2.0,
     })
+    itemmeta:set_string("lastlevel", level)
 
     local speed_multiplier = 1 + (level * level_multiplier * (max_speed - 1))
     local use_multiplier = 1 + (level * level_multiplier * (max_use - 1))
@@ -127,8 +125,7 @@ function toolranks.new_afteruse(itemstack, user, node, digparams)
     itemmeta:set_tool_capabilities(caps)
   end
 
-  itemmeta:set_string("lastlevel", level)
+  itemmeta:set_string("description", toolranks.create_description(itemdesc, dugnodes, level))
-  itemmeta:set_string("description", toolranks.create_description(itemdesc, dugnodes))
   itemstack:add_wear(digparams.wear)
   return itemstack
 end
@@ -138,7 +135,7 @@ function toolranks.add_tool(name)
   local desc = ItemStack(name):get_definition().description
   minetest.override_item(name, {
     original_description = desc,
-    description = toolranks.create_description(desc),
+    description = toolranks.create_description(desc, 0, 1),
     after_use = toolranks.new_afteruse
   })
 end
@@ -174,3 +171,5 @@ toolranks.add_tool("default:shovel_steel")
 toolranks.add_tool("default:shovel_bronze")
 toolranks.add_tool("default:shovel_mese")
 toolranks.add_tool("default:shovel_diamond")
+
+minetest.log("action", "[toolranks] loaded.")