diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-13 10:50:37 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-13 10:50:37 +0000 |
| commit | 2ab8c13eaedb8c6d8549da3e6b0692027b1fb537 (patch) | |
| tree | 6ea6aee587390d8d2cfd7127aece2a25bd04a16c /src/map/skill.c | |
| parent | b776775b6a6407f2f09953bc0d3fc2288d09c953 (diff) | |
| download | hercules-2ab8c13eaedb8c6d8549da3e6b0692027b1fb537.tar.gz hercules-2ab8c13eaedb8c6d8549da3e6b0692027b1fb537.tar.bz2 hercules-2ab8c13eaedb8c6d8549da3e6b0692027b1fb537.tar.xz hercules-2ab8c13eaedb8c6d8549da3e6b0692027b1fb537.zip | |
- Again modified the delayfix function to reflect the current skill delay knowledge. Skills with 0 delay use amotion always (regardless of cast times)
- Renamed the config default_skill_delay to default_walk_delay as that is the only thing it does now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11446 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 07952db59..b068a275c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5913,7 +5913,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv); if (skill_get_state(ud->skillid) != ST_MOVE_ENABLE) - unit_set_walkdelay(src, tick, battle_config.default_skill_delay+skill_get_walkdelay(ud->skillid, ud->skilllv), 1); + unit_set_walkdelay(src, tick, battle_config.default_walk_delay+skill_get_walkdelay(ud->skillid, ud->skilllv), 1); if(battle_config.skill_log && battle_config.skill_log&src->type) ShowInfo("Type %d, ID %d skill castend id [id =%d, lv=%d, target ID %d)\n", @@ -6080,7 +6080,7 @@ int skill_castend_pos (int tid, unsigned int tick, int id, int data) src->type, src->id, ud->skillid, ud->skilllv, ud->skillx, ud->skilly); unit_stop_walking(src,1); ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv); - unit_set_walkdelay(src, tick, battle_config.default_skill_delay+skill_get_walkdelay(ud->skillid, ud->skilllv), 1); + unit_set_walkdelay(src, tick, battle_config.default_walk_delay+skill_get_walkdelay(ud->skillid, ud->skilllv), 1); map_freeblock_lock(); skill_castend_pos2(src,ud->skillx,ud->skilly,ud->skillid,ud->skilllv,tick,0); @@ -8868,11 +8868,8 @@ int skill_delayfix (struct block_list *bl, int skill_id, int skill_lv) if (time < 0) time = -time + status_get_amotion(bl); // If set to <0, add to attack motion. else if (time == 0) - time = battle_config.default_skill_delay; // Use default skill delay. + time = status_get_amotion(bl); // Use amotion - if (time < status_get_amotion(bl)) - time = status_get_amotion(bl); // Delay can never be lower than attack motion. - // Delay reductions switch (skill_id) { //Monk combo skills have their delay reduced by agi/dex. |