diff options
| author | shenhuyong <shenhuyong@hotmail.com> | 2013-09-29 22:13:54 +0800 |
|---|---|---|
| committer | shenhuyong <shenhuyong@hotmail.com> | 2013-09-29 22:13:54 +0800 |
| commit | 0cb62ae21be8b9253b7eb50b9b81d8221ed43a67 (patch) | |
| tree | e5914b75f0dab7c23fa6e15d5502fc4fec45577f /src/map/status.c | |
| parent | dbd0dce80cdc7ea02391d5e096b6561f0b598259 (diff) | |
| parent | 715016aa21dae454fbe430e9c806fd8cef769a27 (diff) | |
| download | hercules-0cb62ae21be8b9253b7eb50b9b81d8221ed43a67.tar.gz hercules-0cb62ae21be8b9253b7eb50b9b81d8221ed43a67.tar.bz2 hercules-0cb62ae21be8b9253b7eb50b9b81d8221ed43a67.tar.xz hercules-0cb62ae21be8b9253b7eb50b9b81d8221ed43a67.zip | |
Merge branch 'master' of https://github.com/shenhuyong/GHBB
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 dbce2f7f4..bb2efb505 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4277,7 +4277,7 @@ static unsigned short status_calc_int(struct block_list *bl, struct status_chang 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]) @@ -6328,9 +6328,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; |