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

Job Improvement Project - Sura (#4256)

Browse Source 
* Fixes #4210.
* kRO Changelog: http://ro.gnjoy.com/news/notice/View.asp?seq=7099
Thanks to @flamefury, Sigma, and @attackjom!
This commit is contained in:
Aleos
2019-10-18 13:10:17 -04:00
committed by GitHub
parent 2e3e8b83f5
commit 24c4c49610
13 changed files with 181 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/map/skill.cpp
View File

@@ -1786,6 +1786,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
break;
case SR_EARTHSHAKER:
sc_start(src,bl,SC_STUN, 25 + 5 * skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));
sc_start(src, bl, SC_EARTHSHAKER, 100, skill_lv, skill_get_time2(skill_id, skill_lv));
status_change_end(bl, SC_SV_ROOTTWIST, INVALID_TIMER);
break;
case SR_HOWLINGOFLION:
@@ -3753,9 +3754,6 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
case WM_METALICSOUND:
status_zap(bl, 0, damage*100/(100*(110-((sd) ? pc_checkskill(sd,WM_LESSON) : skill_get_max(WM_LESSON))*10)));
break;
case SR_TIGERCANNON:
status_zap(bl, 0, damage * 10 / 100);
break;
}
if( sd )
skill_onskillusage(sd, bl, skill_id, tick);
@@ -5103,12 +5101,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
if( skill_area_temp[1] != bl->id && !(skill_get_inf2(skill_id)&INF2_NPC_SKILL) )
sflag |= SD_ANIMATION; // original target gets no animation (as well as all NPC skills)
switch(skill_id) {
case SR_SKYNETBLOW:
if (flag&8)
sflag |= 8; // Give Combo state bonus damage (if active) to all targets in splash
break;
}
heal = (int)skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, sflag);
if( skill_id == NPC_VAMPIRE_GIFT && heal > 0 ) {
clif_skill_nodamage(NULL, src, AL_HEAL, heal, 1);
@@ -7148,8 +7140,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
struct status_change *sc = status_get_sc(src);
int starget = BL_CHAR|BL_SKILL;
if (skill_id == SR_SKYNETBLOW && sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_DRAGONCOMBO)
flag |= 8;
if (skill_id == SR_HOWLINGOFLION)
starget = splash_target(src);
skill_area_temp[1] = 0;
@@ -15150,7 +15140,6 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
break;
case MO_FINGEROFFENSIVE:
case GS_FLING:
case SR_RAMPAGEBLASTER:
case SR_RIDEINLIGHTNING:
if( sd->spiritball > 0 && sd->spiritball < require.spiritball )
sd->spiritball_old = require.spiritball = sd->spiritball;
@@ -16463,9 +16452,6 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
req.spiritball = sd->spiritball; // must consume all regardless of the amount required
}
break;
case SR_RAMPAGEBLASTER:
req.spiritball = sd->spiritball?sd->spiritball:15;
break;
case LG_RAGEBURST:
req.spiritball = sd->spiritball?sd->spiritball:1;
break;