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

Follow up to 9db667c (BSS fixed)

Browse Source 
* Simplified the check (no need to check for ensemble and Adoramus separately)
* Fixed PR_BENEDICTIO not working at all
* Fixed chorus skills and WZ_COMET only counting to 1 rather than MAX_PARTY
This commit is contained in:
Playtester 2016-01-17 20:59:26 +01:00
parent 6ebcb67601
commit 5d7d994ca0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/map/skill.c
View File

@ -14168,15 +14168,13 @@ int skill_check_condition_char_sub (struct block_list *bl, va_list ap)
skill_id = va_arg(ap,int); skill_id = va_arg(ap,int);
inf2 = skill_get_inf2(skill_id); inf2 = skill_get_inf2(skill_id);
if (skill_id == PR_BENEDICTIO && *c >= 2) // Check for two companions for Benedictio. [Skotlex] if (skill_id == PR_BENEDICTIO)
if(*c >= 2) // Check for two companions for Benedictio. [Skotlex]
return 0; return 0;
else if (skill_id == AB_ADORAMUS && *c >= 1) // Check for a partner for Adoramus. else if ((inf2&INF2_CHORUS_SKILL || skill_id == WL_COMET))
if(*c == MAX_PARTY) // Check for partners for Chorus or Comet; Cap if the entire party is accounted for.
return 0; return 0;
else if (inf2&INF2_ENSEMBLE_SKILL && *c >= 1) // Check for a partner for ensembles. else if (*c >= 1) // Check for one companion for all other cases.
return 0;
else if ((inf2&INF2_CHORUS_SKILL || skill_id == WL_COMET) && *c == MAX_PARTY) // Check for partners for Chorus or Comet; Cap if the entire party is accounted for.
return 0;
else if (*c >= 1) // Check for all other cases.
return 0; return 0;
if (bl == src) if (bl == src)