summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-22 07:53:00 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-22 07:53:00 +0000
commit2cd66774fc58fa3fb32084637a7044c60bb859e9 (patch)
tree1bd641ebc640a56006023acce8eca40665b59668
parentcaaaf899dc7e440ecb8f2ab3fb75ea75d95e0f4f (diff)
downloadhercules-2cd66774fc58fa3fb32084637a7044c60bb859e9.tar.gz
hercules-2cd66774fc58fa3fb32084637a7044c60bb859e9.tar.bz2
hercules-2cd66774fc58fa3fb32084637a7044c60bb859e9.tar.xz
hercules-2cd66774fc58fa3fb32084637a7044c60bb859e9.zip
* Added ignore the new skill delays when chaining monk combos
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@719 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt3
-rw-r--r--src/map/clif.c20
2 files changed, 21 insertions, 2 deletions
diff --git a/Changelog.txt b/Changelog.txt
index f64ed5caa..6a6ef766f 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,7 @@
Date Added
+12/22
+ * Added ignore the new skill delays when chaining monk combos [celest]
+
12/21
* Added #zeny, removed @charzeny [MC Cameri]
* Since conf/maps_list.txt was removed, added conf/maps_athena.conf [Ajarn]
diff --git a/src/map/clif.c b/src/map/clif.c
index ffa3acd9d..088d841ae 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8704,7 +8704,15 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) {
if (sd->skilltimer != -1) {
if (skillnum != SA_CASTCANCEL)
return;
- } else if (DIFF_TICK(tick, sd->canact_tick) < 0) {
+ } else if (DIFF_TICK(tick, sd->canact_tick) < 0 &&
+ // allow monk combos to ignore this delay [celest]
+ !(sd->sc_count && sd->sc_data[SC_COMBO].timer!=-1 &&
+ (skillnum == MO_EXTREMITYFIST ||
+ skillnum == MO_CHAINCOMBO ||
+ skillnum == MO_COMBOFINISH ||
+ skillnum == CH_PALMSTRIKE ||
+ skillnum == CH_TIGERFIST ||
+ skillnum == CH_CHAINCRUSH))) {
clif_skill_fail(sd, skillnum, 4, 0);
return;
}
@@ -8846,7 +8854,15 @@ void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd) {
if (sd->skilltimer != -1)
return;
- else if (DIFF_TICK(tick, sd->canact_tick) < 0) {
+ else if (DIFF_TICK(tick, sd->canact_tick) < 0 &&
+ // allow monk combos to ignore this delay [celest]
+ !(sd->sc_count && sd->sc_data[SC_COMBO].timer!=-1 &&
+ (skillnum == MO_EXTREMITYFIST ||
+ skillnum == MO_CHAINCOMBO ||
+ skillnum == MO_COMBOFINISH ||
+ skillnum == CH_PALMSTRIKE ||
+ skillnum == CH_TIGERFIST ||
+ skillnum == CH_CHAINCRUSH))) {
clif_skill_fail(sd, skillnum, 4, 0);
return;
}