diff options
author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-03 02:50:41 +0000 |
---|---|---|
committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-03 02:50:41 +0000 |
commit | 797e2b728c34e2037da494070913bbe2f84a91c2 (patch) | |
tree | 3bf01102da3eb9e33b1f9d52a502dace440fd7b2 /src/map/script.c | |
parent | 424936462f83dc689ae1863cba8b66308b89b416 (diff) | |
download | hercules-797e2b728c34e2037da494070913bbe2f84a91c2.tar.gz hercules-797e2b728c34e2037da494070913bbe2f84a91c2.tar.bz2 hercules-797e2b728c34e2037da494070913bbe2f84a91c2.tar.xz hercules-797e2b728c34e2037da494070913bbe2f84a91c2.zip |
Fixed bugreport:6581 applied balance update to MO_EXTREMITYFIST.
Fixed bugreport:6457 where SR_CURSEDCIRCLE is not remove when target dies.
Fixed bugreport:6535 updated GN_CRAZY_WEED to its official behavior.
Fixed bugreport:6592 added a missing break in Spiral Pierce skillratio at battle.c.
Fixed a faulty skillratio formula of GN_CART_TORNADO. Thanks to Lighta
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16738 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r-- | src/map/script.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c index dfa5cec7f..4e30268d8 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -5350,7 +5350,16 @@ BUILDIN_FUNC(percentheal) sd = script_rid2sd(st); if( sd == NULL ) return 0; +#ifdef RENEWAL + if( sd->sc.data[SC_EXTREMITYFIST] ){ + const struct TimerData *timer; + int tick = skill_get_time2(MO_EXTREMITYFIST, sd->sc.data[SC_EXTREMITYFIST]->val1); + timer = get_timer(sd->sc.data[SC_EXTREMITYFIST]->timer); + if( DIFF_TICK(tick, DIFF_TICK(timer->tick, gettick())) < 10000 )// 10 sec + sp = 0; + } +#endif pc_percentheal(sd,hp,sp); return 0; } |