Create node metadata when placing nodes again

[minetest.git] / src / materials.cpp

diff --git a/src/materials.cpp b/src/materials.cpp
index 5c89eafd8b9eba5343c891703e6f31e5d1270861..c37b7c5053736d85674dbca4c61606f6765f21f1 100644 (file)
--- a/src/materials.cpp
+++ b/src/materials.cpp
@@ -18,9 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "materials.h"
-#include "mapnode.h"
-#include "nodedef.h"
-#include "tooldef.h"
 #include "utility.h"
 
 void MaterialProperties::serialize(std::ostream &os)
@@ -49,34 +46,114 @@ void MaterialProperties::deSerialize(std::istream &is)
        flammability = readF1000(is);
 }
 
-DiggingProperties getDiggingProperties(u16 content, ToolDiggingProperties *tp,
-               INodeDefManager *nodemgr)
+ToolDiggingProperties::ToolDiggingProperties(float full_punch_interval_,
+               float a, float b, float c, float d, float e,
+               float f, float g, float h, float i, float j):
+       full_punch_interval(full_punch_interval_),
+       basetime(a),
+       dt_weight(b),
+       dt_crackiness(c),
+       dt_crumbliness(d),
+       dt_cuttability(e),
+       basedurability(f),
+       dd_weight(g),
+       dd_crackiness(h),
+       dd_crumbliness(i),
+       dd_cuttability(j)
+{}
+
+void ToolDiggingProperties::serialize(std::ostream &os)
+{
+       writeU8(os, 0); // version
+       writeF1000(os, full_punch_interval);
+       writeF1000(os, basetime);
+       writeF1000(os, dt_weight);
+       writeF1000(os, dt_crackiness);
+       writeF1000(os, dt_crumbliness);
+       writeF1000(os, dt_cuttability);
+       writeF1000(os, basedurability);
+       writeF1000(os, dd_weight);
+       writeF1000(os, dd_crackiness);
+       writeF1000(os, dd_crumbliness);
+       writeF1000(os, dd_cuttability);
+}
+
+void ToolDiggingProperties::deSerialize(std::istream &is)
 {
-       assert(tp);
-       const MaterialProperties &mp = nodemgr->get(content).material;
-       if(mp.diggability == DIGGABLE_NOT)
+       int version = readU8(is);
+       if(version != 0) throw SerializationError(
+                       "unsupported ToolDiggingProperties version");
+       full_punch_interval = readF1000(is);
+       basetime = readF1000(is);
+       dt_weight = readF1000(is);
+       dt_crackiness = readF1000(is);
+       dt_crumbliness = readF1000(is);
+       dt_cuttability = readF1000(is);
+       basedurability = readF1000(is);
+       dd_weight = readF1000(is);
+       dd_crackiness = readF1000(is);
+       dd_crumbliness = readF1000(is);
+       dd_cuttability = readF1000(is);
+}
+
+DiggingProperties getDiggingProperties(const MaterialProperties *mp,
+               const ToolDiggingProperties *tp, float time_from_last_punch)
+{
+       if(mp->diggability == DIGGABLE_NOT)
                return DiggingProperties(false, 0, 0);
-       if(mp.diggability == DIGGABLE_CONSTANT)
-               return DiggingProperties(true, mp.constant_time, 0);
+       if(mp->diggability == DIGGABLE_CONSTANT)
+               return DiggingProperties(true, mp->constant_time, 0);
 
        float time = tp->basetime;
-       time += tp->dt_weight * mp.weight;
-       time += tp->dt_crackiness * mp.crackiness;
-       time += tp->dt_crumbliness * mp.crumbliness;
-       time += tp->dt_cuttability * mp.cuttability;
+       time += tp->dt_weight * mp->weight;
+       time += tp->dt_crackiness * mp->crackiness;
+       time += tp->dt_crumbliness * mp->crumbliness;
+       time += tp->dt_cuttability * mp->cuttability;
        if(time < 0.2)
                time = 0.2;
 
        float durability = tp->basedurability;
-       durability += tp->dd_weight * mp.weight;
-       durability += tp->dd_crackiness * mp.crackiness;
-       durability += tp->dd_crumbliness * mp.crumbliness;
-       durability += tp->dd_cuttability * mp.cuttability;
+       durability += tp->dd_weight * mp->weight;
+       durability += tp->dd_crackiness * mp->crackiness;
+       durability += tp->dd_crumbliness * mp->crumbliness;
+       durability += tp->dd_cuttability * mp->cuttability;
        if(durability < 1)
                durability = 1;
+       
+       if(time_from_last_punch < tp->full_punch_interval){
+               float f = time_from_last_punch / tp->full_punch_interval;
+               time /= f;
+               durability /= f;
+       }
 
        float wear = 1.0 / durability;
-       u16 wear_i = wear/65535.;
+       u16 wear_i = 65535.*wear;
        return DiggingProperties(true, time, wear_i);
 }
 
+DiggingProperties getDiggingProperties(const MaterialProperties *mp,
+               const ToolDiggingProperties *tp)
+{
+       return getDiggingProperties(mp, tp, 1000000);
+}
+
+HittingProperties getHittingProperties(const MaterialProperties *mp,
+               const ToolDiggingProperties *tp, float time_from_last_punch)
+{
+       DiggingProperties digprop = getDiggingProperties(mp, tp,
+                       time_from_last_punch);
+       
+       // If digging time would be 1 second, 2 hearts go in 1 second.
+       s16 hp = 2.0 * 2.0 / digprop.time;
+       // Wear is the same as for digging a single node
+       s16 wear = (float)digprop.wear;
+
+       return HittingProperties(hp, wear);
+}
+
+HittingProperties getHittingProperties(const MaterialProperties *mp,
+               const ToolDiggingProperties *tp)
+{
+       return getHittingProperties(mp, tp, 1000000);
+}
+