summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-06-29 13:11:43 +0200
committerGitHub <noreply@github.com>2018-06-29 13:11:43 +0200
commit6c1c1e77d0f1a47437428aad00e797ac04a0ea5a (patch)
treee150d48fb80f4443f37a5b87badbb26f1f8438db
parent337001c5cd46374709e7cabb63a8c45cff6db847 (diff)
parente1fc164fb9b8827fa3015f9b3e3f8872ec8d05d2 (diff)
downloadhercules-6c1c1e77d0f1a47437428aad00e797ac04a0ea5a.tar.gz
hercules-6c1c1e77d0f1a47437428aad00e797ac04a0ea5a.tar.bz2
hercules-6c1c1e77d0f1a47437428aad00e797ac04a0ea5a.tar.xz
hercules-6c1c1e77d0f1a47437428aad00e797ac04a0ea5a.zip
Merge pull request #2097 from HerculesWS/incatkrate_n_divestfix
Fix SC_INCATKRATE not working on monsters and Divest Weapon
-rw-r--r--src/map/status.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 4e2724d61..a4856f4da 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4985,9 +4985,6 @@ 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;
@@ -5090,7 +5087,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] && bl->type != BL_MOB)
+ if(sc->data[SC_INCATKRATE])
watk += watk * sc->data[SC_INCATKRATE]->val1/100;
if(sc->data[SC_PROVOKE])
watk += watk * sc->data[SC_PROVOKE]->val3/100;
@@ -5100,10 +5097,8 @@ 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])