Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed gemstones are still required when players equipped Mistress Card. (bugreport:3147, follow up to: r13815)

Browse Source 
* Fiberlock only catches targets the moment its casted. (bugreport:3136)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13829 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Inkfish 2009-05-30 13:54:49 +00:00
parent dcb4f2b931
commit 47c650a49a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
09/05/30 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] * Multiple autocasts can go off at a time now. [Inkfish]
* Splash damage doesn't get modified by percentual modifier now. [Inkfish] * Splash damage doesn't get modified by percentual modifier now. [Inkfish]
* Monster's Spiral Pierce is again...elemental. [Inkfish] * Monster's Spiral Pierce is again...elemental. [Inkfish]

9
src/map/skill.c
View File

@ -7416,6 +7416,11 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
break; break;
case UNT_SPIDERWEB: 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( 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] { // If you are fiberlocked and can't move, it will only increase your fireweakness level. [Inkfish]
tsc->data[SC_SPIDERWEB]->val2++; 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 ) if( sd->special_state.no_gemstone )
{ //Make it substract 1 gem rather than skipping the cost. { //Make it substract 1 gem rather than skipping the cost.
if( --req.amount[i] < 1 ) if( --req.amount[i] < 1 )
continue; req.itemid[i] = 0;
} }
if(sc && sc->data[SC_INTOABYSS]) if(sc && sc->data[SC_INTOABYSS])
{ {
if( skill != SA_ABRACADABRA ) if( skill != SA_ABRACADABRA )
continue; req.itemid[i] = req.amount[i] = 0;
else if( --req.amount[i] < 1 ) else if( --req.amount[i] < 1 )
req.amount[i] = 1; // Hocus Pocus allways use at least 1 gem req.amount[i] = 1; // Hocus Pocus allways use at least 1 gem
} }