aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-04 13:40:40 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-03-10 11:28:13 +0200
commit0b21618a054fbfa9f4b5e99a5044f2b2dd1d642b (patch)
tree1b4c530b489e8b3794e801c6e3efc20acffaf33c
parentb49a7c140e0ca719a567e5d64f4725231927d02c (diff)
downloadminetest-0b21618a054fbfa9f4b5e99a5044f2b2dd1d642b.tar.gz
minetest-0b21618a054fbfa9f4b5e99a5044f2b2dd1d642b.tar.bz2
minetest-0b21618a054fbfa9f4b5e99a5044f2b2dd1d642b.zip
Tune group digging time stuff a bit
-rw-r--r--src/serverremoteplayer.cpp2
-rw-r--r--src/tool.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/serverremoteplayer.cpp b/src/serverremoteplayer.cpp
index 8a81f1d2d..9dd4723fd 100644
--- a/src/serverremoteplayer.cpp
+++ b/src/serverremoteplayer.cpp
@@ -183,8 +183,8 @@ void ServerRemotePlayer::punch(ServerActiveObject *puncher,
// "Material" groups of the player
std::map<std::string, int> groups;
- groups["snappy"] = 1;
groups["choppy"] = 2;
+ groups["fleshy"] = 3;
IItemDefManager *idef = m_env->getGameDef()->idef();
ItemStack punchitem = puncher->getWieldedItem();
diff --git a/src/tool.cpp b/src/tool.cpp
index 3c61ad6e7..69141f4e5 100644
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -135,10 +135,10 @@ HitParams getHitParams(const std::map<std::string, int> &groups,
DigParams digprop = getDigParams(groups, tp,
time_from_last_punch);
- // If digging time would be 1 second, 8 half-hearts go in 1 second.
+ // Damage in hp is equivalent to nodes dug in time_from_last_punch
s16 hp = 0;
if(digprop.diggable)
- hp = 8.0 / digprop.time;
+ hp = time_from_last_punch / digprop.time;
// Wear is the same as for digging a single node
s16 wear = (float)digprop.wear;