summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/game-server/being.cpp6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bd8f0dd1..bfac30d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-11 Philipp Sehmisch <tmw@crushnet.org>
+
+ * src/game-server/being.cpp: Using effective attributes instead of base
+ attributes for damage calculation.
+
2007-03-31 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/Makefile.am, src/game-server/testing.cpp,
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index bbaa73aa..82457524 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -52,13 +52,13 @@ void Being::damage(Damage damage)
{
case DAMAGETYPE_PHYSICAL:
HPloss -= getAttribute(DERIVED_ATTR_PHYSICAL_DEFENCE) / damage.piercing;
- HPloss -= getAttribute(BASE_ATTR_VITALITY);
+ HPloss -= getAttribute(ATTR_EFF_VITALITY);
break;
case DAMAGETYPE_MAGICAL:
- HPloss /= getAttribute(BASE_ATTR_WILLPOWER) + 1;
+ HPloss /= getAttribute(ATTR_EFF_WILLPOWER) + 1;
break;
case DAMAGETYPE_HAZARD:
- HPloss /= getAttribute(BASE_ATTR_VITALITY) + 1;
+ HPloss /= getAttribute(ATTR_EFF_VITALITY) + 1;
break;
case DAMAGETYPE_OTHER:
// nothing to do here