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

Fixes #804

Browse Source 
* Corrected Hesperus Lit and Ray of Genesis Banding check.
This commit is contained in:
aleos89 2015-12-07 16:53:53 -05:00
parent f7f1ec0769
commit 2e2e1abdc8
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/map/skill.c
View File

@ -14047,11 +14047,6 @@ int skill_check_condition_char_sub (struct block_list *bl, va_list ap)
if( ( sd->class_&MAPID_THIRDMASK ) == MAPID_WARLOCK ) if( ( sd->class_&MAPID_THIRDMASK ) == MAPID_WARLOCK )
p_sd[(*c)++] = tsd->bl.id; p_sd[(*c)++] = tsd->bl.id;
return 1; return 1;
case LG_RAYOFGENESIS:
if( tsd->status.party_id == sd->status.party_id && (tsd->class_&MAPID_THIRDMASK) == MAPID_ROYAL_GUARD &&
tsd->sc.data[SC_BANDING] )
p_sd[(*c)++] = tsd->bl.id;
return 1;
default: //Warning: Assuming Ensemble Dance/Songs for code speed. [Skotlex] default: //Warning: Assuming Ensemble Dance/Songs for code speed. [Skotlex]
{ {
uint16 skill_lv; uint16 skill_lv;
@ -14843,21 +14838,15 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
} }
break; break;
case LG_RAYOFGENESIS: case LG_RAYOFGENESIS:
if( sc && sc->data[SC_INSPIRATION] ) case LG_HESPERUSLIT:
return true; // Don't check for partner. if (sc && sc->data[SC_INSPIRATION])
if( !(sc && sc->data[SC_BANDING]) ) { return true; // Don't check for partner.
if (!(sc && sc->data[SC_BANDING])) {
clif_skill_fail(sd,skill_id,USESKILL_FAIL,0); clif_skill_fail(sd,skill_id,USESKILL_FAIL,0);
return false; return false;
} else if( skill_check_pc_partner(sd,skill_id,&skill_lv,skill_get_range(skill_id,skill_lv),0) < 1 )
return false; // Just fails, no msg here.
break;
case LG_HESPERUSLIT:
if( sc && sc->data[SC_INSPIRATION] )
return true;
if( sc && sc->data[SC_BANDING] && sc->data[SC_BANDING]->val2 < 3 ) {
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
return false;
} }
if (sc->data[SC_BANDING] && sc->data[SC_BANDING]->val2 < (skill_id == LG_RAYOFGENESIS ? 2 : 3))
return false; // Just fails, no msg here.
break; break;
case SR_FALLENEMPIRE: case SR_FALLENEMPIRE:
if( !(sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_DRAGONCOMBO) ) if( !(sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_DRAGONCOMBO) )