Allow toolcaps to override the built-in times for dig_immediate

This commit is contained in:
sfan5 2019-07-30 17:18:37 +02:00
parent 245e628d40
commit 3296952ae5
1 changed files with 10 additions and 8 deletions

View File

@ -172,14 +172,16 @@ void ToolCapabilities::deserializeJson(std::istream &is)
DigParams getDigParams(const ItemGroupList &groups, DigParams getDigParams(const ItemGroupList &groups,
const ToolCapabilities *tp) const ToolCapabilities *tp)
{ {
// Group dig_immediate has fixed time and no wear // Group dig_immediate defaults to fixed time and no wear
switch (itemgroup_get(groups, "dig_immediate")) { if (tp->groupcaps.find("dig_immediate") == tp->groupcaps.cend()) {
case 2: switch (itemgroup_get(groups, "dig_immediate")) {
return DigParams(true, 0.5, 0, "dig_immediate"); case 2:
case 3: return DigParams(true, 0.5, 0, "dig_immediate");
return DigParams(true, 0, 0, "dig_immediate"); case 3:
default: return DigParams(true, 0, 0, "dig_immediate");
break; default:
break;
}
} }
// Values to be returned (with a bit of conversion) // Values to be returned (with a bit of conversion)