diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-30 13:54:49 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-30 13:54:49 +0000 |
| commit | c383a6150feccfa618de9516d96d66ad168eeb1c (patch) | |
| tree | a1a01bf3f0139b9d7e039cde9f5a996328d9006a | |
| parent | db1b2e403f6258aa3afbce0ad5359ffd0ab708a9 (diff) | |
| download | hercules-c383a6150feccfa618de9516d96d66ad168eeb1c.tar.gz hercules-c383a6150feccfa618de9516d96d66ad168eeb1c.tar.bz2 hercules-c383a6150feccfa618de9516d96d66ad168eeb1c.tar.xz hercules-c383a6150feccfa618de9516d96d66ad168eeb1c.zip | |
* Fixed gemstones are still required when players equipped Mistress Card. (bugreport:3147, follow up to: r13815)
* Fiberlock only catches targets the moment its casted. (bugreport:3136)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13829 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ce80a0a86..8407644d0 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. 09/05/30 + * Fixed gemstones are still required when players equipped Mistress Card. (bugreport:3147, follow up to: r13815) [Inkfish] + * Fiberlock only catches targets the moment its casted. [Inkfish] * Multiple autocasts can go off at a time now. [Inkfish] * Splash damage doesn't get modified by percentual modifier now. [Inkfish] * Monster's Spiral Pierce is again...elemental. [Inkfish] diff --git a/src/map/skill.c b/src/map/skill.c index fd8e4d5ba..a504bf22c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7416,6 +7416,11 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns break; case UNT_SPIDERWEB: + if( DIFF_TICK(tick, sg->tick) > SKILLUNITTIMER_INTERVAL ) + { // Visual effect stays but can't catch anyone anymore. [Inkfish] + sg->interval = -1; + break; + } if( tsc && tsc->data[SC_SPIDERWEB] && tsc->data[SC_SPIDERWEB]->val1 > 0 ) { // If you are fiberlocked and can't move, it will only increase your fireweakness level. [Inkfish] tsc->data[SC_SPIDERWEB]->val2++; @@ -8798,12 +8803,12 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, short if( sd->special_state.no_gemstone ) { //Make it substract 1 gem rather than skipping the cost. if( --req.amount[i] < 1 ) - continue; + req.itemid[i] = 0; } if(sc && sc->data[SC_INTOABYSS]) { if( skill != SA_ABRACADABRA ) - continue; + req.itemid[i] = req.amount[i] = 0; else if( --req.amount[i] < 1 ) req.amount[i] = 1; // Hocus Pocus allways use at least 1 gem } |