summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/charcommand.c2
-rw-r--r--src/map/status.c6
3 files changed, 9 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1c2c3be04..bc520c7cb 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/10/11
+ * Using Kaizel in conjunction with Osiris Card should now work. (bugreport:2251) [SketchyPhoenix]
+ * #monsterignore should turn off now. (bugreport:2306) [SketchyPhoenix]
2008/10/09
* Rev. 13272 Updated NPC_REBIRTH. Has it's own values, and no longer leeches off SL_KAIZEL. [L0ne_W0lf]
2008/10/06
diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index eb571277e..b38f1611f 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -3314,7 +3314,7 @@ int charcommand_monsterignore(const int fd, struct map_session_data* sd, const c
if (fd != pl_sd->fd)
clif_displaymessage(pl_sd->fd, "Target player is now immune to attacks.");
} else {
- sd->state.monster_ignore = 0;
+ pl_sd->state.monster_ignore = 0;
clif_displaymessage(sd->fd, "You are no longer immune to attacks.");
if (fd != pl_sd->fd)
clif_displaymessage(pl_sd->fd, "Target player is no longer immune to attacks.");
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);