summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorsketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-11 11:34:28 +0000
committersketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-11 11:34:28 +0000
commit0ae6e181fdc0d7f1fe79fa5baadbeecdd536fd9a (patch)
treea2290ef3dcc371bbe5b2aacbb56908924f140063 /src/map/status.c
parent681578949d8f20791616638ce5a819c598026339 (diff)
downloadhercules-0ae6e181fdc0d7f1fe79fa5baadbeecdd536fd9a.tar.gz
hercules-0ae6e181fdc0d7f1fe79fa5baadbeecdd536fd9a.tar.bz2
hercules-0ae6e181fdc0d7f1fe79fa5baadbeecdd536fd9a.tar.xz
hercules-0ae6e181fdc0d7f1fe79fa5baadbeecdd536fd9a.zip
* Using Kaizel in conjunction with Osiris Card should now work. (bugreport:2251)
* #monsterignore should turn off properly now. (bugreport:2306) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13281 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 34420ef2c..f77f06f95 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -782,7 +782,11 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
if( !(flag&8) && sc && sc->data[SC_KAIZEL] )
{ //flag&8 = disable Kaizel
int time = skill_get_time2(SL_KAIZEL,sc->data[SC_KAIZEL]->val1);
- status_revive(target, sc->data[SC_KAIZEL]->val2, 0);
+ //Look for Osiris Card's bonus effect on the character and revive 100% or revive normally
+ if ( BL_CAST(BL_PC,target)->special_state.restart_full_recover = 1 )
+ status_revive(target, 100, 100);
+ else
+ status_revive(target, sc->data[SC_KAIZEL]->val2, 0);
status_change_clear(target,0);
clif_skill_nodamage(target,target,ALL_RESURRECTION,1,1);
sc_start(target,status_skill2sc(PR_KYRIE),100,10,time);