summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-21 18:52:29 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-21 18:52:29 +0000
commit20021b23572611b0179ca63678de011af07db54f (patch)
tree9b48b3b199d480abe0278ddd6fb0425efadbb842 /src
parentea2de8994c0af02dabc9520d46e3d2799dc144a0 (diff)
downloadhercules-20021b23572611b0179ca63678de011af07db54f.tar.gz
hercules-20021b23572611b0179ca63678de011af07db54f.tar.bz2
hercules-20021b23572611b0179ca63678de011af07db54f.tar.xz
hercules-20021b23572611b0179ca63678de011af07db54f.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@706 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 21c5bd954..b5f5d072e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7414,9 +7414,8 @@ int skill_delayfix( struct block_list *bl, int time )
nullpo_retr(0, bl);
sc_data = battle_get_sc_data(bl);
- if(time<=0)
- return ( battle_get_adelay(bl) / 2 );
-
+/* if(time<=0)
+ return ( battle_get_adelay(bl) / 2 );*/
if(bl->type == BL_PC) {
if( battle_config.delay_dependon_dex ) /* dexの影響を計算する */
@@ -7751,6 +7750,11 @@ int skill_use_id( struct map_session_data *sd, int target_id,
if( casttime<=0 ) /* 詠唱の無いものはキャンセルされない */
sd->state.skillcastcancel=0;
+ // instant cast attack skills depend on aspd as delay [celest]
+ if (delay <= 0 && skill_db[skill_num].skill_type == BF_WEAPON) {
+ delay = (battle_get_adelay (&sd->bl)/2) * battle_config.delay_rate / 100;
+ }
+
sd->skilltarget = target_id;
/* sd->cast_target_bl = bl; */
sd->skillx = 0;
@@ -7892,6 +7896,11 @@ int skill_use_pos( struct map_session_data *sd,
if( casttime<=0 ) /* 詠唱の無いものはキャンセルされない */
sd->state.skillcastcancel=0;
+ // instant cast attack skills depend on aspd as delay [celest]
+ if (delay <= 0 && skill_db[skill_num].skill_type == BF_WEAPON) {
+ delay = (battle_get_adelay (&sd->bl)/2) * battle_config.delay_rate / 100;
+ }
+
sd->skilltarget = 0;
/* sd->cast_target_bl = NULL; */
tick=gettick();