|
@@ -14047,11 +14047,6 @@ int skill_check_condition_char_sub (struct block_list *bl, va_list ap)
|
|
|
if( ( sd->class_&MAPID_THIRDMASK ) == MAPID_WARLOCK )
|
|
|
p_sd[(*c)++] = tsd->bl.id;
|
|
|
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]
|
|
|
{
|
|
|
uint16 skill_lv;
|
|
@@ -14843,21 +14838,15 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
|
|
|
}
|
|
|
break;
|
|
|
case LG_RAYOFGENESIS:
|
|
|
- if( sc && sc->data[SC_INSPIRATION] )
|
|
|
- return true; // Don't check for partner.
|
|
|
- if( !(sc && sc->data[SC_BANDING]) ) {
|
|
|
- clif_skill_fail(sd,skill_id,USESKILL_FAIL,0);
|
|
|
- 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);
|
|
|
+ if (sc && sc->data[SC_INSPIRATION])
|
|
|
+ return true; // Don't check for partner.
|
|
|
+ if (!(sc && sc->data[SC_BANDING])) {
|
|
|
+ clif_skill_fail(sd,skill_id,USESKILL_FAIL,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;
|
|
|
case SR_FALLENEMPIRE:
|
|
|
if( !(sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_DRAGONCOMBO) )
|