Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #661 from RagnarokNova/patch-7

Browse Source 
Magma Eruption Status Effects
This commit is contained in:
Nova 2015-10-20 11:27:35 -07:00
commit edafd267d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/skill.c
View File

@ -1674,9 +1674,9 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
sc_start4(src,bl,SC_BURNING,55+5*skill_lv,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv));
break;
case NC_MAGMA_ERUPTION:
if (attack_type == BF_WEAPON) // Stun effect from 'slam'
if (attack_type&BF_WEAPON) // Stun effect from 'slam'
sc_start(src, bl, SC_STUN, 90, skill_lv, skill_get_time(skill_id, skill_lv));
if (attack_type == BF_MISC) // Burning effect from 'eruption'
if (attack_type&BF_MISC) // Burning effect from 'eruption'
sc_start4(src, bl, SC_BURNING, 10 * skill_lv, skill_lv, 1000, src->id, 0, skill_get_time2(skill_id, skill_lv));
break;
case GC_DARKCROW:
@ -9684,7 +9684,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
if (flag&1)
sc_start2(src,bl,type,skill_area_temp[5],skill_lv,src->id,skill_area_temp[6]);
else {
// Success chance: (Skill Level x 6) + (Voice Lesson Skill Level x 2) + (Caster’s Job Level / 2) %
// Success chance: (Skill Level x 6) + (Voice Lesson Skill Level x 2) + (Caster’s Job Level / 2) %
skill_area_temp[5] = skill_lv * 6 + ((sd) ? pc_checkskill(sd, WM_LESSON) : 1) * 2 + (sd ? sd->status.job_level : 50) / 2;
skill_area_temp[6] = skill_get_time(skill_id,skill_lv);
map_foreachinrange(skill_area_sub, src, skill_get_splash(skill_id,skill_lv), BL_CHAR|BL_SKILL, src, skill_id, skill_lv, tick, flag|BCT_ALL|BCT_WOS|1, skill_castend_nodamage_id);