diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2015-05-03 17:24:35 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2015-05-03 17:24:35 +0800 |
| commit | 85b47e326ad041744606c3e71a8ca67b4b34c313 (patch) | |
| tree | 830155faa45a857b318222bceabcd015909ad678 /src/map/skill.c | |
| parent | ce734bfcd5eb153ea93874b4b94effb5eee91e46 (diff) | |
| download | hercules-85b47e326ad041744606c3e71a8ca67b4b34c313.tar.gz hercules-85b47e326ad041744606c3e71a8ca67b4b34c313.tar.bz2 hercules-85b47e326ad041744606c3e71a8ca67b4b34c313.tar.xz hercules-85b47e326ad041744606c3e71a8ca67b4b34c313.zip | |
Fixed Bug#8650
-http://hercules.ws/board/tracker/issue-8650-minstrel-poem-of-netherworld-or-despair-song-skillleffect/?gopid=25083#entry25083
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index a9737f129..5748c4fd3 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4592,14 +4592,12 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1 status_change_end(bl, SC_RUSH_WINDMILL, INVALID_TIMER); status_change_end(bl, SC_ECHOSONG, INVALID_TIMER); status_change_end(bl, SC_HARMONIZE, INVALID_TIMER); + status_change_end(bl, SC_NETHERWORLD, INVALID_TIMER); status_change_end(bl, SC_SIREN, INVALID_TIMER); - status_change_end(bl, SC_DEEP_SLEEP, INVALID_TIMER); - status_change_end(bl, SC_SIRCLEOFNATURE, INVALID_TIMER); status_change_end(bl, SC_GLOOMYDAY, INVALID_TIMER); status_change_end(bl, SC_SONG_OF_MANA, INVALID_TIMER); status_change_end(bl, SC_DANCE_WITH_WUG, INVALID_TIMER); status_change_end(bl, SC_SATURDAY_NIGHT_FEVER, INVALID_TIMER); - status_change_end(bl, SC_LERADS_DEW, INVALID_TIMER); status_change_end(bl, SC_MELODYOFSINK, INVALID_TIMER); status_change_end(bl, SC_BEYOND_OF_WARCRY, INVALID_TIMER); status_change_end(bl, SC_UNLIMITED_HUMMING_VOICE, INVALID_TIMER); @@ -6565,6 +6563,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin status_change_end(bl, SC_STUN, INVALID_TIMER); status_change_end(bl, SC_WHITEIMPRISON, INVALID_TIMER); } + status_change_end(bl, SC_NETHERWORLD, INVALID_TIMER); //Is this equation really right? It looks so... special. if( battle->check_undead(tstatus->race,tstatus->def_ele) ) { status->change_start(src, bl, SC_BLIND, @@ -12336,10 +12335,11 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 skill->attack(BF_WEAPON,ss,&src->bl,bl,WM_SEVERE_RAINSTORM_MELEE,sg->skill_lv,tick,0); break; case UNT_NETHERWORLD: - if( !(status_get_mode(bl)&MD_BOSS)) { - if( !(tsc && tsc->data[type]) ){ - sc_start(ss, bl, type, 100, sg->skill_lv, skill->get_time2(sg->skill_id,sg->skill_lv)); - } + if ( battle->check_target(&src->bl, bl, BCT_PARTY) == -1 && bl->id != sg->src_id ) { + sc_start(ss, bl, type, 100, sg->skill_lv, skill->get_time2(sg->skill_id, sg->skill_lv)); + sg->limit = 0; + clif->changetraplook(&src->bl, UNT_USED_TRAPS); + sg->unit_id = UNT_USED_TRAPS; } break; case UNT_THORNS_TRAP: |