diff options
| author | Jedzkie <jedzkie13@rocketmail.com> | 2015-12-15 21:18:08 +0800 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-17 06:19:08 +0100 |
| commit | 7e083f9ae7688b2ee1d98246af0ba60c914d0f88 (patch) | |
| tree | 28bfcb2bd00bdbda9376c72930be4299b8d25561 | |
| parent | 8230f5d81baf2647aa49b1cea276c1ada749dc71 (diff) | |
| download | hercules-7e083f9ae7688b2ee1d98246af0ba60c914d0f88.tar.gz hercules-7e083f9ae7688b2ee1d98246af0ba60c914d0f88.tar.bz2 hercules-7e083f9ae7688b2ee1d98246af0ba60c914d0f88.tar.xz hercules-7e083f9ae7688b2ee1d98246af0ba60c914d0f88.zip | |
Removal of SC_ITEMSCRIPT.
| -rw-r--r-- | db/const.txt | 1 | ||||
| -rw-r--r-- | src/map/status.c | 56 | ||||
| -rw-r--r-- | src/map/status.h | 4 |
3 files changed, 2 insertions, 59 deletions
diff --git a/db/const.txt b/db/const.txt index d5251799d..100ee1e7a 100644 --- a/db/const.txt +++ b/db/const.txt @@ -987,7 +987,6 @@ SC_MER_SP 282 SC_MER_HIT 283 SC_MER_QUICKEN 284 SC_REBIRTH 285 -SC_ITEMSCRIPT 290 SC_S_LIFEPOTION 291 SC_L_LIFEPOTION 292 SC_CASH_PLUSONLYJOBEXP 293 diff --git a/src/map/status.c b/src/map/status.c index c94794ef6..841f9c855 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1014,7 +1014,6 @@ void initChangeTables(void) { status->dbs->ChangeFlagTable[SC_ARMOR_RESIST] |= SCB_ALL; status->dbs->ChangeFlagTable[SC_ATKER_BLOOD] |= SCB_ALL; status->dbs->ChangeFlagTable[SC_WALKSPEED] |= SCB_SPEED; - status->dbs->ChangeFlagTable[SC_ITEMSCRIPT] |= SCB_ALL; status->dbs->ChangeFlagTable[SC_TARGET_BLOOD] |= SCB_ALL; status->dbs->ChangeFlagTable[SC_TARGET_ASPD] |= SCB_MAXSP; status->dbs->ChangeFlagTable[SC_ATKER_ASPD] |= SCB_MAXHP | SCB_ALL; @@ -2542,12 +2541,6 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) { } } - if( sc->count && sc->data[SC_ITEMSCRIPT] ) { - struct item_data *data = itemdb->exists(sc->data[SC_ITEMSCRIPT]->val1); - if( data && data->script ) - script->run_use_script(sd, data, 0); - } - status->calc_pc_additional(sd, opt); if( sd->pd ) { // Pet Bonus @@ -9494,31 +9487,6 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t if (battle_config.sc_castcancel&bl->type) unit->skillcastcancel(bl, 0); break; - /* */ - case SC_ITEMSCRIPT: - if( sd ) { - switch( val1 ) { - case ITEMID_PHREEONI_CARD: - clif->status_change(bl, SI_FOOD_BASICHIT, 1, tick, 0, 0, 0); - break; - case ITEMID_GHOSTRING_CARD: - clif->status_change(bl,SI_ARMOR_PROPERTY,1,tick,0,0,0); - break; - case ITEMID_TAO_GUNKA_CARD: - clif->status_change(bl,SI_MVPCARD_TAOGUNKA,1,tick,0,0,0); - break; - case ITEMID_MISTRESS_CARD: - clif->status_change(bl,SI_MVPCARD_MISTRESS,1,tick,0,0,0); - break; - case ITEMID_ORC_HERO_CARD: - clif->status_change(bl,SI_MVPCARD_ORCHERO,1,tick,0,0,0); - break; - case ITEMID_ORC_LOAD_CARD: - clif->status_change(bl,SI_MVPCARD_ORCLORD,1,tick,0,0,0); - break; - } - } - break; } // Set option as needed. @@ -10385,30 +10353,6 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const if( sce->val2 ) status_change_end(bl, (sc_type)sce->val2, INVALID_TIMER); break; - case SC_ITEMSCRIPT: - if( sd ) { - switch( sce->val1 ) { - case ITEMID_PHREEONI_CARD: - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_FOOD_BASICHIT); - break; - case ITEMID_GHOSTRING_CARD: - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_ARMOR_PROPERTY); - break; - case ITEMID_TAO_GUNKA_CARD: - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_MVPCARD_TAOGUNKA); - break; - case ITEMID_MISTRESS_CARD: - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_MVPCARD_MISTRESS); - break; - case ITEMID_ORC_HERO_CARD: - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_MVPCARD_ORCHERO); - break; - case ITEMID_ORC_LOAD_CARD: - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_MVPCARD_ORCLORD); - break; - } - } - break; case SC_OVERED_BOOST: switch( bl->type ){ case BL_HOM: diff --git a/src/map/status.h b/src/map/status.h index 21d2e1035..d44cc9bca 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -390,8 +390,8 @@ typedef enum sc_type { //SC_DEFRATIOATK, //SC_HPDRAIN, //SC_SKILLATKBONUS, - SC_ITEMSCRIPT = 290, - SC_S_LIFEPOTION, + //SC_ITEMSCRIPT, + SC_S_LIFEPOTION = 291, SC_L_LIFEPOTION, SC_CASH_PLUSONLYJOBEXP, //SC_IGNOREDEF, |