diff options
| author | hemagx <ibrahem.h.basyone@gmail.com> | 2016-10-22 02:28:16 +0200 |
|---|---|---|
| committer | hemagx <ibrahem.h.basyone@gmail.com> | 2016-10-22 02:28:16 +0200 |
| commit | f072f3c9771cf0154f3b207970d86cc857708050 (patch) | |
| tree | 34579ba5f0b3f71f681489883939d0ac770c7c0a /src/map/unit.c | |
| parent | d8441a3522797a25b5bcc46d6e5b38adebd0a70b (diff) | |
| parent | 431b8aad001d959225aaa41b8d0a80c4d5526229 (diff) | |
| download | hercules-f072f3c9771cf0154f3b207970d86cc857708050.tar.gz hercules-f072f3c9771cf0154f3b207970d86cc857708050.tar.bz2 hercules-f072f3c9771cf0154f3b207970d86cc857708050.tar.xz hercules-f072f3c9771cf0154f3b207970d86cc857708050.zip | |
Merge pull request #1458 from dastgir/2016-1_summoner
Introduces Summoner Class
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 5364a9547..0f3631792 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1127,6 +1127,7 @@ int unit_can_move(struct block_list *bl) || sc->data[SC_VACUUM_EXTREME] || (sc->data[SC_FEAR] && sc->data[SC_FEAR]->val2 > 0) || sc->data[SC_NETHERWORLD] + || sc->data[SC_SUHIDE] || (sc->data[SC_SPIDERWEB] && sc->data[SC_SPIDERWEB]->val1) || (sc->data[SC_CLOAKING] && sc->data[SC_CLOAKING]->val1 < 3 && !(sc->data[SC_CLOAKING]->val4&1)) //Need wall at level 1-2 || ( @@ -1543,7 +1544,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui } break; case GD_EMERGENCYCALL: //Emergency Call double cast when the user has learned Leap [Daegaladh] - if( sd && pc->checkskill(sd,TK_HIGHJUMP) ) + if (sd && (pc->checkskill(sd,TK_HIGHJUMP) || pc->checkskill(sd,SU_LOPE) >= 3)) casttime *= 2; break; case RA_WUGDASH: @@ -2464,6 +2465,8 @@ int unit_remove_map(struct block_list *bl, clr_type clrtype, const char* file, i status_change_end(bl, SC_VACUUM_EXTREME, INVALID_TIMER); status_change_end(bl, SC_CURSEDCIRCLE_ATKER, INVALID_TIMER); //callme before warp status_change_end(bl, SC_NETHERWORLD, INVALID_TIMER); + status_change_end(bl, SC_SUHIDE, INVALID_TIMER); + status_change_end(bl, SC_SV_ROOTTWIST, INVALID_TIMER); } if (bl->type&(BL_CHAR|BL_PET)) { |