summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-10 11:13:59 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-10 11:13:59 +0000
commitc142eec60834502efa991b583cdde8d6af819729 (patch)
tree6ac11bc7746ab90bf8a4a1dc9a80d00c60096505 /src
parentc994d7c89cba2730066eefdd183a845702b1b18c (diff)
downloadhercules-c142eec60834502efa991b583cdde8d6af819729.tar.gz
hercules-c142eec60834502efa991b583cdde8d6af819729.tar.bz2
hercules-c142eec60834502efa991b583cdde8d6af819729.tar.xz
hercules-c142eec60834502efa991b583cdde8d6af819729.zip
* Fixed the incorrect DEF reduction of Joint Beat (bugreport:3051)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13751 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 792c225d0..8cb891169 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3758,11 +3758,9 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change
def2 -= def2 * 50/100;
if(sc->data[SC_PROVOKE])
def2 -= def2 * sc->data[SC_PROVOKE]->val4/100;
- if(sc->data[SC_JOINTBEAT]){
- def2 -= def2 *
- ( ( sc->data[SC_JOINTBEAT]->val2&BREAK_SHOULDER ? 50 : 0 )
- + ( sc->data[SC_JOINTBEAT]->val2&BREAK_WAIST ? 25 : 0 ) );
- }
+ if(sc->data[SC_JOINTBEAT])
+ def2 -= def2 * ( sc->data[SC_JOINTBEAT]->val2&BREAK_SHOULDER ? 50 : 0 ) / 100
+ + def2 * ( sc->data[SC_JOINTBEAT]->val2&BREAK_WAIST ? 25 : 0 ) / 100;
if(sc->data[SC_FLING])
def2 -= def2 * (sc->data[SC_FLING]->val3)/100;