summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcsnv <ctt@csnv.es>2015-01-03 20:32:08 +0100
committercsnv <ctt@csnv.es>2015-01-03 20:32:08 +0100
commit4e8837d4e53d72bb83eea25285403dabcc129442 (patch)
tree995c5cb664a0f990d7f3438cc2b69468178aa514 /src
parent0cd471b3e4ec92c94e960de4fd5c2a19ad0ee2f9 (diff)
downloadhercules-4e8837d4e53d72bb83eea25285403dabcc129442.tar.gz
hercules-4e8837d4e53d72bb83eea25285403dabcc129442.tar.bz2
hercules-4e8837d4e53d72bb83eea25285403dabcc129442.tar.xz
hercules-4e8837d4e53d72bb83eea25285403dabcc129442.zip
Increased minimum combo time to that of amotion.
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 34689bd9d..ac208a204 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2394,7 +2394,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
break;
} //Switch End
if (combo) { //Possible to chain
- if ( (combo = DIFF_TICK32(sd->ud.canact_tick, tick)) < 50 ) combo = 50;/* less is a waste. */
+ combo = max(status_get_amotion(src), DIFF_TICK32(sd->ud.canact_tick, tick));
sc_start2(NULL,src,SC_COMBOATTACK,100,skill_id,bl->id,combo);
clif->combo_delay(src, combo);
}