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

- Combo-used Skills with State "move_enable" will now override the "can't move delay". Fixes Break-Fall -> Jump-Kick.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7260 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-06-19 23:57:09 +00:00
parent 2d5518fb08
commit fb0d6c2d3d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/06/19 2006/06/19
* Combo-used Skills with State "move_enable" will now override the "can't
move delay". Fixes Break-Fall -> Jump-Kick. [Skotlex]
* Some more cleanups of battle_calc_damage to account for absorbed damage * Some more cleanups of battle_calc_damage to account for absorbed damage
reductions. [Skotlex] reductions. [Skotlex]
* Moved back Soul Drain code from mob_dead to skill_counter_additional_effect. * Moved back Soul Drain code from mob_dead to skill_counter_additional_effect.

9
src/map/skill.c
View File

@ -8020,8 +8020,13 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
} }
break; break;
case ST_MOVE_ENABLE: case ST_MOVE_ENABLE:
//Check only on begin casting. [Skotlex] if(type)//Check only on begin casting. [Skotlex]
if(!type && !unit_can_move(&sd->bl)) { break;
if (sc && sc->data[SC_COMBO].timer != -1 && sc->data[SC_COMBO].val1 == skill)
sd->ud.canmove_tick = gettick(); //When using a combo, cancel the can't move delay to enable the skill. [Skotlex]
if (!unit_can_move(&sd->bl)) {
clif_skill_fail(sd,skill,0,0); clif_skill_fail(sd,skill,0,0);
return 0; return 0;
} }