*/
#include "tool.h"
+#include "itemdef.h"
#include "itemgroup.h"
#include "log.h"
#include "inventory.h"
void ToolCapabilities::serialize(std::ostream &os, u16 protocol_version) const
{
- writeU8(os, 3); // protocol_version >= 36
- writeF1000(os, full_punch_interval);
+ if (protocol_version >= 38)
+ writeU8(os, 5);
+ else
+ writeU8(os, 4); // proto == 37
+ writeF32(os, full_punch_interval);
writeS16(os, max_drop_level);
writeU32(os, groupcaps.size());
for (const auto &groupcap : groupcaps) {
writeU32(os, cap->times.size());
for (const auto &time : cap->times) {
writeS16(os, time.first);
- writeF1000(os, time.second);
+ writeF32(os, time.second);
}
}
os << serializeString(damageGroup.first);
writeS16(os, damageGroup.second);
}
+
+ if (protocol_version >= 38)
+ writeU16(os, rangelim(punch_attack_uses, 0, U16_MAX));
}
void ToolCapabilities::deSerialize(std::istream &is)
{
int version = readU8(is);
- if (version < 3)
+ if (version < 4)
throw SerializationError("unsupported ToolCapabilities version");
- full_punch_interval = readF1000(is);
+ full_punch_interval = readF32(is);
max_drop_level = readS16(is);
groupcaps.clear();
u32 groupcaps_size = readU32(is);
u32 times_size = readU32(is);
for(u32 i = 0; i < times_size; i++) {
int level = readS16(is);
- float time = readF1000(is);
+ float time = readF32(is);
cap.times[level] = time;
}
groupcaps[name] = cap;
s16 rating = readS16(is);
damageGroups[name] = rating;
}
+
+ if (version >= 5)
+ punch_attack_uses = readU16(is);
}
void ToolCapabilities::serializeJson(std::ostream &os) const
Json::Value root;
root["full_punch_interval"] = full_punch_interval;
root["max_drop_level"] = max_drop_level;
+ root["punch_attack_uses"] = punch_attack_uses;
Json::Value groupcaps_object;
- for (auto groupcap : groupcaps) {
+ for (const auto &groupcap : groupcaps) {
groupcap.second.toJson(groupcaps_object[groupcap.first]);
}
root["groupcaps"] = groupcaps_object;
full_punch_interval = root["full_punch_interval"].asFloat();
if (root["max_drop_level"].isInt())
max_drop_level = root["max_drop_level"].asInt();
+ if (root["punch_attack_uses"].isInt())
+ punch_attack_uses = root["punch_attack_uses"].asInt();
Json::Value &groupcaps_object = root["groupcaps"];
if (groupcaps_object.isObject()) {
}
DigParams getDigParams(const ItemGroupList &groups,
- const ToolCapabilities *tp, float time_from_last_punch)
+ const ToolCapabilities *tp)
{
- //infostream<<"getDigParams"<<std::endl;
- /* Check group dig_immediate */
- switch(itemgroup_get(groups, "dig_immediate")){
- case 2:
- //infostream<<"dig_immediate=2"<<std::endl;
- return DigParams(true, 0.5, 0, "dig_immediate");
- case 3:
- //infostream<<"dig_immediate=3"<<std::endl;
- 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)
std::string result_main_group;
int level = itemgroup_get(groups, "level");
- //infostream<<"level="<<level<<std::endl;
for (const auto &groupcap : tp->groupcaps) {
- const std::string &name = groupcap.first;
- //infostream<<"group="<<name<<std::endl;
const ToolGroupCap &cap = groupcap.second;
- int rating = itemgroup_get(groups, name);
+
+ int leveldiff = cap.maxlevel - level;
+ if (leveldiff < 0)
+ continue;
+
+ const std::string &groupname = groupcap.first;
float time = 0;
+ int rating = itemgroup_get(groups, groupname);
bool time_exists = cap.getTime(rating, &time);
- int leveldiff = cap.maxlevel - level;
- time /= MYMAX(1, leveldiff);
- if(!result_diggable || time < result_time){
- if(cap.maxlevel >= level && time_exists){
- result_diggable = true;
- result_time = time;
- if(cap.uses != 0)
- result_wear = 1.0 / cap.uses / pow(3.0, (double)leveldiff);
- else
- result_wear = 0;
- result_main_group = name;
- }
+ if (!time_exists)
+ continue;
+
+ 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){
- 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;
+ u16 wear_i = U16_MAX * result_wear;
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,
const ToolCapabilities *tp, float time_from_last_punch)
{
s16 damage = 0;
- float full_punch_interval = tp->full_punch_interval;
+ float result_wear = 0.0f;
+ float punch_interval_multiplier =
+ rangelim(time_from_last_punch / tp->full_punch_interval, 0.0f, 1.0f);
for (const auto &damageGroup : tp->damageGroups) {
s16 armor = itemgroup_get(armor_groups, damageGroup.first);
- damage += damageGroup.second
- * rangelim(time_from_last_punch / full_punch_interval, 0.0, 1.0)
- * armor / 100.0;
+ damage += damageGroup.second * punch_interval_multiplier * armor / 100.0;
}
- return {damage, 0};
+ if (tp->punch_attack_uses > 0)
+ result_wear = 1.0f / tp->punch_attack_uses * punch_interval_multiplier;
+
+ u16 wear_i = U16_MAX * result_wear;
+ return {damage, wear_i};
}
HitParams getHitParams(const ItemGroupList &armor_groups,
return result;
}
+f32 getToolRange(const ItemDefinition &def_selected, const ItemDefinition &def_hand)
+{
+ float max_d = def_selected.range;
+ float max_d_hand = def_hand.range;
+
+ if (max_d < 0 && max_d_hand >= 0)
+ max_d = max_d_hand;
+ else if (max_d < 0)
+ max_d = 4.0f;
+
+ return max_d;
+}
projects / dragonfireclient.git / blobdiff