From 2b4f29931162cd748c07588fcae9220b02f672ed Mon Sep 17 00:00:00 2001 From: Inkfish Date: Fri, 5 Jun 2009 00:22:12 +0000 Subject: * Fixed turning off a skill needed to meet the requirements. (bugreport:3175) * Skills used through items not having aftercast delay or cast time now don't overwrite the former canact_tick. (topic:220921) * Multiple autoscripts now can trigger at once. * Applied a temp fix for autoscripts crashing server.(bugreport:3154) * Implemented SC_JEXPBOOST (thanks to GMJobbie for the diff). (bugreport:3177) * Implemented SC_IGNOREDEF. (topic:217330) * SC_DEFRATIOATK won't affect boss monsters. (topic:217330) * Fixed skip_teleport_lv1_menu made lv2 skip menu as well. (bugreport:3183) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13844 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/status.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/map/status.c') diff --git a/src/map/status.c b/src/map/status.c index 6015837f0..602978f18 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -475,6 +475,7 @@ void initChangeTables(void) //Cash Items StatusIconChangeTable[SC_EXPBOOST] = SI_EXPBOOST; StatusIconChangeTable[SC_ITEMBOOST] = SI_ITEMBOOST; + StatusIconChangeTable[SC_JEXPBOOST] = SI_CASH_PLUSONLYJOBEXP; StatusIconChangeTable[SC_LIFEINSURANCE] = SI_LIFEINSURANCE; StatusIconChangeTable[SC_BOSSMAPINFO] = SI_BOSSMAPINFO; StatusIconChangeTable[SC_DEF_RATE] = SI_DEF_RATE; @@ -1771,9 +1772,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first) + sizeof(sd->itemhealrate) ); // clear autoscripts... - pc_autoscript_clear(sd->autoscript, ARRAYLENGTH(sd->autoscript)); - pc_autoscript_clear(sd->autoscript2, ARRAYLENGTH(sd->autoscript2)); - pc_autoscript_clear(sd->autoscript3, ARRAYLENGTH(sd->autoscript3)); + pc_autoscript_clear(sd); // vars zeroing. ints, shorts, chars. in that order. memset (&sd->arrow_atk, 0,sizeof(sd->arrow_atk) @@ -5864,6 +5863,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val val3*=val1; break; case SC_EXPBOOST: + case SC_JEXPBOOST: if (val1 < 0) val1 = 0; break; @@ -6232,6 +6232,7 @@ int status_change_clear(struct block_list* bl, int type) case SC_EXPBOOST: case SC_ITEMBOOST: case SC_HELLPOWER: + case SC_JEXPBOOST: continue; } -- cgit v1.2.3-70-g09d2