diff options
| author | shennetsind <notind@gmail.com> | 2013-10-04 18:25:24 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-10-04 18:25:24 -0700 |
| commit | dedec165eaeb0d291279b1d5b53fac242bcf7b4c (patch) | |
| tree | 20a664d09de7a29a9de451b19df7973997adb30e /src/map/status.c | |
| parent | baa5c1fc386a706ba4bf4aa48409b8947274c928 (diff) | |
| parent | d153854f32c4fd9265010e6936db49e23137db08 (diff) | |
| download | hercules-dedec165eaeb0d291279b1d5b53fac242bcf7b4c.tar.gz hercules-dedec165eaeb0d291279b1d5b53fac242bcf7b4c.tar.bz2 hercules-dedec165eaeb0d291279b1d5b53fac242bcf7b4c.tar.xz hercules-dedec165eaeb0d291279b1d5b53fac242bcf7b4c.zip | |
Merge pull request #167 from shenhuyong/master
* Fixed Bug #7713 And #7708
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index 6953312f8..28699d06a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4216,7 +4216,7 @@ unsigned short status_calc_int(struct block_list *bl, struct status_change *sc, if(sc->data[SC_MARIONETTE]) int_ += ((sc->data[SC_MARIONETTE]->val4)>>16)&0xFF; if(sc->data[SC_MANDRAGORA]) - int_ -= 5 + 5 * sc->data[SC_MANDRAGORA]->val1; + int_ -= 4 * sc->data[SC_MANDRAGORA]->val1; if(sc->data[SC_COCKTAIL_WARG_BLOOD]) int_ += sc->data[SC_COCKTAIL_WARG_BLOOD]->val1; if(sc->data[SC_INSPIRATION]) @@ -6263,9 +6263,6 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti tick -= 1000 * ((status->get_lv(bl) / 10) + ((sd?sd->status.job_level:0) / 5)); tick = max(tick,10000); break; - case SC_MANDRAGORA: - sc_def = (st->vit+st->luk)/5; - break; case SC_KYOUGAKU: tick -= 1000 * status_get_int(bl) / 20; break; |