diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-15 21:24:57 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-15 21:24:57 +0000 |
| commit | f996ce97b548a4919e3ecbf930279ed7e0214e47 (patch) | |
| tree | a312267da2965c811dfe064e6c41ebfa04b337a3 | |
| parent | 2f2066f741111325b2510c6526b41b22dea93370 (diff) | |
| download | hercules-f996ce97b548a4919e3ecbf930279ed7e0214e47.tar.gz hercules-f996ce97b548a4919e3ecbf930279ed7e0214e47.tar.bz2 hercules-f996ce97b548a4919e3ecbf930279ed7e0214e47.tar.xz hercules-f996ce97b548a4919e3ecbf930279ed7e0214e47.zip | |
- Added blocking of the Kick skills when you are a Soul Linker.
- Added enabling to turn off a kick-stance regardless of class.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7187 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e22a780bf..8146ab25b 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/06/15
+ * Added blocking of the Kick skills when you are a Soul Linker. [Skotlex]
+ * Added enabling to turn off a kick-stance regardless of class. [Skotlex]
* Altered a bit how status_set_viewdata behaves in regards to Wedding/Xmas
options. [Skotlex]
* Added back OPTION_XMAS, but the actual value is missing! [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c index 5338768ec..2db04b974 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7678,6 +7678,8 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t case TK_READYDOWN: case TK_READYSTORM: case TK_READYTURN: + if(sc && sc->data[SkillStatusChangeTable(skill)].timer!=-1) + return 1; //Enable disabling them regardless of who you are. case TK_JUMPKICK: if ((sd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) { //They do not work on Soul Linkers. @@ -7690,6 +7692,8 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t case TK_STORMKICK: case TK_DOWNKICK: case TK_COUNTER: + if ((sd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) + return 0; //Anti-Soul Linker check in case you job-changed with Stances active. if(!sc || sc->data[SC_COMBO].timer == -1) return 0; //Combo needs to be ready if (pc_famerank(sd->char_id,MAPID_TAEKWON)) |