From 00a88a320a1b3ded4d5516c953fe30a78a906e03 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Mon, 9 Sep 2019 23:57:37 +0200 Subject: [PATCH] craftguide can show repairable tools --- init.lua | 41 +++++++++++++++++++++++++++++++---------- locale/craftguide.fr.tr | 1 + locale/template | 1 + 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/init.lua b/init.lua index 8a4590a..bf67b47 100644 --- a/init.lua +++ b/init.lua @@ -8,12 +8,15 @@ local recipes_cache = {} local usages_cache = {} local fuel_cache = {} +local toolrepair + local progressive_mode = core.settings:get_bool("craftguide_progressive_mode") local sfinv_only = core.settings:get_bool("craftguide_sfinv_only") and rawget(_G, "sfinv") local log = core.log local after = core.after local colorize = core.colorize +local reg_tools = core.registered_tools local reg_items = core.registered_items local show_formspec = core.show_formspec local globalstep = core.register_globalstep @@ -411,13 +414,18 @@ local function groups_to_items(groups, get_all) return #names > 0 and concat(names, ",") or "" end +local function not_repairable(tool) + local def = reg_tools[tool] + return toolrepair and def and def.groups and def.groups.disable_repair == 1 +end + local function get_description(item, def) return def and def.description or (def and match(item, ":.*"):gsub("%W%l", upper):sub(2):gsub("_", " ") or S("Unknown Item (@1)", item)) end -local function get_tooltip(item, burntime, groups, cooktime, replace) +local function get_tooltip(item, burntime, norepair, groups, cooktime, replace) local tooltip if groups then @@ -433,6 +441,10 @@ local function get_tooltip(item, burntime, groups, cooktime, replace) else local def = reg_items[item] tooltip = get_description(item, def) + + if norepair then + tooltip = tooltip .. "\n" .. S("This tool cannot be repaired") + end end if cooktime then @@ -541,7 +553,8 @@ local function get_recipe_fs(data) local burntime = fuel_cache[item] and fuel_cache[item].burntime if groups or cooktime or burntime or replace then - fs[#fs + 1] = get_tooltip(item, burntime, groups, cooktime, replace) + fs[#fs + 1] = get_tooltip( + item, burntime, nil, groups, cooktime, replace) end end @@ -586,16 +599,20 @@ local function get_recipe_fs(data) output_X, YOFFSET + (sfinv_only and 0.7 or 0), 1.1, 1.1, recipe.output, ESC(output_name), "") - if burntime then - fs[#fs + 1] = get_tooltip(output_name, burntime) + local norepair = not_repairable(recipe.output) - fs[#fs + 1] = fmt(FMT.image, - output_X + 1, YOFFSET + (sfinv_only and 0.7 or 0.1), - 0.6, 0.4, PNG.arrow) + if burntime or norepair then + fs[#fs + 1] = get_tooltip(output_name, burntime, norepair) - fs[#fs + 1] = fmt(FMT.image, - output_X + 1.6, YOFFSET + (sfinv_only and 0.55 or 0), - 0.6, 0.6, PNG.fire) + if burntime then + fs[#fs + 1] = fmt(FMT.image, + output_X + 1, YOFFSET + (sfinv_only and 0.7 or 0.1), + 0.6, 0.4, PNG.arrow) + + fs[#fs + 1] = fmt(FMT.image, + output_X + 1.6, YOFFSET + (sfinv_only and 0.55 or 0), + 0.6, 0.6, PNG.fire) + end end end @@ -793,6 +810,10 @@ local old_register_craft = core.register_craft core.register_craft = function(recipe) old_register_craft(recipe) + if recipe.type == "toolrepair" then + toolrepair = recipe.additional_wear ~= 0 + end + local output = recipe.output or (is_str(recipe.recipe) and recipe.recipe or "") diff --git a/locale/craftguide.fr.tr b/locale/craftguide.fr.tr index 9aedeaf..97357cc 100644 --- a/locale/craftguide.fr.tr +++ b/locale/craftguide.fr.tr @@ -7,6 +7,7 @@ Recipe @1 of @2=Recette @1 de @2 Burning time: @1=Temps de combustion : @1 Cooking time: @1=Temps de cuisson : @1 Replaced by @1 on crafting=Remplacé par @1 lors de la fabrication +This tool cannot be repaired=Cet outil ne peut être réparé Any item belonging to the group(s): @1=Tout item appartenant au(x) groupe(s) : @1 Recipe's too big to be displayed (@1x@2)=La recette est trop grande pour être affichée (@1x@2) Shapeless=Sans forme diff --git a/locale/template b/locale/template index 514d129..71f41be 100644 --- a/locale/template +++ b/locale/template @@ -8,6 +8,7 @@ Recipe @1 of @2= Burning time: @1= Cooking time: @1= Replaced by @1 on crafting= +This tool cannot be repaired= Any item belonging to the group(s): @1= Recipe's too big to be displayed (@1x@2)= Shapeless=