diff options
author | malufett <malufett.eat.my.binaries@gmail.com> | 2015-04-13 22:50:28 +0800 |
---|---|---|
committer | malufett <malufett.eat.my.binaries@gmail.com> | 2015-04-13 22:50:28 +0800 |
commit | 2c192fc93f4b5c8a19eaefbca4e24e160feb5d47 (patch) | |
tree | e0cdfdd6b6f4974b5f7eaf57688c16017ab7c5dc | |
parent | 5325463c76c0d710f3063faaa1f5deb006411374 (diff) | |
download | hercules-2c192fc93f4b5c8a19eaefbca4e24e160feb5d47.tar.gz hercules-2c192fc93f4b5c8a19eaefbca4e24e160feb5d47.tar.bz2 hercules-2c192fc93f4b5c8a19eaefbca4e24e160feb5d47.tar.xz hercules-2c192fc93f4b5c8a19eaefbca4e24e160feb5d47.zip |
Fixed Bug#8624
-http://hercules.ws/board/tracker/issue-8624-damage-of-mvp/?gopid=24966#entry24966
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
-rw-r--r-- | src/map/status.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index 4e4398c49..ebd9222f6 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4563,6 +4563,9 @@ unsigned short status_calc_batk(struct block_list *bl, struct status_change *sc, #ifndef RENEWAL if(sc->data[SC_LKCONCENTRATION]) batk += batk * sc->data[SC_LKCONCENTRATION]->val2/100; +#else + if ( sc->data[SC_NOEQUIPWEAPON] && bl->type != BL_PC ) + batk -= batk * sc->data[SC_NOEQUIPWEAPON]->val2 / 100; #endif if(sc->data[SC_SKE]) batk += batk * 3; @@ -4642,7 +4645,7 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc, if(sc->data[SC_LKCONCENTRATION]) watk += watk * sc->data[SC_LKCONCENTRATION]->val2/100; #endif - if(sc->data[SC_INCATKRATE]) + if(sc->data[SC_INCATKRATE] && bl->type != BL_MOB) watk += watk * sc->data[SC_INCATKRATE]->val1/100; if(sc->data[SC_PROVOKE]) watk += watk * sc->data[SC_PROVOKE]->val3/100; @@ -4652,8 +4655,10 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc, watk += watk * sc->data[SC_HLIF_FLEET]->val3/100; if(sc->data[SC_CURSE]) watk -= watk * 25/100; +#ifndef RENEWAL if(sc->data[SC_NOEQUIPWEAPON] && bl->type != BL_PC) watk -= watk * sc->data[SC_NOEQUIPWEAPON]->val2/100; +#endif if(sc->data[SC__ENERVATION]) watk -= watk * sc->data[SC__ENERVATION]->val2 / 100; if(sc->data[SC_RUSH_WINDMILL]) |