diff options
| author | skyleo <skyleo@skyleo.de> | 2018-06-20 12:50:05 +0200 |
|---|---|---|
| committer | skyleo <skyleo@skyleo.de> | 2018-06-20 12:50:05 +0200 |
| commit | e1fc164fb9b8827fa3015f9b3e3f8872ec8d05d2 (patch) | |
| tree | 838f82cb12c6e1474f56f5217ed876cec88a188c /src/map/status.c | |
| parent | b57232ac29732ff526eca750dee295a871861ed6 (diff) | |
| download | hercules-e1fc164fb9b8827fa3015f9b3e3f8872ec8d05d2.tar.gz hercules-e1fc164fb9b8827fa3015f9b3e3f8872ec8d05d2.tar.bz2 hercules-e1fc164fb9b8827fa3015f9b3e3f8872ec8d05d2.tar.xz hercules-e1fc164fb9b8827fa3015f9b3e3f8872ec8d05d2.zip | |
Revert "Fixed Bug#8624"
This reverts commit 2c192fc93f4b5c8a19eaefbca4e24e160feb5d47.
This `Fix` broke NPC_POWERUP (or rather SC_INCATKRATE) on Monsters,
making MVPs like Atroce and Doppelganger not stronger in their Power Up
phase as they used to be. Additionally it broke Divest Weapon's ATK
Reduction on Monsters in Renewal.
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 7 |
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]) |