summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-07 13:41:02 -0300
committershennetsind <ind@henn.et>2013-10-07 13:41:02 -0300
commitdda77cb771769fcbf13765c0edf3e5da91f3666c (patch)
tree74154558d5fbc3782a6a1070f1ac0c8a0a4fdff3 /src/map/status.c
parentc56e3eb701658079f1de09db759f3b09327ec046 (diff)
parente7457d450f44f07881e9a8d9af25b068596f3df4 (diff)
downloadhercules-dda77cb771769fcbf13765c0edf3e5da91f3666c.tar.gz
hercules-dda77cb771769fcbf13765c0edf3e5da91f3666c.tar.bz2
hercules-dda77cb771769fcbf13765c0edf3e5da91f3666c.tar.xz
hercules-dda77cb771769fcbf13765c0edf3e5da91f3666c.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 6b2edc9ac..497d02bbf 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4221,7 +4221,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])
@@ -6270,9 +6270,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;