Add minetest.check_password_entry callback

[dragonfireclient.git] / src / tool.cpp

diff --git a/src/tool.cpp b/src/tool.cpp
index c1e268ff11c9ff4f512a3a865924de90e92bba74..54b9f15f4467d1527732946dc740d88d019aed93 100644 (file)
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -1,6 +1,6 @@
 /*
-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
@@ -18,20 +18,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "tool.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
+       if(protocol_version <= 17)
+               writeU8(os, 1); // version
+       else
+               writeU8(os, 2); // version
        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++){
+                       i = groupcaps.begin(); i != groupcaps.end(); ++i){
                const std::string *name = &i->first;
                const ToolGroupCap *cap = &i->second;
                os<<serializeString(*name);
@@ -39,17 +43,25 @@ void ToolCapabilities::serialize(std::ostream &os) const
                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++){
+                               i = cap->times.begin(); i != cap->times.end(); ++i){
                        writeS16(os, i->first);
                        writeF1000(os, i->second);
                }
        }
+       if(protocol_version > 17){
+               writeU32(os, damageGroups.size());
+               for(std::map<std::string, s16>::const_iterator
+                               i = damageGroups.begin(); i != damageGroups.end(); ++i){
+                       os<<serializeString(i->first);
+                       writeS16(os, i->second);
+               }
+       }
 }
 
 void ToolCapabilities::deSerialize(std::istream &is)
 {
        int version = readU8(is);
-       if(version != 1) throw SerializationError(
+       if(version != 1 && version != 2) throw SerializationError(
                        "unsupported ToolCapabilities version");
        full_punch_interval = readF1000(is);
        max_drop_level = readS16(is);
@@ -68,6 +80,15 @@ void ToolCapabilities::deSerialize(std::istream &is)
                }
                groupcaps[name] = cap;
        }
+       if(version == 2)
+       {
+               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,
@@ -95,7 +116,7 @@ DigParams getDigParams(const ItemGroupList &groups,
        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++){
+                       i = tp->groupcaps.begin(); i != tp->groupcaps.end(); ++i){
                const std::string &name = i->first;
                //infostream<<"group="<<name<<std::endl;
                const ToolGroupCap &cap = i->second;
@@ -136,28 +157,26 @@ DigParams getDigParams(const ItemGroupList &groups,
        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(std::map<std::string, s16>::const_iterator
+                       i = tp->damageGroups.begin(); i != tp->damageGroups.end(); ++i){
+               s16 armor = itemgroup_get(armor_groups, i->first);
+               damage += i->second * rangelim(time_from_last_punch / full_punch_interval, 0.0, 1.0)
+                               * armor / 100.0;
+       }
+
+       return HitParams(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(
@@ -187,7 +206,6 @@ PunchDamageResult getPunchDamage(
                result.did_punch = true;
                result.wear = hitparams.wear;
                result.damage = hitparams.hp;
-               result.main_group = hitparams.main_group;
        }
 
        return result;