summaryrefslogtreecommitdiff
path: root/src/map/status.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/status.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/status.c')
-rw-r--r--src/map/status.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 2d777a7ec..b375a5240 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -7156,6 +7156,8 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
struct unit_data *ud = unit_bl2ud(bl);
if (ud && !val3) {
tick += 300 * battle_config.combo_delay_rate/100;
+ if(val1 == SR_FALLENEMPIRE)//TODO: better option for this bonus. [malufett]
+ tick += 1000;
ud->attackabletime = gettick()+tick;
unit_set_walkdelay(bl, gettick(), tick, 1);
}
@@ -8239,6 +8241,12 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
if (sd && pc_checkskill(sd, SR_DRAGONCOMBO) > 0)
clif_skillinfo(sd,SR_DRAGONCOMBO, INF_SELF_SKILL);
break;
+ case SR_FALLENEMPIRE:
+ if (sd){
+ clif_skillinfo(sd,SR_GATEOFHELL, INF_SELF_SKILL);
+ clif_skillinfo(sd,SR_TIGERCANNON, INF_SELF_SKILL);
+ }
+ break;
}
break;
case SC_RAISINGDRAGON:
@@ -8618,6 +8626,10 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
if (pc_checkskill(sd, SR_DRAGONCOMBO) > 0)
clif_skillinfo(sd, SR_DRAGONCOMBO, 0);
break;
+ case SR_FALLENEMPIRE:
+ clif_skillinfo(sd, SR_GATEOFHELL, 0);
+ clif_skillinfo(sd, SR_TIGERCANNON, 0);
+ break;
}
break;