Merge correction
This commit is contained in:
parent
dd540bddb2
commit
b58eeb79ac
@ -5247,11 +5247,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
|||||||
skill_attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag);
|
skill_attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag);
|
||||||
sc_start(src, src, SC_DRAGONIC_AURA, 100, skill_lv, skill_get_time(skill_id,skill_lv));
|
sc_start(src, src, SC_DRAGONIC_AURA, 100, skill_lv, skill_get_time(skill_id,skill_lv));
|
||||||
break;
|
break;
|
||||||
case IG_GRAND_JUDGEMENT:
|
|
||||||
clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
|
|
||||||
skill_attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag);
|
|
||||||
sc_start(src, src, SC_SPEAR_SCAR, 100, skill_lv, skill_get_time(skill_id, skill_lv));
|
|
||||||
break;
|
|
||||||
case DK_STORMSLASH:
|
case DK_STORMSLASH:
|
||||||
case CD_EFFLIGO:
|
case CD_EFFLIGO:
|
||||||
case ABC_FRENZY_SHOT:
|
case ABC_FRENZY_SHOT:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user