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

- Fixed Dancers/Bards being able to use normal attacks while performing.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8245 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-08-12 02:00:52 +00:00
parent 155f9c12f5
commit c39d3b2a02
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/11
* Fixed Dancers/Bards being able to use normal attacks while performing.
[Skotlex]
2006/08/10
* Fixed the item group bonus not working. [Skotlex]
* Fixed songs/dances always being considered overlapped with themselves.

32
src/map/status.c
View File

@ -954,6 +954,23 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
default: return 0;
}
}
if (sc->data[SC_DANCING].timer != -1 && flag!=2)
{
if(sc->data[SC_LONGING].timer != -1)
{ //Allow everything except dancing/re-dancing. [Skotlex]
if (skill_num == BD_ENCORE ||
skill_get_inf2(skill_num)&(INF2_SONG_DANCE|INF2_ENSEMBLE_SKILL)
)
return 0;
} else
if (skill_num != BD_ADAPTATION && skill_num != CG_LONGINGFREEDOM
&& skill_num != BA_MUSICALSTRIKE && skill_num != DC_THROWARROW)
return 0;
if (sc->data[SC_DANCING].val1 == CG_HERMODE && skill_num == BD_ADAPTATION)
return 0; //Can't amp out of Wand of Hermode :/ [Skotlex]
}
if (skill_num && //Do not block item-casted skills.
(src->type != BL_PC || ((TBL_PC*)src)->skillitem != skill_num)
) { //Skills blocked through status changes...
@ -975,21 +992,6 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
)
return 0;
if (flag!=2 && sc->data[SC_DANCING].timer != -1)
{
if(sc->data[SC_LONGING].timer != -1)
{ //Allow everything except dancing/re-dancing. [Skotlex]
if (skill_num == BD_ENCORE ||
skill_get_inf2(skill_num)&(INF2_SONG_DANCE|INF2_ENSEMBLE_SKILL)
)
return 0;
} else
if (skill_num != BD_ADAPTATION && skill_num != CG_LONGINGFREEDOM
&& skill_num != BA_MUSICALSTRIKE && skill_num != DC_THROWARROW)
return 0;
if (sc->data[SC_DANCING].val1 == CG_HERMODE && skill_num == BD_ADAPTATION)
return 0; //Can't amp out of Wand of Hermode :/ [Skotlex]
}
}
}