BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Tool.cpp/.h, lua_api/l_util.cpp: Tidy up code and remove dead code

Browse Source
This commit is contained in:
Hybrid Dog 2017-04-10 20:03:53 +02:00 committed by paramat
parent d7c1f6c92e
commit 345e1041a2
3 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/lua_api/l_util.cpp
View File

@ -158,18 +158,14 @@ int ModApiUtil::l_write_json(lua_State *L)
return 1; return 1;
} }
// get_dig_params(groups, tool_capabilities[, time_from_last_punch]) // get_dig_params(groups, tool_capabilities)
int ModApiUtil::l_get_dig_params(lua_State *L) int ModApiUtil::l_get_dig_params(lua_State *L)
{ {
NO_MAP_LOCK_REQUIRED; NO_MAP_LOCK_REQUIRED;
ItemGroupList groups; ItemGroupList groups;
read_groups(L, 1, groups); read_groups(L, 1, groups);
ToolCapabilities tp = read_tool_capabilities(L, 2); ToolCapabilities tp = read_tool_capabilities(L, 2);
if(lua_isnoneornil(L, 3)) push_dig_params(L, getDigParams(groups, &tp));
push_dig_params(L, getDigParams(groups, &tp));
else
push_dig_params(L, getDigParams(groups, &tp,
luaL_checknumber(L, 3)));
return 1; return 1;
} }

65
src/tool.cpp
View File

@ -170,16 +170,13 @@ void ToolCapabilities::deserializeJson(std::istream &is)
} }
DigParams getDigParams(const ItemGroupList &groups, DigParams getDigParams(const ItemGroupList &groups,
const ToolCapabilities *tp, float time_from_last_punch) const ToolCapabilities *tp)
{ {
//infostream<<"getDigParams"<<std::endl; // Group dig_immediate has fixed time and no wear
/* Check group dig_immediate */ switch (itemgroup_get(groups, "dig_immediate")) {
switch(itemgroup_get(groups, "dig_immediate")){
case 2: case 2:
//infostream<<"dig_immediate=2"<<std::endl;
return DigParams(true, 0.5, 0, "dig_immediate"); return DigParams(true, 0.5, 0, "dig_immediate");
case 3: case 3:
//infostream<<"dig_immediate=3"<<std::endl;
return DigParams(true, 0, 0, "dig_immediate"); return DigParams(true, 0, 0, "dig_immediate");
default: default:
break; break;
@ -192,49 +189,37 @@ DigParams getDigParams(const ItemGroupList &groups,
std::string result_main_group; std::string result_main_group;
int level = itemgroup_get(groups, "level"); int level = itemgroup_get(groups, "level");
//infostream<<"level="<<level<<std::endl;
for (const auto &groupcap : tp->groupcaps) { for (const auto &groupcap : tp->groupcaps) {
const std::string &name = groupcap.first;
//infostream<<"group="<<name<<std::endl;
const ToolGroupCap &cap = groupcap.second; const ToolGroupCap &cap = groupcap.second;
int rating = itemgroup_get(groups, name);
float time = 0;
bool time_exists = cap.getTime(rating, &time);
int leveldiff = cap.maxlevel - level; int leveldiff = cap.maxlevel - level;
time /= MYMAX(1, leveldiff); if (leveldiff < 0)
if(!result_diggable || time < result_time){ continue;
if(cap.maxlevel >= level && time_exists){
result_diggable = true; const std::string &groupname = groupcap.first;
result_time = time; float time = 0;
if(cap.uses != 0) int rating = itemgroup_get(groups, groupname);
result_wear = 1.0 / cap.uses / pow(3.0, (double)leveldiff); bool time_exists = cap.getTime(rating, &time);
else if (!time_exists)
result_wear = 0; continue;
result_main_group = name;
} if (leveldiff > 1)
time /= leveldiff;
if (!result_diggable || time < result_time) {
result_time = time;
result_diggable = true;
if (cap.uses != 0)
result_wear = 1.0 / cap.uses / pow(3.0, leveldiff);
else
result_wear = 0;
result_main_group = groupname;
} }
} }
//infostream<<"result_diggable="<<result_diggable<<std::endl;
//infostream<<"result_time="<<result_time<<std::endl;
//infostream<<"result_wear="<<result_wear<<std::endl;
if(time_from_last_punch < tp->full_punch_interval){ u16 wear_i = U16_MAX * result_wear;
float f = time_from_last_punch / tp->full_punch_interval;
//infostream<<"f="<<f<<std::endl;
result_time /= f;
result_wear /= f;
}
u16 wear_i = 65535.*result_wear;
return DigParams(result_diggable, result_time, wear_i, result_main_group); return DigParams(result_diggable, result_time, wear_i, result_main_group);
} }
DigParams getDigParams(const ItemGroupList &groups,
const ToolCapabilities *tp)
{
return getDigParams(groups, tp, 1000000);
}
HitParams getHitParams(const ItemGroupList &armor_groups, HitParams getHitParams(const ItemGroupList &armor_groups,
const ToolCapabilities *tp, float time_from_last_punch) const ToolCapabilities *tp, float time_from_last_punch)
{ {

3
src/tool.h
View File

@ -95,9 +95,6 @@ struct DigParams
{} {}
}; };
DigParams getDigParams(const ItemGroupList &groups,
const ToolCapabilities *tp, float time_from_last_punch);
DigParams getDigParams(const ItemGroupList &groups, DigParams getDigParams(const ItemGroupList &groups,
const ToolCapabilities *tp); const ToolCapabilities *tp);