diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-03 00:45:49 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-03 00:45:49 +0000 |
commit | 2e7bb26c3929e79a1b8a5748f2413e6cb0b7dccf (patch) | |
tree | 38ea0fe957c97c2e225e539fef90a683675d4a97 | |
parent | 8ba5f3a15f084a5fe168ccf597884d5e47265e3b (diff) | |
download | hercules-2e7bb26c3929e79a1b8a5748f2413e6cb0b7dccf.tar.gz hercules-2e7bb26c3929e79a1b8a5748f2413e6cb0b7dccf.tar.bz2 hercules-2e7bb26c3929e79a1b8a5748f2413e6cb0b7dccf.tar.xz hercules-2e7bb26c3929e79a1b8a5748f2413e6cb0b7dccf.zip |
- Updated the way SC_SILENCE works. From what I remember (from previous forum discussions) it: 1- Always blocks skills from being used. 2- Will only block a skill when the cast-bar ends IF the skill is targetted. If anyone wants to debate to get this changed, make an appropiate forum topic in the svn development area to discuss.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8083 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
-rw-r--r-- | src/map/status.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5c50bdfbb..63cc62e85 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,11 @@ 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/08/02
+ * Updated the way SC_SILENCE works. From what I remember (from previous
+ forum discussions) it: 1- Always blocks skills from being used. 2- Will
+ only block a skill when the cast-bar ends IF the skill is targetted. If
+ anyone wants to debate to get this changed, make an appropiate forum topic
+ in the svn development area to discuss. [Skotlex]
* Added a check in the walking code when triggering skills.
NPC_SELFDESTRUCTION will no longer cancel walking, it will instead resend
the walk packet, this effectively causes the mob to start walking
diff --git a/src/map/status.c b/src/map/status.c index feb497d7a..b334275e8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -964,9 +964,8 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int )) return 0; - if (flag != 2 && ( //Those that block begin/end casting. - sc->data[SC_SILENCE].timer != -1 - )) + //Silence is a special, but weird, case. It prevents skill begin, and skill end only when there's a target. [Skotlex] + if(sc->data[SC_SILENCE].timer != -1 && flag <= (target?1:0)) return 0; //Skill blocking. |