/*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
*/
#include "tool.h"
-#include "utility.h"
-#include "itemdef.h" // For itemgroup_get()
+#include "itemgroup.h"
#include "log.h"
#include "inventory.h"
+#include "exceptions.h"
+#include "util/serialize.h"
+#include "util/numeric.h"
-void ToolCapabilities::serialize(std::ostream &os) const
+void ToolCapabilities::serialize(std::ostream &os, u16 protocol_version) const
{
- writeU8(os, 1); // version
+ writeU8(os, 3); // protocol_version >= 36
writeF1000(os, full_punch_interval);
writeS16(os, max_drop_level);
writeU32(os, groupcaps.size());
- for(std::map<std::string, ToolGroupCap>::const_iterator
- i = groupcaps.begin(); i != groupcaps.end(); i++){
- const std::string *name = &i->first;
- const ToolGroupCap *cap = &i->second;
- os<<serializeString(*name);
+ for (const auto &groupcap : groupcaps) {
+ const std::string *name = &groupcap.first;
+ const ToolGroupCap *cap = &groupcap.second;
+ os << serializeString(*name);
writeS16(os, cap->uses);
writeS16(os, cap->maxlevel);
writeU32(os, cap->times.size());
- for(std::map<int, float>::const_iterator
- i = cap->times.begin(); i != cap->times.end(); i++){
- writeS16(os, i->first);
- writeF1000(os, i->second);
+ for (const auto &time : cap->times) {
+ writeS16(os, time.first);
+ writeF1000(os, time.second);
}
}
+
+ writeU32(os, damageGroups.size());
+
+ for (const auto &damageGroup : damageGroups) {
+ os << serializeString(damageGroup.first);
+ writeS16(os, damageGroup.second);
+ }
}
void ToolCapabilities::deSerialize(std::istream &is)
{
int version = readU8(is);
- if(version != 1) throw SerializationError(
- "unsupported ToolCapabilities version");
+ if (version < 3)
+ throw SerializationError("unsupported ToolCapabilities version");
+
full_punch_interval = readF1000(is);
max_drop_level = readS16(is);
groupcaps.clear();
u32 groupcaps_size = readU32(is);
- for(u32 i=0; i<groupcaps_size; i++){
+ for (u32 i = 0; i < groupcaps_size; i++) {
std::string name = deSerializeString(is);
ToolGroupCap cap;
cap.uses = readS16(is);
cap.maxlevel = readS16(is);
u32 times_size = readU32(is);
- for(u32 i=0; i<times_size; i++){
+ for(u32 i = 0; i < times_size; i++) {
int level = readS16(is);
float time = readF1000(is);
cap.times[level] = time;
}
groupcaps[name] = cap;
}
+
+ u32 damage_groups_size = readU32(is);
+ for (u32 i = 0; i < damage_groups_size; i++) {
+ std::string name = deSerializeString(is);
+ s16 rating = readS16(is);
+ damageGroups[name] = rating;
+ }
}
DigParams getDigParams(const ItemGroupList &groups,
return DigParams(true, 0.5, 0, "dig_immediate");
case 3:
//infostream<<"dig_immediate=3"<<std::endl;
- return DigParams(true, 0.0, 0, "dig_immediate");
+ return DigParams(true, 0, 0, "dig_immediate");
default:
break;
}
-
+
// Values to be returned (with a bit of conversion)
bool result_diggable = false;
float result_time = 0.0;
float result_wear = 0.0;
- std::string result_main_group = "";
+ std::string result_main_group;
int level = itemgroup_get(groups, "level");
//infostream<<"level="<<level<<std::endl;
- for(std::map<std::string, ToolGroupCap>::const_iterator
- i = tp->groupcaps.begin(); i != tp->groupcaps.end(); i++){
- const std::string &name = i->first;
+ for (const auto &groupcap : tp->groupcaps) {
+ const std::string &name = groupcap.first;
//infostream<<"group="<<name<<std::endl;
- const ToolGroupCap &cap = i->second;
+ const ToolGroupCap &cap = groupcap.second;
int rating = itemgroup_get(groups, name);
float time = 0;
bool time_exists = cap.getTime(rating, &time);
return getDigParams(groups, tp, 1000000);
}
-HitParams getHitParams(const ItemGroupList &groups,
+HitParams getHitParams(const ItemGroupList &armor_groups,
const ToolCapabilities *tp, float time_from_last_punch)
{
- DigParams digprop = getDigParams(groups, tp,
- time_from_last_punch);
-
- if(time_from_last_punch > tp->full_punch_interval)
- time_from_last_punch = tp->full_punch_interval;
- // Damage in hp is equivalent to nodes dug in time_from_last_punch
- s16 hp = 0;
- if(digprop.diggable)
- hp = time_from_last_punch / digprop.time;
- // Wear is the same as for digging a single node
- s16 wear = (float)digprop.wear;
-
- return HitParams(hp, wear, digprop.main_group);
+ s16 damage = 0;
+ float full_punch_interval = tp->full_punch_interval;
+
+ 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;
+ }
+
+ return {damage, 0};
}
-HitParams getHitParams(const ItemGroupList &groups,
+HitParams getHitParams(const ItemGroupList &armor_groups,
const ToolCapabilities *tp)
{
- return getHitParams(groups, tp, 1000000);
+ return getHitParams(armor_groups, tp, 1000000);
}
PunchDamageResult getPunchDamage(
){
bool do_hit = true;
{
- if(do_hit && punchitem){
- if(itemgroup_get(armor_groups, "punch_operable") &&
- (toolcap == NULL || punchitem->name == ""))
+ if (do_hit && punchitem) {
+ if (itemgroup_get(armor_groups, "punch_operable") &&
+ (toolcap == NULL || punchitem->name.empty()))
do_hit = false;
}
- if(do_hit){
+
+ if (do_hit) {
if(itemgroup_get(armor_groups, "immortal"))
do_hit = false;
}
}
-
+
PunchDamageResult result;
if(do_hit)
{
result.did_punch = true;
result.wear = hitparams.wear;
result.damage = hitparams.hp;
- result.main_group = hitparams.main_group;
}
return result;
projects / minetest.git / blobdiff