From b8b2214648b6408c15cd9018a05a6dc63de45535 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 1 May 2006 05:01:15 +0000 Subject: - Skills with the move_enable state won't get the walkdelay increased on a skill-cast. - Changed TK_RUN's state from none to move_enable. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6425 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ db/Changelog.txt | 1 + db/skill_require_db.txt | 2 +- src/map/skill.c | 4 +++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 4d0fc8e1f..426c2b2ff 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -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. 2006/04/30 + * Skills with the move_enable state won't get the walkdelay increased on a + skill-cast. [Skotlex] * Some corrections in the clif_parse_whisper function which should fix crashes in the chat_log under "certain" conditions. [Skotlex] * Fixed dangling pointer in pc_steal_item (missing lines) causing crash. [Lance] diff --git a/db/Changelog.txt b/db/Changelog.txt index 416951389..01551c496 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -27,6 +27,7 @@ ========================= 04/30 + * Changed TK_RUN's state from none to move_enable. [Skotlex] * Added Hellion Revenant [Playtester] - his skills are still missing * Changed chance of Demon Pungus Card and Killer Mantis Card to 10% [Playtester] diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt index 605868ba4..80cee4043 100644 --- a/db/skill_require_db.txt +++ b/db/skill_require_db.txt @@ -311,7 +311,7 @@ 408,0,0,1,0,-10,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_BABY## 409,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT## 410,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY## -411,0,0,100:90:80:70:60:50:40:30:20:10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //TK_RUN +411,0,0,100:90:80:70:60:50:40:30:20:10,0,0,0,99,0,0,move_enable,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //TK_RUN 412,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //TK_READYSTORM 413,0,0,14:12:10:8:6:4:2,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //TK_STORMKICK 414,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //TK_READYDOWN diff --git a/src/map/skill.c b/src/map/skill.c index 302505997..ac0a64acf 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5751,7 +5751,9 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data ) ud->canact_tick = tick; else 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); + + 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); 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", -- cgit v1.2.3-70-g09d2