summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-09 13:14:00 +0000
committershadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-09 13:14:00 +0000
commit98b4c083aabe025b67022367f24a7543f33fcfc5 (patch)
tree1419a79cba0f5cbbf9292acc0edabb7e32aafd4f
parenta035c0d52588e5f30d531e49d8294a9b8583ff49 (diff)
downloadhercules-98b4c083aabe025b67022367f24a7543f33fcfc5.tar.gz
hercules-98b4c083aabe025b67022367f24a7543f33fcfc5.tar.bz2
hercules-98b4c083aabe025b67022367f24a7543f33fcfc5.tar.xz
hercules-98b4c083aabe025b67022367f24a7543f33fcfc5.zip
Fixed SG_FUSION hp penalty (0.5% to 2%), bugreport:1805
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12929 54d463be-8e91-2dee-dedb-b68131a5f0ec
-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);
}