diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2015-04-02 08:51:14 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2015-04-02 08:51:14 +0800 |
| commit | 94899de0397d74b0f06bdccdbfc67eabd2d06e38 (patch) | |
| tree | 322bdaeae036291ab38d535a9c1b2e6e6e2c8366 /src/map/status.c | |
| parent | 19228956cc31c6406366a69d06a76467451def3a (diff) | |
| parent | 60844f655aaa7adb735674d51bb3a83b90c8c6db (diff) | |
| download | hercules-94899de0397d74b0f06bdccdbfc67eabd2d06e38.tar.gz hercules-94899de0397d74b0f06bdccdbfc67eabd2d06e38.tar.bz2 hercules-94899de0397d74b0f06bdccdbfc67eabd2d06e38.tar.xz hercules-94899de0397d74b0f06bdccdbfc67eabd2d06e38.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules into JobDBRedesign
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index bc8f289d5..4e4398c49 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1652,7 +1652,6 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, uin (sc->data[SC_TRICKDEAD] && skill_id != NV_TRICKDEAD) || (sc->data[SC_AUTOCOUNTER] && !flag && skill_id) || (sc->data[SC_GOSPEL] && sc->data[SC_GOSPEL]->val4 == BCT_SELF && skill_id != PA_GOSPEL) - || (sc->data[SC_GRAVITATION] && sc->data[SC_GRAVITATION]->val3 == BCT_SELF && flag != 2) ) return 0; @@ -5479,8 +5478,8 @@ short status_calc_aspd(struct block_list *bl, struct status_change *sc, short fl bonus -= sc->data[SC_DEFENDER]->val4 / 10; if (sc->data[SC_GOSPEL] && sc->data[SC_GOSPEL]->val4 == BCT_ENEMY) // needs more info bonus -= 25; - if (sc->data[SC_GRAVITATION]) - bonus -= sc->data[SC_GRAVITATION]->val2; // needs more info + if (sc->data[SC_GRAVITATION] && sc->data[SC_GRAVITATION]->val3 != BCT_SELF) + bonus -= sc->data[SC_GRAVITATION]->val2 / 10; if (sc->data[SC_JOINTBEAT]) { // needs more info if (sc->data[SC_JOINTBEAT]->val2&BREAK_WRIST) bonus -= 25; @@ -5641,7 +5640,7 @@ short status_calc_aspd_rate(struct block_list *bl, struct status_change *sc, int aspd_rate += sc->data[SC_DEFENDER]->val4; if(sc->data[SC_GOSPEL] && sc->data[SC_GOSPEL]->val4 == BCT_ENEMY) aspd_rate += 250; - if(sc->data[SC_GRAVITATION]) + if(sc->data[SC_GRAVITATION] && sc->data[SC_GRAVITATION]->val3 != BCT_SELF) aspd_rate += sc->data[SC_GRAVITATION]->val2; if(sc->data[SC_JOINTBEAT]) { if( sc->data[SC_JOINTBEAT]->val2&BREAK_WRIST ) |