summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-20 11:27:50 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-20 11:27:50 +0000
commit27ef6a1440b8803a6204e5bc6b627f403be5717e (patch)
tree896c542f847959a15e4f40a65d4ecada0e71b8bd /src/map/unit.c
parent408f4d9391dc280c1ac1b0fdfaa0be33f6d27d25 (diff)
downloadhercules-27ef6a1440b8803a6204e5bc6b627f403be5717e.tar.gz
hercules-27ef6a1440b8803a6204e5bc6b627f403be5717e.tar.bz2
hercules-27ef6a1440b8803a6204e5bc6b627f403be5717e.tar.xz
hercules-27ef6a1440b8803a6204e5bc6b627f403be5717e.zip
Fixed bugreport:5619 MO_EXTREMITYFIST should now consume all spirit sphere.
Fixed bugreport:5632 SR_FALLENEMPIRE should now chain with SR_GATEOFHELL and SR_TIGERCANNON and add bonus damage. Update SR_GATEOFHELL damage formula where sp has now contribution with the damage. Fixed wrong displayed status mdef. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16131 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 320a66bf7..b881a3469 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1196,6 +1196,13 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
casttime = 0;
temp = 1;
break;
+ case SR_GATEOFHELL:
+ case SR_TIGERCANNON:
+ if (sc && sc->data[SC_COMBO] &&
+ sc->data[SC_COMBO]->val1 == SR_FALLENEMPIRE)
+ casttime = 0;
+ temp = 1;
+ break;
case SA_SPELLBREAKER:
temp = 1;
break;