summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-05 01:00:16 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-05 01:00:16 +0000
commit98a0377169df866a6a8b46412b5fde17ca672527 (patch)
treeeda9952012c8d0da59c87f8fb1f0f636a727beb4 /src
parent95e2157804907751cfaaab0acfcebdca345a8b01 (diff)
downloadhercules-98a0377169df866a6a8b46412b5fde17ca672527.tar.gz
hercules-98a0377169df866a6a8b46412b5fde17ca672527.tar.bz2
hercules-98a0377169df866a6a8b46412b5fde17ca672527.tar.xz
hercules-98a0377169df866a6a8b46412b5fde17ca672527.zip
* Completed the code for SC_LIFEINSURANCE and it's status icon.
- Added the summer_ignorepalette to client.conf. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11359 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c5
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/skill.c3
-rw-r--r--src/map/status.c2
4 files changed, 7 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 6331a6201..198220e5d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11360,7 +11360,6 @@ void clif_parse_HomMenu(int fd, struct map_session_data *sd)
merc_menu(sd,RFIFOB(fd,packet_db[sd->packet_ver][cmd].pos[0]));
}
-// [Zephyrus Code Modifications]
void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
{
int item_position;
@@ -11372,8 +11371,8 @@ void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
return;
if (!status_revive(&sd->bl, 100, 100))
- return;
-
+ return;
+
clif_skill_nodamage(&sd->bl,&sd->bl,ALL_RESURRECTION,4,1);
pc_delitem(sd, item_position, 1, 0);
}
diff --git a/src/map/pc.c b/src/map/pc.c
index bf999950e..9acfd92a3 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5071,7 +5071,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
if(battle_config.death_penalty_type && sd->state.snovice_dead_flag != 1
&& (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE // only novices will receive no penalty
&& !map[sd->bl.m].flag.noexppenalty && !map_flag_gvg(sd->bl.m)
- && sd->sc.data[SC_BABY].timer == -1)
+ && sd->sc.data[SC_BABY].timer == -1 && sd->sc.data[SC_LIFEINSURANCE].timer == -1)
{
unsigned int base_penalty =0;
if (battle_config.death_penalty_base > 0) {
diff --git a/src/map/skill.c b/src/map/skill.c
index 3784e04d1..f941d5b8e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4824,7 +4824,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case SC_CARTBOOST: case SC_MELTDOWN: case SC_SAFETYWALL:
case SC_SMA: case SC_SPEEDUP0: case SC_NOCHAT:
case SC_ANKLE: case SC_SPIDERWEB: case SC_JAILED:
- case SC_ITEMBOOST: case SC_EXPBOOST: // [ConvexMirror and FieldGuide]
+ case SC_ITEMBOOST: case SC_EXPBOOST: case SC_LIFEINSURANCE:
+ case SC_BOSSMAPINFO:
continue;
}
if(i==SC_BERSERK) tsc->data[i].val2=0; //Mark a dispelled berserk to avoid setting hp to 100 by setting hp penalty to 0.
diff --git a/src/map/status.c b/src/map/status.c
index 0f44a5b7f..69c4b5053 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -454,6 +454,8 @@ void initChangeTables(void)
//Cash Items
StatusIconChangeTable[SC_EXPBOOST] = SI_EXPBOOST;
StatusIconChangeTable[SC_ITEMBOOST] = SI_ITEMBOOST;
+ StatusIconChangeTable[SC_LIFEINSURANCE] = SI_LIFEINSURANCE;
+ StatusIconChangeTable[SC_BOSSMAPINFO] = SI_BOSSMAPINFO;
//Other SC which are not necessarily associated to skills.
StatusChangeFlagTable[SC_ASPDPOTION0] = SCB_ASPD;