summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZido <Zido@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-22 20:24:49 +0000
committerZido <Zido@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-22 20:24:49 +0000
commit6e62b57dd656cf21af2ca88a71f7456941e900d8 (patch)
tree8cc4f1610964d381115291094ff1b80d5734052c
parente50a0ceeb87261865c8407268e74558576e8e504 (diff)
downloadhercules-6e62b57dd656cf21af2ca88a71f7456941e900d8.tar.gz
hercules-6e62b57dd656cf21af2ca88a71f7456941e900d8.tar.bz2
hercules-6e62b57dd656cf21af2ca88a71f7456941e900d8.tar.xz
hercules-6e62b57dd656cf21af2ca88a71f7456941e900d8.zip
- Fixed angelus
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6234 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/status.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index bc98533a3..331d075a8 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.
2006/04/22
+ * Angelus was giving more bonus than it should. Fixed. [Zido]
* Added Option constants for Carts, fixed OPTION_FLYING (it conflicts with
OPTION_XMAS?) [Skotlex]
* Updated clif.c to check for OPTION_WEDDING|OPTION_XMAS instead of view
diff --git a/src/map/status.c b/src/map/status.c
index bdb12deb9..0e4e3d956 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2073,7 +2073,7 @@ int status_calc_def2(struct block_list *bl, int def2)
if(sc->data[SC_SUN_COMFORT].timer!=-1)
def2 += (status_get_lv(bl) + status_get_dex(bl) + status_get_luk(bl))/2;
if(sc->data[SC_ANGELUS].timer!=-1)
- def2 += def2 * (10+5*sc->data[SC_ANGELUS].val1)/100;
+ def2 += def2 * (5*sc->data[SC_ANGELUS].val1)/100;
if(sc->data[SC_CONCENTRATION].timer!=-1)
def2 -= def2 * 5*sc->data[SC_CONCENTRATION].val1/100;
if(sc->data[SC_POISON].timer!=-1)