Merge pull request #1 from HerculesWS/master

Hercules Merge.

15 files changed, 351 insertions, 147 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index c79dee7ee..928d14c22 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4446,10 +4446,10 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 						sd->inventory_data[index] &&
 						sd->inventory_data[index]->type == IT_WEAPON)
 						wd.damage = sd->inventory_data[index]->weight*8/100; //80% of weight
-				} else
-					wd.damage = sstatus->rhw.atk2*8/10; //Else use Atk2
-
-				ATK_ADDRATE(50*skill_lv); //Skill modifier applies to weight only.
+					ATK_ADDRATE(50*skill_lv); //Skill modifier applies to weight only.
+				} else {
+					wd.damage = battle->calc_base_damage2(sstatus, &sstatus->rhw, sc, tstatus->size, sd, 0); //Monsters have no weight and use ATK instead
+				}
 				i = sstatus->str/10;
 				i*=i;
 				ATK_ADD(i); //Add str bonus.
diff --git a/src/map/clif.c b/src/map/clif.c
index f6c2ef4d0..357c4dc6a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -860,9 +860,9 @@ static int clif_setlevel(struct block_list* bl) {
 	}
 	return lv;
 }
-#if PACKETVER < 20091103
 /* for 'packetver < 20091103' 0x78 non-pc-looking unit handling */
 void clif_set_unit_idle2(struct block_list* bl, struct map_session_data *tsd, enum send_target target) {
+#if PACKETVER < 20091103
 	struct map_session_data* sd;
 	struct status_change* sc = status->get_sc(bl);
 	struct view_data* vd = status->get_viewdata(bl);
@@ -907,8 +907,10 @@ void clif_set_unit_idle2(struct block_list* bl, struct map_session_data *tsd, en
 	p.clevel = clif_setlevel(bl);
 	
 	clif->send(&p,sizeof(p),tsd?&tsd->bl:bl,target);
-}
+#else
+	return;
 #endif
+}
 /*==========================================
  * Prepares 'unit standing' packet
  *------------------------------------------*/
@@ -996,9 +998,9 @@ void clif_set_unit_idle(struct block_list* bl, struct map_session_data *tsd, enu
 	}
 	
 }
-#if PACKETVER < 20091103
 /* for 'packetver < 20091103' 0x7c non-pc-looking unit handling */
 void clif_spawn_unit2(struct block_list* bl, enum send_target target) {
+#if PACKETVER < 20091103
 	struct map_session_data* sd;
 	struct status_change* sc = status->get_sc(bl);
 	struct view_data* vd = status->get_viewdata(bl);
@@ -1037,8 +1039,10 @@ void clif_spawn_unit2(struct block_list* bl, enum send_target target) {
 	p.xSize = p.ySize = (sd) ? 5 : 0;
 
 	clif->send(&p,sizeof(p),bl,target);
-}
+#else
+	return;
 #endif
+}
 void clif_spawn_unit(struct block_list* bl, enum send_target target) {
 	struct map_session_data* sd;
 	struct status_change* sc = status->get_sc(bl);
@@ -12186,7 +12190,6 @@ void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd) {
 	party->changeleader(sd, map->id2sd(RFIFOL(fd,2)));
 }
 
-#ifndef PARTY_RECRUIT
 /// Party Booking in KRO [Spiria]
 ///
 
@@ -12194,6 +12197,7 @@ void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd) {
 /// 0802 <level>.W <map id>.W { <job>.W }*6
 void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
 {
+#ifndef PARTY_RECRUIT
 	short level = RFIFOW(fd,2);
 	short mapid = RFIFOW(fd,4);
 	short job[PARTY_BOOKING_JOBS];
@@ -12203,6 +12207,9 @@ void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
 		job[i] = RFIFOB(fd,6+i*2);
 
 	party->booking_register(sd, level, mapid, job);
+#else
+	return;
+#endif
 }
 
 
@@ -12214,12 +12221,16 @@ void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
 ///     2 = already registered
 void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag)
 {
+#ifndef PARTY_RECRUIT
 	int fd = sd->fd;
 
 	WFIFOHEAD(fd,packet_len(0x803));
 	WFIFOW(fd,0) = 0x803;
 	WFIFOW(fd,2) = flag;
 	WFIFOSET(fd,packet_len(0x803));
+#else
+	return;
+#endif
 }
 
 
@@ -12227,6 +12238,7 @@ void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag)
 /// 0804 <level>.W <map id>.W <job>.W <last index>.L <result count>.W
 void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd)
 {
+#ifndef PARTY_RECRUIT
 	short level = RFIFOW(fd,2);
 	short mapid = RFIFOW(fd,4);
 	short job = RFIFOW(fd,6);
@@ -12234,6 +12246,9 @@ void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd)
 	short resultcount = RFIFOW(fd,12);
 
 	party->booking_search(sd, level, mapid, job, lastindex, resultcount);
+#else
+	return;
+#endif
 }
 
 
@@ -12244,6 +12259,7 @@ void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd)
 ///     1 = yes
 void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results, int count, bool more_result)
 {
+#ifndef PARTY_RECRUIT
 	int i, j;
 	int size = sizeof(struct party_booking_ad_info); // structure size (48)
 	struct party_booking_ad_info *pb_ad;
@@ -12263,6 +12279,9 @@ void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results,
 			WFIFOW(fd,i*size+41+j*2) = pb_ad->p_detail.job[j];
 	}
 	WFIFOSET(fd,WFIFOW(fd,2));
+#else
+	return;
+#endif
 }
 
 
@@ -12270,8 +12289,12 @@ void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results,
 /// 0806
 void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
 {
+#ifndef PARTY_RECRUIT
 	if(party->booking_delete(sd))
 		clif->PartyBookingDeleteAck(sd, 0);
+#else
+	return;
+#endif
 }
 
 
@@ -12284,12 +12307,16 @@ void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
 ///     3 = nothing registered
 void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag)
 {
+#ifndef PARTY_RECRUIT
 	int fd = sd->fd;
 
 	WFIFOHEAD(fd,packet_len(0x807));
 	WFIFOW(fd,0) = 0x807;
 	WFIFOW(fd,2) = flag;
 	WFIFOSET(fd,packet_len(0x807));
+#else
+	return;
+#endif
 }
 
 
@@ -12297,6 +12324,7 @@ void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag)
 /// 0808 { <job>.W }*6
 void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
 {
+#ifndef PARTY_RECRUIT
 	short job[PARTY_BOOKING_JOBS];
 	int i;
 
@@ -12304,6 +12332,9 @@ void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
 		job[i] = RFIFOW(fd,2+i*2);
 
 	party->booking_update(sd, job);
+#else
+	return;
+#endif
 }
 
 
@@ -12311,6 +12342,7 @@ void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
 /// 0809 <index>.L <char name>.24B <expire time>.L <level>.W <map id>.W { <job>.W }*6
 void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
 {
+#ifndef PARTY_RECRUIT
 	int i;
 	uint8 buf[38+PARTY_BOOKING_JOBS*2];
 
@@ -12326,6 +12358,9 @@ void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_boo
 		WBUFW(buf,38+i*2) = pb_ad->p_detail.job[i];
 
 	clif->send(buf, packet_len(0x809), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 
@@ -12333,6 +12368,7 @@ void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_boo
 /// 080a <index>.L { <job>.W }*6
 void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
 {
+#ifndef PARTY_RECRUIT
 	int i;
 	uint8 buf[6+PARTY_BOOKING_JOBS*2];
 
@@ -12343,6 +12379,9 @@ void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_boo
 	for(i=0; i<PARTY_BOOKING_JOBS; i++)
 		WBUFW(buf,6+i*2) = pb_ad->p_detail.job[i];
 	clif->send(buf,packet_len(0x80a),&sd->bl,ALL_CLIENT); // Now UPDATE all client.
+#else
+	return;
+#endif
 }
 
 
@@ -12350,26 +12389,33 @@ void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_boo
 /// 080b <index>.L
 void clif_PartyBookingDeleteNotify(struct map_session_data* sd, int index)
 {
+#ifndef PARTY_RECRUIT
 	uint8 buf[6];
 
 	WBUFW(buf,0) = 0x80b;
 	WBUFL(buf,2) = index;
 
 	clif->send(buf, packet_len(0x80b), &sd->bl, ALL_CLIENT); // Now UPDATE all client.
+#else
+	return;
+#endif
 }
 
-#else
 /// Modified version of Party Booking System for 2012-04-10 or 2012-04-18 (RagexeRE).
 /// Code written by mkbu95, Spiria, Yommy and Ind
 
 /// Request to register a party booking advertisment (CZ_PARTY_RECRUIT_REQ_REGISTER).
 /// 08e5 <level>.W <notice>.37B
-void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
+void clif_parse_PartyRecruitRegisterReq(int fd, struct map_session_data* sd)
 {
+#ifdef PARTY_RECRUIT
 	short level = RFIFOW(fd,2);
 	const char *notice = (const char*)RFIFOP(fd, 4);
 
-	party->booking_register(sd, level, notice);
+	party->recruit_register(sd, level, notice);
+#else
+	return;
+#endif
 }
 
 /// Party booking search results (ZC_PARTY_RECRUIT_ACK_SEARCH).
@@ -12377,8 +12423,9 @@ void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
 /// more results:
 ///     0 = no
 ///     1 = yes
-void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results, int count, bool more_result)
+void clif_PartyRecruitSearchAck(int fd, struct party_booking_ad_info** results, int count, bool more_result)
 {
+#ifdef PARTY_RECRUIT
 	int i;
 	int size = sizeof(struct party_booking_ad_info);
 	struct party_booking_ad_info *pb_ad;
@@ -12399,6 +12446,9 @@ void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results,
 	}
 
 	WFIFOSET(fd,WFIFOW(fd,2));
+#else
+	return;
+#endif
 }
 
 /// Result of request to register a party booking advertisment (ZC_PARTY_RECRUIT_ACK_REGISTER).
@@ -12407,34 +12457,46 @@ void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results,
 ///     0 = success
 ///     1 = failure
 ///     2 = already registered
-void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag)
+void clif_PartyRecruitRegisterAck(struct map_session_data *sd, int flag)
 {
+#ifdef PARTY_RECRUIT
 	int fd = sd->fd;
 
 	WFIFOHEAD(fd, packet_len(0x8e6));
 	WFIFOW(fd, 0) = 0x8e6;
 	WFIFOW(fd, 2) = flag;
 	WFIFOSET(fd, packet_len(0x8e6));
+#else
+	return;
+#endif
 }
 
 /// Request to search for party booking advertisments (CZ_PARTY_RECRUIT_REQ_SEARCH).
 /// 08e7 <level>.W <map id>.W <last index>.L <result count>.W
-void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd)
+void clif_parse_PartyRecruitSearchReq(int fd, struct map_session_data* sd)
 {
+#ifdef PARTY_RECRUIT
 	short level = RFIFOW(fd, 2);
 	short mapid = RFIFOW(fd, 4);
 	unsigned long lastindex = RFIFOL(fd, 6);
 	short resultcount = RFIFOW(fd, 10);
 
-	party->booking_search(sd, level, mapid, lastindex, resultcount);
+	party->recruit_search(sd, level, mapid, lastindex, resultcount);
+#else
+	return;
+#endif
 }
 
 /// Request to delete own party booking advertisment (CZ_PARTY_RECRUIT_REQ_DELETE).
 /// 08e9
-void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
+void clif_parse_PartyRecruitDeleteReq(int fd, struct map_session_data* sd)
 {
+#ifdef PARTY_RECRUIT
 	if(party->booking_delete(sd))
-		clif->PartyBookingDeleteAck(sd, 0);
+		clif->PartyRecruitDeleteAck(sd, 0);
+#else
+	return;
+#endif
 }
 
 /// Result of request to delete own party booking advertisment (ZC_PARTY_RECRUIT_ACK_DELETE).
@@ -12444,31 +12506,40 @@ void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
 ///     1 = success (auto-removed expired ad)
 ///     2 = failure
 ///     3 = nothing registered
-void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag)
+void clif_PartyRecruitDeleteAck(struct map_session_data* sd, int flag)
 {
+#ifdef PARTY_RECRUIT
 	int fd = sd->fd;
 
 	WFIFOHEAD(fd, packet_len(0x8ea));
 	WFIFOW(fd, 0) = 0x8ea;
 	WFIFOW(fd, 2) = flag;
 	WFIFOSET(fd, packet_len(0x8ea));
+#else
+	return;
+#endif
 }
 
 /// Request to update party booking advertisment (CZ_PARTY_RECRUIT_REQ_UPDATE).
 /// 08eb <notice>.37B
-void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data *sd)
+void clif_parse_PartyRecruitUpdateReq(int fd, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	const char *notice;
 
 	notice = (const char*)RFIFOP(fd, 2);
 	
-	party->booking_update(sd, notice);
+	party->recruit_update(sd, notice);
+#else
+	return;
+#endif
 }
 
 /// Notification about new party booking advertisment (ZC_PARTY_RECRUIT_NOTIFY_INSERT).
 /// 08ec <index>.L <expire time>.L <char name>.24B <level>.W <notice>.37B
-void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
+void clif_PartyRecruitInsertNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
 {
+#ifdef PARTY_RECRUIT
 	unsigned char buf[2+6+6+24+4+37+1];
 
 	if (pb_ad == NULL)
@@ -12481,12 +12552,16 @@ void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_boo
 	WBUFW(buf,34) = pb_ad->p_detail.level;
 	memcpy(WBUFP(buf, 36), pb_ad->p_detail.notice, PB_NOTICE_LENGTH);
 	clif->send(buf, packet_len(0x8ec), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 /// Notification about updated party booking advertisment (ZC_PARTY_RECRUIT_NOTIFY_UPDATE).
 /// 08ed <index>.L <notice>.37B
-void clif_PartyBookingUpdateNotify(struct map_session_data *sd, struct party_booking_ad_info* pb_ad)
+void clif_PartyRecruitUpdateNotify(struct map_session_data *sd, struct party_booking_ad_info* pb_ad)
 {
+#ifdef PARTY_RECRUIT
 	unsigned char buf[2+6+37+1];
 	
 	WBUFW(buf, 0) = 0x8ed;
@@ -12494,51 +12569,71 @@ void clif_PartyBookingUpdateNotify(struct map_session_data *sd, struct party_boo
 	memcpy(WBUFP(buf, 6), pb_ad->p_detail.notice, PB_NOTICE_LENGTH);
 
 	clif->send(buf, packet_len(0x8ed), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 /// Notification about deleted party booking advertisment (ZC_PARTY_RECRUIT_NOTIFY_DELETE).
 /// 08ee <index>.L
-void clif_PartyBookingDeleteNotify(struct map_session_data* sd, int index)
+void clif_PartyRecruitDeleteNotify(struct map_session_data* sd, int index)
 {
+#ifdef PARTY_RECRUIT
 	unsigned char buf[2+6+1];
 
 	WBUFW(buf, 0) = 0x8ee;
 	WBUFL(buf, 2) = index;
 
 	clif->send(buf, packet_len(0x8ee), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 /// Request to add to filtering list (PARTY_RECRUIT_ADD_FILTERLINGLIST).
 /// 08ef <index>.L
 void clif_parse_PartyBookingAddFilteringList(int fd, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	int index = RFIFOL(fd, 2);
 
 	clif->PartyBookingAddFilteringList(index, sd);
+#else
+	return;
+#endif
 }
 
 /// Request to remove from filtering list (PARTY_RECRUIT_SUB_FILTERLINGLIST).
 /// 08f0 <GID>.L
 void clif_parse_PartyBookingSubFilteringList(int fd, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	int gid = RFIFOL(fd, 2);
 
 	clif->PartyBookingSubFilteringList(gid, sd);
+#else
+	return;
+#endif
 }
 
 /// Request to recruit volunteer (PARTY_RECRUIT_REQ_VOLUNTEER).
 /// 08f1 <index>.L
 void clif_parse_PartyBookingReqVolunteer(int fd, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	int index = RFIFOL(fd, 2);
 
 	clif->PartyBookingVolunteerInfo(index, sd);
+#else
+	return;
+#endif
 }
 
 /// Request volunteer information (PARTY_RECRUIT_VOLUNTEER_INFO).
 /// 08f2 <AID>.L <job>.L <level>.W <char name>.24B
 void clif_PartyBookingVolunteerInfo(int index, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	unsigned char buf[2+4+4+2+24+1];
 	
 	WBUFW(buf, 0) = 0x8f2;
@@ -12548,6 +12643,9 @@ void clif_PartyBookingVolunteerInfo(int index, struct map_session_data *sd)
 	memcpy(WBUFP(buf, 12), sd->status.name, NAME_LENGTH);
 	
 	clif->send(buf, packet_len(0x8f2), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 #if 0 //Disabled for now. Needs more info.
@@ -12591,44 +12689,61 @@ void clif_PartyBookingFailedRecall(int fd, struct map_session_data *sd)
 /// 08f9 <refuse AID>.L
 void clif_parse_PartyBookingRefuseVolunteer(int fd, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	unsigned long aid = RFIFOL(fd, 2);
 
 	clif->PartyBookingRefuseVolunteer(aid, sd);
+#else
+	return;
+#endif
 }
 
 /// 08fa <index>.L
 void clif_PartyBookingRefuseVolunteer(unsigned long aid, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	unsigned char buf[2+6];
 	
 	WBUFW(buf, 0) = 0x8fa;
 	WBUFL(buf, 2) = aid;
 	
 	clif->send(buf, packet_len(0x8fa), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 /// 08fb <index>.L
 void clif_parse_PartyBookingCancelVolunteer(int fd, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	int index = RFIFOL(fd, 2);
 
 	clif->PartyBookingCancelVolunteer(index, sd);
+#else
+	return;
+#endif
 }
 
 /// 0909 <index>.L
 void clif_PartyBookingCancelVolunteer(int index, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	unsigned char buf[2+6+1];
 	
 	WBUFW(buf, 0) = 0x909;
 	WBUFL(buf, 2) = index;
 	
 	clif->send(buf, packet_len(0x909), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 /// 090b <gid>.L <char name>.24B
 void clif_PartyBookingAddFilteringList(int index, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	unsigned char buf[2+6+24+1];
 
 	WBUFW(buf, 0) = 0x90b;
@@ -12636,11 +12751,15 @@ void clif_PartyBookingAddFilteringList(int index, struct map_session_data *sd)
 	memcpy(WBUFP(buf, 6), sd->status.name, NAME_LENGTH);
 	
 	clif->send(buf, packet_len(0x90b), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 /// 090c <gid>.L <char name>.24B
 void clif_PartyBookingSubFilteringList(int gid, struct map_session_data *sd)
 {
+#ifdef PARTY_RECRUIT
 	unsigned char buf[2+6+24+1];
 
 	WBUFW(buf, 0) = 0x90c;
@@ -12648,6 +12767,9 @@ void clif_PartyBookingSubFilteringList(int gid, struct map_session_data *sd)
 	memcpy(WBUFP(buf, 6), sd->status.name, NAME_LENGTH);
 	
 	clif->send(buf, packet_len(0x90c), &sd->bl, ALL_CLIENT);
+#else
+	return;
+#endif
 }
 
 #if 0
@@ -12661,7 +12783,6 @@ void clif_PartyBookingRefuseVolunteerToPM(struct map_session_data *sd)
 {
 }
 #endif //if 0
-#endif
 
 /// Request to close own vending (CZ_REQ_CLOSESTORE).
 /// 012e
@@ -17984,10 +18105,8 @@ void clif_defaults(void) {
 	clif->clearunit_delayed_sub = clif_clearunit_delayed_sub;
 	clif->set_unit_idle = clif_set_unit_idle;
 	clif->spawn_unit = clif_spawn_unit;
-#if PACKETVER < 20091103
 	clif->spawn_unit2 = clif_spawn_unit2;
 	clif->set_unit_idle2 = clif_set_unit_idle2;
-#endif
 	clif->set_unit_walking = clif_set_unit_walking;
 	clif->calc_walkdelay = clif_calc_walkdelay;
 	clif->getareachar_skillunit = clif_getareachar_skillunit;
@@ -18342,14 +18461,18 @@ void clif_defaults(void) {
 	clif->PartyBookingUpdateNotify = clif_PartyBookingUpdateNotify;
 	clif->PartyBookingDeleteNotify = clif_PartyBookingDeleteNotify;
 	clif->PartyBookingInsertNotify = clif_PartyBookingInsertNotify;
+	clif->PartyRecruitRegisterAck = clif_PartyRecruitRegisterAck;
+	clif->PartyRecruitDeleteAck = clif_PartyRecruitDeleteAck;
+	clif->PartyRecruitSearchAck = clif_PartyRecruitSearchAck;
+	clif->PartyRecruitUpdateNotify = clif_PartyRecruitUpdateNotify;
+	clif->PartyRecruitDeleteNotify = clif_PartyRecruitDeleteNotify;
+	clif->PartyRecruitInsertNotify = clif_PartyRecruitInsertNotify;
 	/* Group Search System Update */
-#ifdef PARTY_RECRUIT
 	clif->PartyBookingVolunteerInfo = clif_PartyBookingVolunteerInfo;
 	clif->PartyBookingRefuseVolunteer = clif_PartyBookingRefuseVolunteer;
 	clif->PartyBookingCancelVolunteer = clif_PartyBookingCancelVolunteer;
 	clif->PartyBookingAddFilteringList = clif_PartyBookingAddFilteringList;
 	clif->PartyBookingSubFilteringList = clif_PartyBookingSubFilteringList;
-#endif
 	/* buying store-related */
 	clif->buyingstore_open = clif_buyingstore_open;
 	clif->buyingstore_open_failed = clif_buyingstore_open_failed;
@@ -18498,6 +18621,10 @@ void clif_defaults(void) {
 	clif->pPartyBookingSearchReq = clif_parse_PartyBookingSearchReq;
 	clif->pPartyBookingDeleteReq = clif_parse_PartyBookingDeleteReq;
 	clif->pPartyBookingUpdateReq = clif_parse_PartyBookingUpdateReq;
+	clif->pPartyRecruitRegisterReq = clif_parse_PartyRecruitRegisterReq;
+	clif->pPartyRecruitSearchReq = clif_parse_PartyRecruitSearchReq;
+	clif->pPartyRecruitDeleteReq = clif_parse_PartyRecruitDeleteReq;
+	clif->pPartyRecruitUpdateReq = clif_parse_PartyRecruitUpdateReq;
 	clif->pCloseVending = clif_parse_CloseVending;
 	clif->pVendingListReq = clif_parse_VendingListReq;
 	clif->pPurchaseReq = clif_parse_PurchaseReq;
@@ -18613,11 +18740,9 @@ void clif_defaults(void) {
 	clif->pPartyTick = clif_parse_PartyTick;
 	clif->pGuildInvite2 = clif_parse_GuildInvite2;
 	/* Group Search System Update */
-#ifdef PARTY_RECRUIT
 	clif->pPartyBookingAddFilter = clif_parse_PartyBookingAddFilteringList;
 	clif->pPartyBookingSubFilter = clif_parse_PartyBookingSubFilteringList;
 	clif->pPartyBookingReqVolunteer = clif_parse_PartyBookingReqVolunteer;
 	clif->pPartyBookingRefuseVolunteer = clif_parse_PartyBookingRefuseVolunteer;
 	clif->pPartyBookingCancelVolunteer = clif_parse_PartyBookingCancelVolunteer;
-#endif
 }
diff --git a/src/map/clif.h b/src/map/clif.h
index 1e054db1d..1a2748353 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -546,10 +546,8 @@ struct clif_interface {
 	int (*clearunit_delayed_sub) (int tid, unsigned int tick, int id, intptr_t data);
 	void (*set_unit_idle) (struct block_list* bl, struct map_session_data *tsd,enum send_target target);
 	void (*spawn_unit) (struct block_list* bl, enum send_target target);
-#if PACKETVER < 20091103
 	void (*spawn_unit2) (struct block_list* bl, enum send_target target);
 	void (*set_unit_idle2) (struct block_list* bl, struct map_session_data *tsd, enum send_target target);
-#endif
 	void (*set_unit_walking) (struct block_list* bl, struct map_session_data *tsd,struct unit_data* ud, enum send_target target);
 	int (*calc_walkdelay) (struct block_list *bl,int delay, int type, int damage, int div_);
 	void (*getareachar_skillunit) (struct map_session_data *sd, struct skill_unit *su);
@@ -904,14 +902,18 @@ struct clif_interface {
 	void (*PartyBookingUpdateNotify) (struct map_session_data* sd, struct party_booking_ad_info* pb_ad);
 	void (*PartyBookingDeleteNotify) (struct map_session_data* sd, int index);
 	void (*PartyBookingInsertNotify) (struct map_session_data* sd, struct party_booking_ad_info* pb_ad);
+	void (*PartyRecruitRegisterAck) (struct map_session_data *sd, int flag);
+	void (*PartyRecruitDeleteAck) (struct map_session_data* sd, int flag);
+	void (*PartyRecruitSearchAck) (int fd, struct party_booking_ad_info** results, int count, bool more_result);
+	void (*PartyRecruitUpdateNotify) (struct map_session_data* sd, struct party_booking_ad_info* pb_ad);
+	void (*PartyRecruitDeleteNotify) (struct map_session_data* sd, int index);
+	void (*PartyRecruitInsertNotify) (struct map_session_data* sd, struct party_booking_ad_info* pb_ad);
 	/* Group Search System Update */
-#ifdef PARTY_RECRUIT
 	void (*PartyBookingVolunteerInfo) (int index, struct map_session_data *sd);
 	void (*PartyBookingRefuseVolunteer) (unsigned long aid, struct map_session_data *sd);
 	void (*PartyBookingCancelVolunteer) (int index, struct map_session_data *sd);
 	void (*PartyBookingAddFilteringList) (int index, struct map_session_data *sd);
 	void (*PartyBookingSubFilteringList) (int gid, struct map_session_data *sd);
-#endif
 	/* buying store-related */
 	void (*buyingstore_open) (struct map_session_data* sd);
 	void (*buyingstore_open_failed) (struct map_session_data* sd, unsigned short result, unsigned int weight);
@@ -1060,6 +1062,10 @@ struct clif_interface {
 	void (*pPartyBookingSearchReq) (int fd, struct map_session_data* sd);
 	void (*pPartyBookingDeleteReq) (int fd, struct map_session_data* sd);
 	void (*pPartyBookingUpdateReq) (int fd, struct map_session_data* sd);
+	void (*pPartyRecruitRegisterReq) (int fd, struct map_session_data* sd);
+	void (*pPartyRecruitSearchReq) (int fd, struct map_session_data* sd);
+	void (*pPartyRecruitDeleteReq) (int fd, struct map_session_data* sd);
+	void (*pPartyRecruitUpdateReq) (int fd, struct map_session_data* sd);
 	void (*pCloseVending) (int fd, struct map_session_data* sd);
 	void (*pVendingListReq) (int fd, struct map_session_data* sd);
 	void (*pPurchaseReq) (int fd, struct map_session_data* sd);
@@ -1173,13 +1179,11 @@ struct clif_interface {
 	void (*pPartyTick) (int fd, struct map_session_data *sd);
 	void (*pGuildInvite2) (int fd, struct map_session_data *sd);
 	/* Group Search System Update */
-#ifdef PARTY_RECRUIT
 	void (*pPartyBookingAddFilter) (int fd, struct map_session_data *sd);
 	void (*pPartyBookingSubFilter) (int fd, struct map_session_data *sd);
 	void (*pPartyBookingReqVolunteer) (int fd, struct map_session_data *sd);
 	void (*pPartyBookingRefuseVolunteer) (int fd, struct map_session_data *sd);
 	void (*pPartyBookingCancelVolunteer) (int fd, struct map_session_data *sd);
-#endif
 };
 
 struct clif_interface *clif;
diff --git a/src/map/map.c b/src/map/map.c
index 0c684542d..d920875ee 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -137,26 +137,32 @@ int map_freeblock_timer(int tid, unsigned int tick, int id, intptr_t data) {
 	return 0;
 }
 
-#ifdef CELL_NOSTACK
 /*==========================================
  * These pair of functions update the counter of how many objects
  * lie on a tile.
  *------------------------------------------*/
 void map_addblcell(struct block_list *bl) {
+#ifdef CELL_NOSTACK
 	if( bl->m < 0 || bl->x < 0 || bl->x >= map->list[bl->m].xs
 	              || bl->y < 0 || bl->y >= map->list[bl->m].ys
 	              || !(bl->type&BL_CHAR) )
 		return;
 	map->list[bl->m].cell[bl->x+bl->y*map->list[bl->m].xs].cell_bl++;
+#else
+	return;
+#endif
 }
 
 void map_delblcell(struct block_list *bl) {
+#ifdef CELL_NOSTACK
 	if( bl->m < 0 || bl->x < 0 || bl->x >= map->list[bl->m].xs
 	              || bl->y < 0 || bl->y >= map->list[bl->m].ys
 	              || !(bl->type&BL_CHAR) )
 	map->list[bl->m].cell[bl->x+bl->y*map->list[bl->m].xs].cell_bl--;
-}
+#else
+	return;
 #endif
+}
 
 /*==========================================
  * Adds a block to the map.
@@ -5792,10 +5798,8 @@ void map_defaults(void) {
 	map->versionscreen = map_versionscreen;
 	map->arg_next_value = map_arg_next_value;
 
-#ifdef CELL_NOSTACK
 	map->addblcell = map_addblcell;
 	map->delblcell = map_delblcell;
-#endif
 
 	/**
 	 * mapit interface
diff --git a/src/map/map.h b/src/map/map.h
index 67fdfcf96..3a7990dcb 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -118,7 +118,7 @@ enum {
 	MAPID_ALCHEMIST,
 	MAPID_ROGUE,
 	MAPID_SOUL_LINKER,
-	MAPID_DARK_COLLECTOR = JOBL_2_2|0x0D,
+	MAPID_DARK_COLLECTOR = JOBL_2_2|0x0E,
 	//Trans Novice And Trans 1-1 Jobs
 	MAPID_NOVICE_HIGH = JOBL_UPPER|0x0,
 	MAPID_SWORDMAN_HIGH,
@@ -1018,10 +1018,8 @@ struct map_interface {
 	void (*helpscreen) (bool do_exit);
 	void (*versionscreen) (bool do_exit);
 	bool (*arg_next_value) (const char *option, int i, int argc);
-#ifdef CELL_NOSTACK
 	void (*addblcell) (struct block_list *bl);
 	void (*delblcell) (struct block_list *bl);
-#endif
 };
 
 struct map_interface *map;
diff --git a/src/map/npc.c b/src/map/npc.c
index a28724238..c52dce325 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -212,11 +212,11 @@ struct npc_data* npc_name2id(const char* name)
 /**
  * For the Secure NPC Timeout option (check config/Secure.h) [RR]
  **/
-#ifdef SECURE_NPCTIMEOUT
 /**
  * Timer to check for idle time and timeout the dialog if necessary
  **/
 int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data) {
+#ifdef SECURE_NPCTIMEOUT
 	struct map_session_data* sd = NULL;
 	unsigned int timeout = NPC_SECURE_TIMEOUT_NEXT;
 	if( (sd = map->id2sd(id)) == NULL || !sd->npc_id ) {
@@ -251,9 +251,9 @@ int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat
 		sd->npc_idle_timer = INVALID_TIMER;
 	} else //Create a new instance of ourselves to continue
 		sd->npc_idle_timer = timer->add(timer->gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc->secure_timeout_timer,sd->bl.id,0);
+#endif
 	return 0;
 }
-#endif
 
 /*==========================================
  * Dequeue event and add timer for execution (100ms)
@@ -4072,7 +4072,5 @@ void npc_defaults(void) {
 	npc->do_clear_npc = do_clear_npc;
 	npc->debug_warps_sub = npc_debug_warps_sub;
 	npc->debug_warps = npc_debug_warps;
-#ifdef SECURE_NPCTIMEOUT
 	npc->secure_timeout_timer = npc_rr_secure_timeout_timer;
-#endif
 }
diff --git a/src/map/npc.h b/src/map/npc.h
index 3c273fffb..f809cb19c 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -229,9 +229,7 @@ struct npc_interface {
 	/**
 	 * For the Secure NPC Timeout option (check config/Secure.h) [RR]
 	 **/
-#ifdef SECURE_NPCTIMEOUT
 	int (*secure_timeout_timer) (int tid, unsigned int tick, int id, intptr_t data);
-#endif
 };
 
 struct npc_interface *npc;
diff --git a/src/map/packets.h b/src/map/packets.h
index 3ae52cba8..c91b5d50c 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1971,14 +1971,14 @@ packet(0x020d,-1);
 #ifndef PACKETVER_RE
 	packet(0x091D,18,clif->pPartyBookingRegisterReq,2,4,6);
 #else
-	packet(0x08E5,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08E5,41,clif->pPartyRecruitRegisterReq,2,4);
 #endif
 	packet(0x08E6,4);
-	packet(0x08E7,10,clif->pPartyBookingSearchReq,2);
+	packet(0x08E7,10,clif->pPartyRecruitSearchReq,2);
 	packet(0x08E8,-1);
-	packet(0x08E9,2,clif->pPartyBookingDeleteReq,2);
+	packet(0x08E9,2,clif->pPartyRecruitDeleteReq,2);
 	packet(0x08EA,4);
-	packet(0x08EB,39,clif->pPartyBookingUpdateReq,2);
+	packet(0x08EB,39,clif->pPartyRecruitUpdateReq,2);
 	packet(0x08EC,73);
 	packet(0x08ED,43);
 	packet(0x08EE,6);
@@ -2022,14 +2022,14 @@ packet(0x020d,-1);
 	packet(0x0364,8,clif->pMoveFromKafra,2,4);
 	packet(0x096A,6,clif->pGetCharNameRequest,2);
 	packet(0x0368,6,clif->pSolveCharName,2);
-	packet(0x08E5,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08E5,41,clif->pPartyRecruitRegisterReq,2,4);
 	packet(0x08d2,10);
 	packet(0x0916,26,clif->pGuildInvite2,2);
 #endif
 
 #ifndef PACKETVER_RE
 #if PACKETVER >= 20120604
-	packet(0x0861,18,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0861,18,clif->pPartyRecruitRegisterReq,2,4,6);
 #endif
 #endif
 
@@ -2119,7 +2119,7 @@ packet(0x020d,-1);
 	packet(0x0886,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0938,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x085D,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085D,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x085D,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
@@ -2164,7 +2164,7 @@ packet(0x020d,-1);
 	packet(0x0817,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x092D,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092D,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x092D,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
@@ -2203,7 +2203,7 @@ packet(0x020d,-1);
 	packet(0x086E,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0874,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x089B,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089B,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x089B,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
@@ -2241,7 +2241,7 @@ packet(0x020d,-1);
 	packet(0x0964,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0869,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x0874,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0874,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x0874,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
@@ -2278,7 +2278,7 @@ packet(0x020d,-1);
 	packet(0x0817,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x0365,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0365,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
@@ -2324,7 +2324,7 @@ packet(0x020d,-1);
 	packet(0x085A,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0932,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x08A7,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08A7,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x08A7,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
@@ -2361,7 +2361,7 @@ packet(0x020d,-1);
 	packet(0x0365,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x0894,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0894,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x0894,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
@@ -2386,7 +2386,7 @@ packet(0x020d,-1);
 	packet(0x0817,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x0365,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0365,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
@@ -2424,7 +2424,7 @@ packet(0x020d,-1);
 	packet(0x0817,2,clif->pReqCloseBuyingStore,0);
 	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #ifdef PACKETVER_RE
-	packet(0x0365,41,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0365,41,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
 	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4);
 #endif // PACKETVER_RE
diff --git a/src/map/party.c b/src/map/party.c
index 1694adf2c..904110452 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -1108,16 +1108,9 @@ struct party_booking_ad_info* create_party_booking_data(void) {
 	return pb_ad;
 }
 
-#ifndef PARTY_RECRUIT
-void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job)
-#else
-void party_booking_register(struct map_session_data *sd, short level, const char *notice)
-#endif
-{
+void party_recruit_register(struct map_session_data *sd, short level, const char *notice) {
+#ifdef PARTY_RECRUIT
 	struct party_booking_ad_info *pb_ad;
-#ifndef PARTY_RECRUIT
- 	int i;
-#endif
 
 	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
 
@@ -1128,37 +1121,59 @@ void party_booking_register(struct map_session_data *sd, short level, const char
 	}
 	else
 	{// already registered
-		clif->PartyBookingRegisterAck(sd, 2);
+		clif->PartyRecruitRegisterAck(sd, 2);
 		return;
 	}
 
 	memcpy(pb_ad->charname,sd->status.name,NAME_LENGTH);
 	pb_ad->expiretime = (int)time(NULL);
  	pb_ad->p_detail.level = level;
+	safestrncpy(pb_ad->p_detail.notice, notice, PB_NOTICE_LENGTH);
+
+	clif->PartyRecruitRegisterAck(sd, 0);
+	clif->PartyRecruitInsertNotify(sd, pb_ad); // Notice
+#else
+	return;
+#endif
+}
+
+void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job) {
 #ifndef PARTY_RECRUIT
+	struct party_booking_ad_info *pb_ad;
+ 	int i;
+	
+	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
+	
+	if( pb_ad == NULL )
+	{
+		pb_ad = party->create_booking_data();
+		idb_put(party->booking_db, sd->status.char_id, pb_ad);
+	}
+	else
+	{// already registered
+		clif->PartyBookingRegisterAck(sd, 2);
+		return;
+	}
+	
+	memcpy(pb_ad->charname,sd->status.name,NAME_LENGTH);
+	pb_ad->expiretime = (int)time(NULL);
+ 	pb_ad->p_detail.level = level;
 	pb_ad->p_detail.mapid = mapid;
-
+	
 	for(i=0;i<PARTY_BOOKING_JOBS;i++)
 		if(job[i] != 0xFF)
 			pb_ad->p_detail.job[i] = job[i];
 		else pb_ad->p_detail.job[i] = -1;
-#else
-	safestrncpy(pb_ad->p_detail.notice, notice, PB_NOTICE_LENGTH);
-#endif
-
+	
 	clif->PartyBookingRegisterAck(sd, 0);
 	clif->PartyBookingInsertNotify(sd, pb_ad); // Notice
-}
-
-#ifndef PARTY_RECRUIT
-void party_booking_update(struct map_session_data *sd, short* job)
 #else
-void party_booking_update(struct map_session_data *sd, const char *notice)
-#endif
-{
-#ifndef PARTY_RECRUIT
-	int i;
+	return;
 #endif
+}
+
+void party_recruit_update(struct map_session_data *sd, const char *notice) {
+#ifdef PARTY_RECRUIT
 	struct party_booking_ad_info *pb_ad;
 
 	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
@@ -1168,30 +1183,42 @@ void party_booking_update(struct map_session_data *sd, const char *notice)
 
 	pb_ad->expiretime = (int)time(NULL);// Update time.
 
+	if (notice != NULL) {
+		safestrncpy(pb_ad->p_detail.notice, notice, PB_NOTICE_LENGTH);
+	}
+
+	clif->PartyRecruitUpdateNotify(sd, pb_ad);
+#else
+	return;
+#endif
+}
+void party_booking_update(struct map_session_data *sd, short* job) {
 #ifndef PARTY_RECRUIT
+	int i;
+	struct party_booking_ad_info *pb_ad;
+	
+	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
+	
+	if( pb_ad == NULL )
+		return;
+	
+	pb_ad->expiretime = (int)time(NULL);// Update time.
+	
 	for(i=0;i<PARTY_BOOKING_JOBS;i++)
 		if(job[i] != 0xFF)
 			pb_ad->p_detail.job[i] = job[i];
 		else pb_ad->p_detail.job[i] = -1;
+	
+	clif->PartyBookingUpdateNotify(sd, pb_ad);
 #else
-	if (notice != NULL) {
-		safestrncpy(pb_ad->p_detail.notice, notice, PB_NOTICE_LENGTH);
-	}
+	return;
 #endif
-
-	clif->PartyBookingUpdateNotify(sd, pb_ad);
 }
 
-#ifndef PARTY_RECRUIT
-void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount)
-#else
-void party_booking_search(struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount)
-#endif
-{
+
+void party_recruit_search(struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount) {
+#ifdef PARTY_RECRUIT
 	struct party_booking_ad_info *pb_ad;
-#ifndef PARTY_RECRUIT
-	int i;
-#endif
 	int count = 0;
 	struct party_booking_ad_info* result_list[PARTY_BOOKING_RESULTS];
 	bool more_result = false;
@@ -1201,18 +1228,42 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 
 	for( pb_ad = dbi_first(iter); dbi_exists(iter); pb_ad = dbi_next(iter) )
 	{
-#ifndef PARTY_RECRUIT
-		if (pb_ad->index < lastindex || (level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level)))
-			continue;
-#else
 		if ((level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level)))
 			continue;
-#endif
 		if (count >= PARTY_BOOKING_RESULTS){
 			more_result = true;
 			break;
 		}
+		result_list[count] = pb_ad;
+		if( result_list[count] )
+		{
+			count++;
+		}
+	}
+	dbi_destroy(iter);
+	clif->PartyRecruitSearchAck(sd->fd, result_list, count, more_result);
+#else
+	return;
+#endif
+}
+void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount) {
 #ifndef PARTY_RECRUIT
+	struct party_booking_ad_info *pb_ad;
+	int i;
+	int count = 0;
+	struct party_booking_ad_info* result_list[PARTY_BOOKING_RESULTS];
+	bool more_result = false;
+	DBIterator* iter = db_iterator(party->booking_db);
+	
+	memset(result_list, 0, sizeof(result_list));
+	
+	for( pb_ad = dbi_first(iter); dbi_exists(iter); pb_ad = dbi_next(iter) ) {
+		if (pb_ad->index < lastindex || (level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level)))
+			continue;
+		if (count >= PARTY_BOOKING_RESULTS){
+			more_result = true;
+			break;
+		}
 		if (mapid == 0 && job == -1)
 			result_list[count] = pb_ad;
 		else if (mapid == 0) {
@@ -1223,9 +1274,6 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 			if (pb_ad->p_detail.mapid == mapid)
 				result_list[count] = pb_ad;
 		}
-#else
-		result_list[count] = pb_ad;
-#endif
 		if( result_list[count] )
 		{
 			count++;
@@ -1233,15 +1281,23 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 	}
 	dbi_destroy(iter);
 	clif->PartyBookingSearchAck(sd->fd, result_list, count, more_result);
+#else
+	return;
+#endif
 }
 
+
 bool party_booking_delete(struct map_session_data *sd)
 {
 	struct party_booking_ad_info* pb_ad;
 
 	if((pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id))!=NULL)
 	{
+#ifdef PARTY_RECRUIT
+		clif->PartyRecruitDeleteNotify(sd, pb_ad->index);
+#else
 		clif->PartyBookingDeleteNotify(sd, pb_ad->index);
+#endif
 		idb_remove(party->booking_db,sd->status.char_id);
 	}
 	return true;
@@ -1309,6 +1365,9 @@ void party_defaults(void) {
 	party->booking_register = party_booking_register;
 	party->booking_update = party_booking_update;
 	party->booking_search = party_booking_search;
+	party->recruit_register = party_recruit_register;
+	party->recruit_update = party_recruit_update;
+	party->recruit_search = party_recruit_search;
 	party->booking_delete = party_booking_delete;
 	party->vforeachsamemap = party_vforeachsamemap;
 	party->foreachsamemap = party_foreachsamemap;
diff --git a/src/map/party.h b/src/map/party.h
index 570c7bd11..208edb846 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -34,6 +34,8 @@ struct party_data {
 	} state;
 };
 
+#define PB_NOTICE_LENGTH (36 + 1)
+
 #ifndef PARTY_RECRUIT
 struct party_booking_detail {
 	short level;
@@ -48,7 +50,6 @@ struct party_booking_ad_info {
 	struct party_booking_detail p_detail;
 };
 #else /* PARTY_RECRUIT */
-#define PB_NOTICE_LENGTH (36 + 1)
 struct party_booking_detail {
 	short level;
 	char notice[PB_NOTICE_LENGTH];
@@ -111,15 +112,13 @@ struct party_interface {
 	/*==========================================
 	 * Party Booking in KRO [Spiria]
 	 *------------------------------------------*/
-#ifndef PARTY_RECRUIT
 	void (*booking_register) (struct map_session_data *sd, short level, short mapid, short* job);
 	void (*booking_update) (struct map_session_data *sd, short* job);
 	void (*booking_search) (struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount);
-#else /* PARTY_RECRUIT */
-	void (*booking_register) (struct map_session_data *sd, short level, const char *notice);
-	void (*booking_update) (struct map_session_data *sd, const char *notice);
-	void (*booking_search) (struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount);
-#endif
+	/* PARTY_RECRUIT */
+	void (*recruit_register) (struct map_session_data *sd, short level, const char *notice);
+	void (*recruit_update) (struct map_session_data *sd, const char *notice);
+	void (*recruit_search) (struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount);
 	bool (*booking_delete) (struct map_session_data *sd);
 	/* */
 	int (*vforeachsamemap) (int (*func)(struct block_list *,va_list),struct map_session_data *sd,int range, va_list ap);
diff --git a/src/map/script.c b/src/map/script.c
index 5fa248f4e..8460b23b0 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -17738,6 +17738,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF2(cleanmap,"cleanarea","siiii"),
 		BUILDIN_DEF(npcskill,"viii"),
 		BUILDIN_DEF(itemeffect,"v"),
+		BUILDIN_DEF2(itemeffect,"consumeitem","v"), /* alias of itemeffect */
 		BUILDIN_DEF(delequip,"i"),
 		/**
 		 * @commands (script based)
diff --git a/src/map/skill.c b/src/map/skill.c
index a55fb2937..248e19e77 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5110,9 +5110,15 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 			break;
 
 		case AL_DECAGI:
+			clif->skill_nodamage (src, bl, skill_id, skill_lv,
+								  sc_start(bl, type, (40 + skill_lv * 2 + (status->get_lv(src) + sstatus->int_)/5), skill_lv,
+										   /* monsters using lvl 48 get the rate benefit but the duration of lvl 10 */
+										   ( src->type == BL_MOB && skill_lv == 48 ) ? skill->get_time(skill_id,10) : skill->get_time(skill_id,skill_lv)));
+			break;
+
 		case MER_DECAGI:
 			clif->skill_nodamage (src, bl, skill_id, skill_lv,
-				sc_start(bl, type, (40 + skill_lv * 2 + (status->get_lv(src) + sstatus->int_)/5), skill_lv, skill->get_time(skill_id,skill_lv)));
+								  sc_start(bl, type, (40 + skill_lv * 2 + (status->get_lv(src) + sstatus->int_)/5), skill_lv, skill->get_time(skill_id,skill_lv)));
 			break;
 
 		case AL_CRUCIS:
@@ -6972,8 +6978,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 					return 0;
 				}
 				status->change_start(bl,SC_STUN,10000,skill_lv,0,0,0,skill->get_time2(skill_id,skill_lv),8);
-				if (f_sd) sc_start(&f_sd->bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv));
-				if (m_sd) sc_start(&m_sd->bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv));
+				if (f_sd) {
+					sc_start(&f_sd->bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv));
+					clif->specialeffect(&f_sd->bl,408,AREA);
+				}
+				if (m_sd) {
+					sc_start(&m_sd->bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv));
+					clif->specialeffect(&m_sd->bl,408,AREA);
+				}
 			}
 			break;
 
@@ -7970,8 +7982,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 		case AB_CLEARANCE:
 			if( flag&1 || (i = skill->get_splash(skill_id, skill_lv)) < 1 ) {
 				//As of the behavior in official server Clearance is just a super version of Dispell skill. [Jobbie]
+				if( bl->type != BL_MOB && battle->check_target(src,bl,BCT_PARTY) <= 0 ) // Only affect mob or party.
+					break;
+								
 				clif->skill_nodamage(src,bl,skill_id,skill_lv,1);
-				if((dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) || rnd()%100 >= 30 + 10 * skill_lv) {
+				
+				if((dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) || rnd()%100 >= 60 + 8 * skill_lv) {
 					if (sd)
 						clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
 					break;
@@ -9805,6 +9821,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 		case MH_STEINWAND:
 		case MH_XENO_SLASHER:
 		case NC_MAGMA_ERUPTION:
+		case RL_B_TRAP:
 			flag|=1;//Set flag to 1 to prevent deleting ammo (it will be deleted on group-delete).
 		case GS_GROUNDDRIFT: //Ammo should be deleted right away.
 			skill->unitsetting(src,skill_id,skill_lv,x,y,0);
diff --git a/src/map/skill.h b/src/map/skill.h
index 592721f1e..0f89cd3be 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -1587,9 +1587,13 @@ enum {
 	UNT_MAKIBISHI,
 	UNT_VENOMFOG,
 	UNT_ICEMINE, 
- 	UNT_FLAMECROSS, 
- 	UNT_HELLBURNING, 
- 	UNT_MAGMA_ERUPTION, 
+ 	UNT_FLAMECROSS,
+ 	UNT_HELLBURNING,
+ 	UNT_MAGMA_ERUPTION,
+	UNT_KINGS_GRACE,
+	UNT_GLITTERING_GREED,
+	UNT_B_TRAP,
+	UNT_FIRE_RAIN,
 	
 	/**
 	 * Guild Auras
diff --git a/src/map/status.c b/src/map/status.c
index 28699d06a..497d02bbf 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1911,9 +1911,14 @@ unsigned short status_base_atk(const struct block_list *bl, const struct status_
 
 static inline unsigned short status_base_matk_min(const struct status_data *st){ return st->int_+(st->int_/7)*(st->int_/7); }
 static inline unsigned short status_base_matk_max(const struct status_data *st){ return st->int_+(st->int_/5)*(st->int_/5); }
+
+unsigned short status_base_matk(const struct status_data *st, int level) {
 #ifdef RENEWAL
-unsigned short status_base_matk(const struct status_data *st, int level){ return st->int_+(st->int_/2)+(st->dex/5)+(st->luk/3)+(level/4); }
+	return st->int_+(st->int_/2)+(st->dex/5)+(st->luk/3)+(level/4);
+#else
+	return 0;
 #endif
+}
 
 //Fills in the misc data that can be calculated from the other status info (except for level)
 void status_calc_misc(struct block_list *bl, struct status_data *st, int level) {
@@ -4514,9 +4519,8 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc,
 
 	return (unsigned short)cap_value(watk,0,USHRT_MAX);
 }
+unsigned short status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk) {
 #ifdef RENEWAL
-unsigned short status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk)
-{
 
 	if (!sc || !sc->count)
 		return cap_value(matk,0,USHRT_MAX);
@@ -4539,8 +4543,10 @@ unsigned short status_calc_ematk(struct block_list *bl, struct status_change *sc
 	if(sc->data[SC_IZAYOI])
 		matk += 25 * sc->data[SC_IZAYOI]->val1;
 	return (unsigned short)cap_value(matk,0,USHRT_MAX);
-}
+#else
+	return 0;
 #endif
+}
 unsigned short status_calc_matk(struct block_list *bl, struct status_change *sc, int matk, bool viewable)
 {
 	if(!sc || !sc->count)
@@ -5202,11 +5208,10 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc
 	return (short)cap_value(speed,10,USHRT_MAX);
 }
 
-#ifdef RENEWAL_ASPD
 // flag&1 - fixed value [malufett]
 // flag&2 - percentage value
-short status_calc_aspd(struct block_list *bl, struct status_change *sc, short flag)
-{
+short status_calc_aspd(struct block_list *bl, struct status_change *sc, short flag) {
+#ifdef RENEWAL_ASPD
 	int i, pots = 0, skills1 = 0, skills2 = 0;
 
 	if(!sc || !sc->count)
@@ -5318,8 +5323,10 @@ short status_calc_aspd(struct block_list *bl, struct status_change *sc, short fl
 		}
 	}
 	return ( flag&1? (skills1 + pots) : skills2 );
-}
+#else
+	return 0;
 #endif
+}
 
 short status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, int aspd) {
 	if (!sc || !sc->count)
@@ -10765,8 +10772,8 @@ int status_change_timer_sub(struct block_list* bl, va_list ap) {
 
 int status_get_total_def(struct block_list *src) { return status->get_status_data(src)->def2 + (short)status->get_def(src); }
 int status_get_total_mdef(struct block_list *src) { return status->get_status_data(src)->mdef2 + (short)status_get_mdef(src); }
-#ifdef RENEWAL
 int status_get_weapon_atk(struct block_list *bl, struct weapon_atk *watk, int flag) {
+#ifdef RENEWAL
 	int min = 0, max = 0, dstr;
 	float strdex_bonus, variance;
 	struct status_change *sc = status->get_sc(bl);
@@ -10800,8 +10807,10 @@ int status_get_weapon_atk(struct block_list *bl, struct weapon_atk *watk, int fl
 	max = status->calc_watk(bl, sc, max, false);
 
 	return max;
-}
+#else
+	return 0;
 #endif
+}
 
 #define GETRANDMATK(st) do {\
 	if( (st)->matk_max > (st)->matk_min ) \
@@ -11549,10 +11558,8 @@ void status_defaults(void) {
 	status->calc_mdef = status_calc_mdef;
 	status->calc_mdef2 = status_calc_mdef2;
 	status->calc_batk = status_calc_batk;
-#ifdef RENEWAL
 	status->base_matk = status_base_matk;
 	status->get_weapon_atk = status_get_weapon_atk;
-#endif
 	status->get_total_mdef = status_get_total_mdef;
 	status->get_total_def = status_get_total_def;
 
@@ -11585,18 +11592,14 @@ void status_defaults(void) {
 	status->calc_speed = status_calc_speed;
 	status->calc_aspd_rate = status_calc_aspd_rate;
 	status->calc_dmotion = status_calc_dmotion;
-#ifdef RENEWAL_ASPD
 	status->calc_aspd = status_calc_aspd;
-#endif
 	status->calc_fix_aspd = status_calc_fix_aspd;
 	status->calc_maxhp = status_calc_maxhp;
 	status->calc_maxsp = status_calc_maxsp;
 	status->calc_element = status_calc_element;
 	status->calc_element_lv = status_calc_element_lv;
 	status->calc_mode = status_calc_mode;
-#ifdef RENEWAL
 	status->calc_ematk = status_calc_ematk;
-#endif
 	status->calc_bl_main = status_calc_bl_main;
 	status->display_add = status_display_add;
 	status->display_remove = status_display_remove;
diff --git a/src/map/status.h b/src/map/status.h
index d1e78b0b7..c7518a213 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -1893,10 +1893,8 @@ struct status_interface {
 	defType (*calc_mdef) (struct block_list *bl, struct status_change *sc, int mdef, bool viewable);
 	short (*calc_mdef2) (struct block_list *bl, struct status_change *sc, int mdef2, bool viewable);
 	unsigned short (*calc_batk)(struct block_list *bl, struct status_change *sc, int batk, bool viewable);
-#ifdef RENEWAL
 	unsigned short (*base_matk) (const struct status_data *st, int level);
 	int (*get_weapon_atk) (struct block_list *src, struct weapon_atk *watk, int flag);
-#endif
 	int (*get_total_mdef) (struct block_list *src);
 	int (*get_total_def) (struct block_list *src);
 	int (*get_matk) (struct block_list *src, int flag);
@@ -1925,18 +1923,14 @@ struct status_interface {
 	unsigned short (*calc_speed) (struct block_list *bl, struct status_change *sc, int speed);
 	short (*calc_aspd_rate) (struct block_list *bl, struct status_change *sc, int aspd_rate);
 	unsigned short (*calc_dmotion) (struct block_list *bl, struct status_change *sc, int dmotion);
-#ifdef RENEWAL_ASPD
 	short (*calc_aspd) (struct block_list *bl, struct status_change *sc, short flag);
-#endif
 	short (*calc_fix_aspd) (struct block_list *bl, struct status_change *sc, int aspd);
 	unsigned int (*calc_maxhp) (struct block_list *bl, struct status_change *sc, uint64 maxhp);
 	unsigned int (*calc_maxsp) (struct block_list *bl, struct status_change *sc, unsigned int maxsp);
 	unsigned char (*calc_element) (struct block_list *bl, struct status_change *sc, int element);
 	unsigned char (*calc_element_lv) (struct block_list *bl, struct status_change *sc, int lv);
 	unsigned short (*calc_mode) (struct block_list *bl, struct status_change *sc, int mode);
-#ifdef RENEWAL
 	unsigned short (*calc_ematk) (struct block_list *bl, struct status_change *sc, int matk);
-#endif
 	void (*calc_bl_main) (struct block_list *bl, int flag);
 	void (*display_add) (struct map_session_data *sd, enum sc_type type, int dval1, int dval2, int dval3);
 	void (*display_remove) (struct map_session_data *sd, enum sc_type type);