summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/battle.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6130be0fb..cf9d78c89 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/07/09
+ * Fixed SG_FUSION hp penalty (0.5% to 2%), bugreport:1805 [Brainstorm]
* Added const to the return value of get_timer.
* Added a maximum timer interval. Avoids server shutdowns being delayed
for ~10 seconds under some circumstances on windows.
diff --git a/src/map/battle.c b/src/map/battle.c
index 07bc5379a..d7bae3c0e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2096,7 +2096,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
if (100*sstatus->hp <= 20*sstatus->max_hp)
hp = sstatus->hp;
} else
- hp = 5*hp/1000;
+ hp = 2*hp/100; //2% hp loss per hit
status_zap(src, hp, 0);
}