diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | conf/battle/client.conf | 4 | ||||
| -rw-r--r-- | db/item_db.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 5 | ||||
| -rw-r--r-- | src/map/pc.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
7 files changed, 14 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f900a2319..430ceeb43 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/10/04 + * Completed the SC_LIFEINSURANCE status and it's status icon. [Zephyrus] + - Updated Item_db.txt. * Added SC_EXPBOOST (Field Manual), SC_ITEMBOOST (Bubble Gum) to const.txt. Allready working [Zephyrus] - Added SC_LIFEINSURANCE and SC_BOSSMAPINFO (not implemented) diff --git a/conf/battle/client.conf b/conf/battle/client.conf index a0fb3309e..3d0a9923e 100644 --- a/conf/battle/client.conf +++ b/conf/battle/client.conf @@ -99,6 +99,10 @@ wedding_ignorepalette: no // Set this to yes if your cloth palettes pack doesn't has Xmas palettes (or has less than the other jobs) xmas_ignorepalette: no +// Do not display cloth colors for the Summer class? +// Set this to yes if your cloth palettes pack doesn't has Summer palettes (or has less than the other jobs) +summer_ignorepalette: no + // Set this to 1 if your clients have langtype problems and can't display motd properly motd_type: 0 diff --git a/db/item_db.txt b/db/item_db.txt index 6bf117a42..b90a8effb 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -3259,7 +3259,7 @@ 12206,LUK_Dish,Cooked_Nine_Tail,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood,1800000, 10; percentheal 15,5; },{},{} 12207,VIT_Dish,Immortal_Stew,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood,1800000, 10; percentheal 15,5; },{},{} 12208,Battle_Manual,Battle Manual,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50;},{},{} -12209,Insurance,Life Insurance,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_BABY,1800000,0; },{},{} +12209,Insurance,Life Insurance,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFEINSURANCE,1800000,0; },{},{} 12210,Bubble_Gum,Bubble Gum,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,0;},{},{} 12211,Kafra_Card,Kafra Card,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashStore"; },{},{} 12212,Giant_Fly_Wing,Giant Fly Wing,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashPartyCall"; },{},{} 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; |