Fixed bug with abracadabra self skills not working, bugreport:5310

Also fixed magnificat's non-mado condition

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15566 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-02-11 19:43:24 +00:00
parent 70352fc918
commit 9606f84787
2 changed files with 3 additions and 1 deletions

View File

@ -446,7 +446,8 @@ int skillnotok (int skillid, struct map_session_data *sd)
// This code will compare the player's attack motion value which is influenced by ASPD before
// allowing a skill to be cast. This is to prevent no-delay ACT files from spamming skills such as
// AC_DOUBLE which do not have a skill delay and are not regarded in terms of attack motion.
if( sd->canskill_tick && DIFF_TICK(gettick(), sd->canskill_tick) < (sd->battle_status.amotion * (100 + battle_config.skill_amotion_leniency) / 100) )
if( sd->skillitem != skillid && sd->canskill_tick &&
DIFF_TICK(gettick(), sd->canskill_tick) < (sd->battle_status.amotion * (100 + battle_config.skill_amotion_leniency) / 100) )
{// attempted to cast a skill before the attack motion has finished
return 1;
}

View File

@ -5568,6 +5568,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
break;
case SC_MAGNIFICAT:
if( sc->option&OPTION_MADOGEAR ) //Mado is immune to magnificat
return 0;
break;
case SC_ONEHAND:
case SC_MERC_QUICKEN: