diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-17 14:23:00 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-17 14:23:00 +0000 |
| commit | 300c03ec02aadbe88ecfe51b4c021a49b98e3533 (patch) | |
| tree | be004fac786ca0c47f4160956442cf8d7698a4a3 | |
| parent | 2f8233776962eea2f00dc726ecd78f2777c65ebb (diff) | |
| download | hercules-300c03ec02aadbe88ecfe51b4c021a49b98e3533.tar.gz hercules-300c03ec02aadbe88ecfe51b4c021a49b98e3533.tar.bz2 hercules-300c03ec02aadbe88ecfe51b4c021a49b98e3533.tar.xz hercules-300c03ec02aadbe88ecfe51b4c021a49b98e3533.zip | |
- Added check to clear previous skill when combo time ends. Should fix TK Rankers being unable to initiate a combo with the same kick their previous combo was finished with.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6630 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/status.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 40543b80c..6efcdb755 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ 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/05/17
+ * Added check to clear previous skill when combo time ends. Should fix TK
+ Rankers being unable to initiate a combo with the same kick their previous
+ combo was finished with. [Skotlex]
* Power Up and Agi Up now increase Hit/Flee by 20%/lv [Skotlex]
2006/05/16
* Modified "hide woe damage" to send the number of hits rather than 1 as
diff --git a/src/map/status.c b/src/map/status.c index 0c4516bc7..b113cfa21 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5254,7 +5254,10 @@ int status_change_end( struct block_list* bl , int type,int tid ) sc->data[type].val4=-1;
}
break;
-
+ case SC_COMBO: //Clear last used skill when it is part of a combo.
+ if (sd && sd->skillid_old == sc->data[type].val1)
+ sd->skillid_old = sd->skilllv_old = 0;
+ break;
//gs_something2 [Vicious]
case SC_MADNESSCANCEL:
case SC_ADJUSTMENT:
|