diff options
| author | csnv <ctt@csnv.es> | 2014-09-14 19:09:02 +0200 |
|---|---|---|
| committer | csnv <ctt@csnv.es> | 2014-09-14 19:09:02 +0200 |
| commit | 91251803d14a323320878e2d00534613394e8a3a (patch) | |
| tree | c2d2da751ec2e408c3b6ecb3ac9e3725eb06f845 /src | |
| parent | 27a5dde4ad7f1e295d79abc1e82ec5ec0db15d2b (diff) | |
| download | hercules-91251803d14a323320878e2d00534613394e8a3a.tar.gz hercules-91251803d14a323320878e2d00534613394e8a3a.tar.bz2 hercules-91251803d14a323320878e2d00534613394e8a3a.tar.xz hercules-91251803d14a323320878e2d00534613394e8a3a.zip | |
Fixes sitting on trap, SO_VACUUM_EXTREME and RA_CAMOUFLAGE
- Don't sit while trapped. Bug http://hercules.ws/board/tracker/issue-7825-trap/
SO_VACUUM_EXTREME swapping targets when 2 or more are present and close to each other.
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 21 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index d9acf0792..26462afba 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10173,6 +10173,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, if (sd->sc.count && ( sd->sc.data[SC_DANCING] || + sd->sc.data[SC_ANKLESNARE] || (sd->sc.data[SC_GRAVITATION] && sd->sc.data[SC_GRAVITATION]->val3 == BCT_SELF) )) //No sitting during these states either. break; diff --git a/src/map/skill.c b/src/map/skill.c index 2b31a84db..269663d91 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6275,25 +6275,24 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin case GC_CLOAKINGEXCEED: case LG_FORCEOFVANGUARD: case SC_REPRODUCE: + case RA_CAMOUFLAGE: if (tsce) { int failure = status_change_end(bl, type, INVALID_TIMER); if( failure ) clif->skill_nodamage(src,bl,skill_id,( skill_id == LG_FORCEOFVANGUARD ) ? skill_lv : -1,failure); else if( sd ) clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0); - if ( skill_id == LG_FORCEOFVANGUARD ) + if ( skill_id == LG_FORCEOFVANGUARD || skill_id == RA_CAMOUFLAGE ) break; map->freeblock_unlock(); return 0; + } else { + int failure = sc_start(src,bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv)); + if( failure ) + clif->skill_nodamage(src,bl,skill_id,( skill_id == LG_FORCEOFVANGUARD ) ? skill_lv : -1,failure); + else if( sd ) + clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0); } - case RA_CAMOUFLAGE: - { - int failure = sc_start(src,bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv)); - if( failure ) - clif->skill_nodamage(src,bl,skill_id,( skill_id == LG_FORCEOFVANGUARD ) ? skill_lv : -1,failure); - else if( sd ) - clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0); - } break; case BD_ADAPTATION: @@ -12199,7 +12198,7 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 break; case UNT_VACUUM_EXTREME: - if ( tsc && tsc->data[SC_HALLUCINATIONWALK] ) { + if (tsc && (tsc->data[SC_HALLUCINATIONWALK] || tsc->data[SC_VACUUM_EXTREME])) { return 0; } else { sg->limit -= 100 * tstatus->str/20; @@ -12208,7 +12207,7 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 if (unit->movepos(bl, sg->val1, sg->val2, 0, 0)) { clif->slide(bl, sg->val1, sg->val2); clif->fixpos(bl); - } + } } break; |