From 3296952ae55231d601686b69c037ec1366381fc5 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 30 Jul 2019 17:18:37 +0200 Subject: [PATCH] Allow toolcaps to override the built-in times for dig_immediate --- src/tool.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/tool.cpp b/src/tool.cpp index becb574b0..09b876ae0 100644 --- a/src/tool.cpp +++ b/src/tool.cpp @@ -172,14 +172,16 @@ void ToolCapabilities::deserializeJson(std::istream &is) DigParams getDigParams(const ItemGroupList &groups, const ToolCapabilities *tp) { - // Group dig_immediate has fixed time and no wear - switch (itemgroup_get(groups, "dig_immediate")) { - case 2: - return DigParams(true, 0.5, 0, "dig_immediate"); - case 3: - return DigParams(true, 0, 0, "dig_immediate"); - default: - break; + // Group dig_immediate defaults to fixed time and no wear + if (tp->groupcaps.find("dig_immediate") == tp->groupcaps.cend()) { + switch (itemgroup_get(groups, "dig_immediate")) { + case 2: + return DigParams(true, 0.5, 0, "dig_immediate"); + case 3: + return DigParams(true, 0, 0, "dig_immediate"); + default: + break; + } } // Values to be returned (with a bit of conversion)