mtcontrib/minetest-toolranks
1
0
Fork 1
mirror of https://github.com/lisacvuk/minetest-toolranks.git synced 2025-01-24 14:40:18 +01:00
Code Issues Releases Wiki Activity

minor fixes

Browse Source 
* add nil checks for tool groupcaps `uses` and `times`
* fix tool description coloring text after it
* correct escape for newlines in translation strings
This commit is contained in:
OgelGames 2021-10-01 17:44:55 +10:00
parent 8010feb5bf
commit 4a2551e9f5
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
init.lua
View File

@ -48,14 +48,15 @@ function toolranks.create_description(name, uses)
local description = name local description = name
local tooltype = toolranks.get_tool_type(description) local tooltype = toolranks.get_tool_type(description)
local newdesc = S( local newdesc = S(
"@1@2\n@3Level @4 @5\n@6@Node dug: @7", "@1@2\n@3Level @4 @5\n@6Node dug: @7@8",
toolranks.colors.green, toolranks.colors.green,
description, description,
toolranks.colors.gold, toolranks.colors.gold,
toolranks.get_level(uses), toolranks.get_level(uses),
S(tooltype), S(tooltype),
toolranks.colors.grey, toolranks.colors.grey,
(type(uses) == "number" and uses or 0) (type(uses) == "number" and uses or 0),
toolranks.colors.white
) )
return newdesc return newdesc
end end
@ -112,7 +113,7 @@ function toolranks.new_afteruse(itemstack, user, node, digparams)
to_player = pname, to_player = pname,
gain = 2.0, gain = 2.0,
}) })
-- Make tool better by modifying tool_capabilities (if defined) -- Make tool better by modifying tool_capabilities (if defined)
if itemdef.tool_capabilities then if itemdef.tool_capabilities then
local speed_multiplier = 1 + (level * level_multiplier * (max_speed - 1)) local speed_multiplier = 1 + (level * level_multiplier * (max_speed - 1))
local use_multiplier = 1 + (level * level_multiplier * (max_use - 1)) local use_multiplier = 1 + (level * level_multiplier * (max_use - 1))
@ -122,14 +123,18 @@ function toolranks.new_afteruse(itemstack, user, node, digparams)
caps.punch_attack_uses = caps.punch_attack_uses and (caps.punch_attack_uses * use_multiplier) caps.punch_attack_uses = caps.punch_attack_uses and (caps.punch_attack_uses * use_multiplier)
for _,c in pairs(caps.groupcaps) do for _,c in pairs(caps.groupcaps) do
c.uses = c.uses * use_multiplier if c.uses then
for i,t in ipairs(c.times) do c.uses = c.uses * use_multiplier
c.times[i] = t / speed_multiplier end
if c.times then
for i,t in ipairs(c.times) do
c.times[i] = t / speed_multiplier
end
end end
end end
itemmeta:set_tool_capabilities(caps) itemmeta:set_tool_capabilities(caps)
end
end end
end
-- Old method for compatibility with tools without tool_capabilities defined -- Old method for compatibility with tools without tool_capabilities defined
local wear = digparams.wear local wear = digparams.wear

2
locale/toolranks.en.tr
View File

@ -1,5 +1,5 @@
# textdomain: toolranks # textdomain: toolranks
@1@2@n@3Level @4 @5@n@6Node dug: @7=@1@2@n@3Level @4 @5@n@6Node dug: @7 @1@2@\n@3Level @4 @5@\n@6Node dug: @7@8=@1@2@\n@3Level @4 @5@\n@6Node dug: @7@8
pickaxe=pickaxe pickaxe=pickaxe
axe=axe axe=axe
shovel=shovel shovel=shovel

2
locale/toolranks.fr.tr
View File

@ -1,5 +1,5 @@
# textdomain: toolranks # textdomain: toolranks
@1@2@n@3Level @4 @5@n@6Node dug: @7=@1@2@n@3@5 niveau @4@n@6Blocks minés : @7 @1@2@\n@3Level @4 @5@\n@6Node dug: @7@8=@1@2@\n@3@5 niveau @4@\n@6Blocks minés : @7@8
pickaxe=pioche pickaxe=pioche
axe=hache axe=hache
shovel=pelle shovel=pelle