diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-28 14:41:25 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-28 14:41:25 +0000 |
| commit | 7158896a63c7150b8a1cb181d398929c9c481ea0 (patch) | |
| tree | e7df8c504f36d776881c550f9de2087f1120706a /src/map/skill.c | |
| parent | 56f3c515d8d537df42c8598e685ee8c87682fbc0 (diff) | |
| download | hercules-7158896a63c7150b8a1cb181d398929c9c481ea0.tar.gz hercules-7158896a63c7150b8a1cb181d398929c9c481ea0.tar.bz2 hercules-7158896a63c7150b8a1cb181d398929c9c481ea0.tar.xz hercules-7158896a63c7150b8a1cb181d398929c9c481ea0.zip | |
Fixed bugreport:6127 remove the double duration bonus from GC_RESEARCHEWPOISON
Fixed bugreport:6109 GN_CARTBOOST should now give atk bonus and fixed some genetic skills damage ratio and behavior
Fixed bugreport:6121 Rolling cutter's counter should now only be removed by walking and Cross Ripper Slasher
Fixed bugreport:6100 Cart should now can't be removed when character dies
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16353 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index f70290ef3..6f459eed1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3373,6 +3373,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int case CH_TIGERFIST: case PA_SHIELDCHAIN: // Shield Chain case PA_SACRIFICE: + case ASC_EDP: case WS_CARTTERMINATION: // Cart Termination case AS_VENOMKNIFE: case HT_PHANTASMIC: @@ -5070,10 +5071,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in } break; - case ASC_EDP: - clif_skill_nodamage(src,bl,skillid,skilllv, - sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv) + ( sd ? 3000 * pc_checkskill(sd,GC_RESEARCHNEWPOISON) : 0 ))); - break; case AL_INCAGI: case AL_BLESSING: case MER_INCAGI: @@ -11208,7 +11205,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns const struct TimerData* td = tsc->data[type]?get_timer(tsc->data[type]->timer):NULL; if( td ) sec = DIFF_TICK(td->tick, tick); - map_moveblock(bl, src->bl.x, src->bl.y, tick); + ///map_moveblock(bl, src->bl.x, src->bl.y, tick); // in official server it doesn't behave like this. [malufett] clif_fixpos(bl); sg->val2 = bl->id; } else |