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

Cleaned up Joint Beat behavior (#4123)

Browse Source 
* Fixes #4122.
* Added missing rate and duration reduction based on the targets stats.
* Confirmed that double damage only applies to BREAK_NECK.
* Cleaned up skill to remove jb_flag from status_change struct.
Thanks to @mrjnumber1!
This commit is contained in:
Aleos
2019-07-17 09:28:24 -04:00
committed by GitHub
parent 2ca417b61f
commit cb2c553f34
4 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/map/skill.cpp
View File

@@ -1511,13 +1511,6 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
sc_start2(src,bl, SC_BLEEDING,50, skill_lv, src->id, skill_get_time2(skill_id,skill_lv));
break;
case LK_JOINTBEAT:
status = status_skill2sc(skill_id);
if (tsc->jb_flag) {
sc_start4(src,bl,status,(5*skill_lv+5),skill_lv,tsc->jb_flag&BREAK_FLAGS,src->id,0,skill_get_time2(skill_id,skill_lv));
tsc->jb_flag = 0;
}
break;
case ASC_METEORASSAULT:
//Any enemies hit by this skill will receive Stun, Darkness, or external bleeding status ailment with a 5%+5*skill_lv% chance.
switch(rnd()%3) {
@@ -4778,19 +4771,12 @@ 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|SD_ANIMATION);
break;
case LK_JOINTBEAT: // decide the ailment first (affects attack damage and effect)
switch( rnd()%6 ){
case 0: flag |= BREAK_ANKLE; break;
case 1: flag |= BREAK_WRIST; break;
case 2: flag |= BREAK_KNEE; break;
case 3: flag |= BREAK_SHOULDER; break;
case 4: flag |= BREAK_WAIST; break;
case 5: flag |= BREAK_NECK; break;
}
//TODO: is there really no cleaner way to do this?
sc = status_get_sc(bl);
if (sc) sc->jb_flag = flag;
skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
case LK_JOINTBEAT:
flag = 1 << rnd() % 6;
if (flag != BREAK_NECK && tsc && tsc->data[status_skill2sc(skill_id)]->val2 & BREAK_NECK)
flag = BREAK_NECK; // Target should always receive double damage if neck is already broken
if (skill_attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag))
sc_start4(src, bl, status_skill2sc(skill_id), 50 + (skill_lv + 1), skill_lv, flag&BREAK_FLAGS, src->id, 0, skill_get_time2(skill_id, skill_lv));
break;
case MO_COMBOFINISH: