Index: src/common/db.c

===================================================================

--- src/common/db.c	(revision 16039)

+++ src/common/db.c	(working copy)

@@ -2742,7 +2742,7 @@

 	while( node ) {

 		if( node->key == key ) {

 			if( node->prev && n > 5 ) {

-				// ˆ—Œø—Š‰ü‘P‚ׂ̈Éhead‚Ɉړ®‚³‚¹‚é

+				//Moving the head in order to improve processing efficiency

 				if(node->prev) node->prev->next = node->next;

 				if(node->next) node->next->prev = node->prev;

 				node->next = *head;

@@ -2789,7 +2789,7 @@

 	while( node ) {

 		if( node->key == key ) {

 			if( node->prev && n > 5 ) {

-				// ˆ—Œø—Š‰ü‘P‚ׂ̈Éhead‚Ɉړ®‚³‚¹‚é

+				//Moving the head in order to improve processing efficiency

 				if(node->prev) node->prev->next = node->next;

 				if(node->next) node->next->prev = node->prev;

 				node->next = *head;

@@ -2803,7 +2803,7 @@

 		node = node->next;

 		n++;

 	}

-	// Œ©‚‚©‚ç‚È‚¢‚Ì‚Å‘}“ü

+	//Insert because it can not find

 	linkdb_insert( head, key, data );

 }

Index: src/common/strlib.c

===================================================================

--- src/common/strlib.c	(revision 16039)

+++ src/common/strlib.c	(working copy)

@@ -581,6 +581,8 @@

 			sv->done = true;

 			state = END;

 			break;

+		default: //do nothing

+		    break;

 		}

 	}

 	if( IS_END() )

Index: src/common/nullpo.c

===================================================================

--- src/common/nullpo.c	(revision 16039)

+++ src/common/nullpo.c	(working copy)

@@ -12,7 +12,8 @@

                              const char *fmt, va_list ap);

 /*======================================

- * Nullƒ`ƒFƒbƒN ‹y‚Ñ î•ño—Í

+ * Semble checker si le target est null et retourne 0 (false) dans ce cas

+ * Semble chek les arguments fournit egalement ??

  *--------------------------------------*/

 int nullpo_chk_f(const char *file, int line, const char *func, const void *target,

                  const char *fmt, ...)

Index: src/char/int_mercenary.c

===================================================================

--- src/char/int_mercenary.c	(revision 16039)

+++ src/char/int_mercenary.c	(working copy)

@@ -136,6 +136,7 @@

 	return true;

 }

+

 static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag)

 {

 	int size = sizeof(struct s_mercenary) + 5;

Index: src/char/int_party.c

===================================================================

--- src/char/int_party.c	(revision 16039)

+++ src/char/int_party.c	(working copy)

@@ -324,9 +324,10 @@

 }

 //-------------------------------------------------------------------

-// map server‚ւ̒ʐM

+// Communication to the map server

-// ƒp[ƒeƒBì¬‰Â”Û

+

+// Create a party whether or not

 int mapif_party_created(int fd,int account_id,int char_id,struct party *p)

 {

 	WFIFOHEAD(fd, 39);

@@ -348,7 +349,7 @@

 	return 0;

 }

-// ƒp[ƒeƒBî•ñŒ©‚‚©‚ç‚ž

+//Party information not found

 static void mapif_party_noinfo(int fd, int party_id, int char_id)

 {

 	WFIFOHEAD(fd, 12);

@@ -359,7 +360,8 @@

 	WFIFOSET(fd,12);

 	ShowWarning("int_party: info not found (party_id=%d char_id=%d)\n", party_id, char_id);

 }

-// ƒp[ƒeƒBî•ñ‚Ü‚Æ‚ß‘—‚è

+

+//Digest party information

 static void mapif_party_info(int fd, struct party* p, int char_id)

 {

 	unsigned char buf[8 + sizeof(struct party)];

@@ -373,7 +375,8 @@

 	else

 		mapif_send(fd,buf,WBUFW(buf,2));

 }

-// ƒp[ƒeƒBƒƒ“ƒo’ljÁ‰Â”Û

+

+//Whether or not additional party members

 int mapif_party_memberadded(int fd, int party_id, int account_id, int char_id, int flag) {

 	WFIFOHEAD(fd, 15);

 	WFIFOW(fd,0) = 0x3822;

@@ -386,7 +389,7 @@

 	return 0;

 }

-// ƒp[ƒeƒBÝ’è•ÏX’Ê’m

+// Party setting change notification

 int mapif_party_optionchanged(int fd,struct party *p,int account_id,int flag)

 {

 	unsigned char buf[16];

@@ -403,7 +406,7 @@

 	return 0;

 }

-// ƒp[ƒeƒB’E‘Þ’Ê’m

+//Withdrawal notification party

 int mapif_party_withdraw(int party_id,int account_id, int char_id) {

 	unsigned char buf[16];

@@ -415,7 +418,7 @@

 	return 0;

 }

-// ƒp[ƒeƒBƒ}ƒbƒvXV’Ê’m

+//Party map update notification

 int mapif_party_membermoved(struct party *p,int idx)

 {

 	unsigned char buf[20];

@@ -431,7 +434,7 @@

 	return 0;

 }

-// ƒp[ƒeƒB‰ðŽU’Ê’m

+//Dissolution party notification

 int mapif_party_broken(int party_id,int flag)

 {

 	unsigned char buf[16];

@@ -442,7 +445,8 @@

 	//printf("int_party: broken %d\n",party_id);

 	return 0;

 }

-// ƒp[ƒeƒB“à”­ŒŸ

+

+//Remarks in the party

 int mapif_party_message(int party_id,int account_id,char *mes,int len, int sfd)

 {

 	unsigned char buf[512];

@@ -456,7 +460,7 @@

 }

 //-------------------------------------------------------------------

-// map server‚©‚ç‚̒ʐM

+// Communication from the map server

 // Create Party

@@ -507,7 +511,8 @@

 	return 0;

 }

-// ƒp[ƒeƒBî•ñ—v‹

+

+// Party information request

 static void mapif_parse_PartyInfo(int fd, int party_id, int char_id)

 {

 	struct party_data *p;

@@ -518,7 +523,8 @@

 	else

 		mapif_party_noinfo(fd, party_id, char_id);

 }

-// ƒp[ƒeƒB’ljÁ—v‹

+

+// Add request party

 int mapif_parse_PartyAddMember(int fd, int party_id, struct party_member *member)

 {

 	struct party_data *p;

@@ -556,7 +562,7 @@

 	return 0;

 }

-// ƒp[ƒeƒB[Ý’è•ÏX—v‹

+//Party setting change request

 int mapif_parse_PartyChangeOption(int fd,int party_id,int account_id,int exp,int item)

 {

 	struct party_data *p;

@@ -576,7 +582,8 @@

 	inter_party_tosql(&p->party, PS_BASIC, 0);

 	return 0;

 }

-// ƒp[ƒeƒB’E‘Þ—v‹

+

+//Request leave party

 int mapif_parse_PartyLeave(int fd, int party_id, int account_id, int char_id)

 {

 	struct party_data *p;

@@ -684,7 +691,7 @@

 	return 0;

 }

-// ƒp[ƒeƒB‰ðŽU—v‹

+//Request party dissolution

 int mapif_parse_BreakParty(int fd,int party_id)

 {

 	struct party_data *p;

@@ -697,7 +704,8 @@

 	mapif_party_broken(fd,party_id);

 	return 0;

 }

-// ƒp[ƒeƒBƒƒbƒZ[ƒW‘—M

+

+//Party sending the message

 int mapif_parse_PartyMessage(int fd,int party_id,int account_id,char *mes,int len)

 {

 	return mapif_party_message(party_id,account_id,mes,len, fd);

@@ -727,11 +735,12 @@

 	return 1;

 }

-// map server ‚©‚ç‚̒ʐM

-// E‚PƒpƒPƒbƒg‚̂݉ðÍ‚·‚邱‚Æ

-// EƒpƒPƒbƒg’·ƒf[ƒ^‚Íinter.c‚ɃZƒbƒg‚µ‚Ä‚š‚­‚±‚Æ

-// EƒpƒPƒbƒg’·ƒ`ƒFƒbƒN‚âARFIFOSKIP‚͌Ăяo‚µŒ³‚ōs‚í‚ê‚é‚̂ōs‚Á‚Ä‚Í‚È‚ç‚È‚¢

-// EƒGƒ‰[‚È‚ç0(false)A‚»‚€‚Å‚È‚¢‚È‚ç1(true)‚ð‚©‚Š‚³‚È‚¯‚ê‚΂Ȃç‚È‚¢

+

+// Communication from the map server

+//-Analysis that only one packet

+// Data packet length is set to inter.c that you

+// Do NOT go and check the packet length, RFIFOSKIP is done by the caller

+// ? (False), must return 1 (true) if error, 0 if otherwise.

 int inter_party_parse_frommap(int fd)

 {

 	RFIFOHEAD(fd);

@@ -751,7 +760,7 @@

 	return 1;

 }

-// ƒT[ƒo[‚©‚ç’E‘Þ—v‹iƒLƒƒƒ‰íœ—pj

+//Leave request from the server (for delete character)

 int inter_party_leave(int party_id,int account_id, int char_id)

 {

 	return mapif_parse_PartyLeave(-1,party_id,account_id, char_id);

Index: src/char/char.c

===================================================================

--- src/char/char.c	(revision 16039)

+++ src/char/char.c	(working copy)

@@ -1005,7 +1005,7 @@

 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 26, SQLDT_INT,    &p->guild_id, 0, NULL, NULL)

 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 27, SQLDT_INT,    &p->pet_id, 0, NULL, NULL)

 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 28, SQLDT_INT,    &p->hom_id, 0, NULL, NULL)

-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 29, SQLDT_INT,	&p->ele_id, 0, NULL, NULL)	   

+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 29, SQLDT_INT,	&p->ele_id, 0, NULL, NULL)

 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 30, SQLDT_SHORT,  &p->hair, 0, NULL, NULL)

 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 31, SQLDT_SHORT,  &p->hair_color, 0, NULL, NULL)

 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_SHORT,  &p->clothes_color, 0, NULL, NULL)

Index: src/char/int_guild.c

===================================================================

--- src/char/int_guild.c	(revision 16039)

+++ src/char/int_guild.c	(working copy)

@@ -1871,7 +1871,7 @@

 	return 1;

 }

-// ƒT[ƒo[‚©‚ç’E‘Þ—v‹iƒLƒƒƒ‰íœ—pj

+// processes a mapserver connection event

 int inter_guild_leave(int guild_id, int account_id, int char_id)

 {

 	return mapif_parse_GuildLeave(-1, guild_id, account_id, char_id, 0, "** Character Deleted **");

Index: src/char/int_elemental.c

===================================================================

--- src/char/int_elemental.c	(revision 16039)

+++ src/char/int_elemental.c	(working copy)

@@ -20,9 +20,9 @@

 	if( ele->elemental_id == 0 ) { // Create new DB entry

 		if( SQL_ERROR == Sql_Query(sql_handle,

-								   "INSERT INTO `elemental` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`life_time`)"

-								   "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%u')",

-								   ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->str, ele->agi, ele->vit, ele->int_, ele->dex, ele->luk, ele->life_time) )

+			"INSERT INTO `elemental` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`life_time`)"

+			"VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%u')",

+			ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->str, ele->agi, ele->vit, ele->int_, ele->dex, ele->luk, ele->life_time) )

 		{

 			Sql_ShowDebug(sql_handle);

 			flag = false;

@@ -30,11 +30,11 @@

 		else

 			ele->elemental_id = (int)Sql_LastInsertId(sql_handle);

 	} else if( SQL_ERROR == Sql_Query(sql_handle,

-									"UPDATE `elemental` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d',"

-									"`max_hp` = '%d', `max_sp` = '%d', `str` = '%d', `agi` = '%d', `vit` = '%d', `int` = '%d', `dex` = '%d',"

-									"`luk` = '%d', `life_time` = '%u' WHERE `ele_id` = '%d'",

-									ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->str, ele->agi,

-									ele->vit, ele->int_, ele->dex, ele->luk, ele->life_time, ele->elemental_id) )

+		"UPDATE `elemental` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d',"

+		"`max_hp` = '%d', `max_sp` = '%d', `str` = '%d', `agi` = '%d', `vit` = '%d', `int` = '%d', `dex` = '%d',"

+		"`luk` = '%d', `life_time` = '%u' WHERE `ele_id` = '%d'",

+		ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->str, ele->agi,

+		ele->vit, ele->int_, ele->dex, ele->luk, ele->life_time, ele->elemental_id) )

 	{ // Update DB entry

 		Sql_ShowDebug(sql_handle);

 		flag = false;

@@ -44,23 +44,23 @@

 bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) {

 	char* data;

-	

+

 	memset(ele, 0, sizeof(struct s_elemental));

 	ele->elemental_id = ele_id;

 	ele->char_id = char_id;

-	

+

 	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `class`, `mode`, `hp`, `sp`, `max_hp`, `max_sp`, `str`, `agi`, `vit`, `int`, `dex`,"

-							   "`luk`, `life_time` FROM `elemental` WHERE `ele_id` = '%d' AND `char_id` = '%d'",

+		"`luk`, `life_time` FROM `elemental` WHERE `ele_id` = '%d' AND `char_id` = '%d'",

 							   ele_id, char_id) ) {

 		Sql_ShowDebug(sql_handle);

 		return false;

 	}

-	

+

 	if( SQL_SUCCESS != Sql_NextRow(sql_handle) ) {

 		Sql_FreeResult(sql_handle);

 		return false;

 	}

-	

+

 	Sql_GetData(sql_handle,  0, &data, NULL); ele->class_ = atoi(data);

 	Sql_GetData(sql_handle,  1, &data, NULL); ele->mode = atoi(data);

 	Sql_GetData(sql_handle,  2, &data, NULL); ele->hp = atoi(data);

@@ -86,7 +86,7 @@

 		Sql_ShowDebug(sql_handle);

 		return false;

 	}

-	

+

 	return true;

 }

@@ -94,7 +94,7 @@

 static void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag) {

 	int size = sizeof(struct s_elemental) + 5;

-	

+

 	WFIFOHEAD(fd,size);

 	WFIFOW(fd,0) = 0x387c;

 	WFIFOW(fd,2) = size;

@@ -150,7 +150,7 @@

  *------------------------------------------*/

 int inter_elemental_parse_frommap(int fd) {

 	unsigned short cmd = RFIFOW(fd,0);

-	

+

 	switch( cmd ) {

 		case 0x307c: mapif_parse_elemental_create(fd, (struct s_elemental*)RFIFOP(fd,4)); break;

 		case 0x307d: mapif_parse_elemental_load(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6)); break;

Index: src/map/script.c

===================================================================

--- src/map/script.c	(revision 16039)

+++ src/map/script.c	(working copy)

@@ -5691,10 +5692,10 @@

  *------------------------------------------*/

 BUILDIN_FUNC(countitem2)

 {

-	int nameid, iden, ref, attr, c1, c2, c3, c4;

 	int count = 0;

 	int i;

 	struct item_data* id = NULL;

+    struct item tmp_it;

 	struct script_data* data;

 	TBL_PC* sd = script_rid2sd(st);

@@ -5722,22 +5723,19 @@

 		return 1;

 	}

-	nameid = id->nameid;

-	iden = script_getnum(st,3);

-	ref  = script_getnum(st,4);

-	attr = script_getnum(st,5);

-	c1 = (short)script_getnum(st,6);

-	c2 = (short)script_getnum(st,7);

-	c3 = (short)script_getnum(st,8);

-	c4 = (short)script_getnum(st,9);

+	tmp_it.nameid = id->nameid;

+	tmp_it.identify = script_getnum(st,3);

+	tmp_it.refine  = script_getnum(st,4);

+	tmp_it.attribute = script_getnum(st,5);

+	tmp_it.card[0] = (short)script_getnum(st,6);

+	tmp_it.card[1] = (short)script_getnum(st,7);

+	tmp_it.card[2] = (short)script_getnum(st,8);

+	tmp_it.card[3] = (short)script_getnum(st,9);

 	for(i = 0; i < MAX_INVENTORY; i++)

-		if (sd->status.inventory[i].nameid > 0 && sd->inventory_data[i] != NULL &&

-			sd->status.inventory[i].amount > 0 && sd->status.inventory[i].nameid == nameid &&

-			sd->status.inventory[i].identify == iden && sd->status.inventory[i].refine == ref &&

-			sd->status.inventory[i].attribute == attr && sd->status.inventory[i].card[0] == c1 &&

-			sd->status.inventory[i].card[1] == c2 && sd->status.inventory[i].card[2] == c3 &&

-			sd->status.inventory[i].card[3] == c4

+		if ( (&sd->status.inventory[i] != NULL)

+                        && sd->status.inventory[i].amount > 0 

+                        && compare_item(&sd->status.inventory[i],&tmp_it,1)

 		)

 			count += sd->status.inventory[i].amount;

@@ -6608,7 +6606,7 @@

 	return 0;

 }

 /*==========================================

- *Žw’èID‚ÌPT–ŒŽæ“Ÿ

+ * return the name of a partyid

  *------------------------------------------*/

 BUILDIN_FUNC(getpartyname)

 {

@@ -9295,7 +9293,8 @@

 }

 /*==========================================

- * ó‘Ԉُí‘ϐ«‚ðŒvŽZ‚µ‚œŠm—Š‚ð•Ô‚·

+ * To get rate of a sc type, actually I don't really get it since we returning tick but oh well..

+ * @TODO that fonction doesn't take an consideration last status_change_start altering so...

  *------------------------------------------*/

 BUILDIN_FUNC(getscrate)

 {

@@ -9838,7 +9837,9 @@

 }

 /*==========================================

- * RID‚̃Aƒ^ƒbƒ`

+ * Attach un joueurs au script, st.rid 

+ * Permet a un script d'executer des actions

+ * requierant un joueur autrement que par contact direct.

  *------------------------------------------*/

 BUILDIN_FUNC(attachrid)

 {

Index: src/map/elemental.c

===================================================================

--- src/map/elemental.c	(revision 16039)

+++ src/map/elemental.c	(working copy)

@@ -255,7 +255,7 @@

 				if( bl ) status_change_end(bl,type,INVALID_TIMER);

 				break;

 			default:

-				ShowWarning("Invalid SC=%d in elemental_clean_single_effect\n",type);

+				ShowWarning("Invalide SC=%d in elemental_clean_single_effect\n",type);

 				break;

 		}

 	}

@@ -349,7 +349,7 @@

 	if( elemental_skillnotok(skillnum, ed) )

 		return 0;

-	

+

 	if( ed->ud.skilltimer != INVALID_TIMER )

 		return 0;

 	else if( DIFF_TICK(tick, ed->ud.canact_tick) < 0 )

@@ -413,7 +413,7 @@

 	if( elemental_skillnotok(skillnum, ed) )

 		return 0;

-	

+

 	if( ed->ud.skilltimer != INVALID_TIMER )

 		return 0;

 	else if( DIFF_TICK(gettick(), ed->ud.canact_tick) < 0 )

@@ -566,10 +566,10 @@

 		return 0;

 	ed->last_thinktime = tick;

-	

+

 	if( ed->ud.skilltimer != INVALID_TIMER )

 		return 0;

-	

+

 	if( ed->ud.walktimer != INVALID_TIMER && ed->ud.walkpath.path_pos <= 2 )

 		return 0; //No thinking when you just started to walk.

@@ -612,7 +612,8 @@

 			return 1;

 		}

-		if( battle_check_range(&ed->bl,target,ed->db->range2) && rnd()%100 < 2 ) { // 2% chance to cast attack skill.

+		if( battle_check_range(&ed->bl,target,view_range) && rnd()%100 < 2 ) // 2% chance to cast attack skill.

+		{

 			if(	elemental_action(ed,target,tick) )

 				return 1;

 		}

@@ -643,7 +644,7 @@

 	return 0;

 }

-static int elemental_ai_timer(int tid, unsigned int tick, int id, intptr data) {

+static int elemental_ai_timer(int tid, unsigned int tick, int id, intptr_t data) {

 	map_foreachpc(elemental_ai_sub_foreachclient,tick);

 	return 0;

Index: src/map/atcommand.h

===================================================================

--- src/map/atcommand.h	(revision 16039)

+++ src/map/atcommand.h	(working copy)

@@ -4,6 +4,7 @@

 #ifndef _ATCOMMAND_H_

 #define _ATCOMMAND_H_

+//#include "map.h"

 struct map_session_data;

 //This is the distance at which @autoloot works,

Index: src/map/battle.c

===================================================================

--- src/map/battle.c	(revision 16039)

+++ src/map/battle.c	(working copy)

@@ -105,6 +105,7 @@

 		case BL_HOM: return ((struct homun_data*)bl)->ud.target;

 		case BL_MER: return ((struct mercenary_data*)bl)->ud.target;

 		case BL_ELEM: return ((struct elemental_data*)bl)->ud.target;

+		default: break; //unhandled type

 	}

 	return 0;

 }

@@ -145,6 +146,7 @@

 		c = 23;

 	return bl_list[rnd()%c];

 }

+

 static int battle_getenemyarea_sub(struct block_list *bl, va_list ap)

 {

 	struct block_list **bl_list, *src;

@@ -183,7 +185,7 @@

 	return bl_list[rnd()%c];

 }

-// ƒ_??[ƒW‚Ì’x‰„

+// ï¿œ_??[ï¿œWￜ̒xￜￜ

 struct delay_damage {

 	struct block_list *src;

 	int target;

@@ -266,6 +268,7 @@

 	return 0;

 }

+

 int battle_attr_ratio(int atk_elem,int def_type, int def_lv)

 {

@@ -340,7 +343,8 @@

 }

 /*==========================================

- * ƒ_??[ƒW??IŒvŽZ

+ * Main battle_calc function

+ * primary call

  *------------------------------------------*/

 int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damage *d,int damage,int skill_num,int skill_lv)

 {

@@ -394,7 +398,7 @@

 				(skill_num && skill_get_ele(skill_num, skill_lv) == ELE_GHOST) ||

 				(!skill_num && (status_get_status_data(src))->rhw.ele == ELE_GHOST)

 					)

-				status_change_end(bl,SC_WHITEIMPRISON,INVALID_TIMER); // Those skills do damage and removes effect

+				status_change_end(bl,SC_WHITEIMPRISON, INVALID_TIMER); // Those skills do damage and removes effect

 			else

 			{

 				d->dmg_lv = ATK_BLOCK;

@@ -468,7 +472,7 @@

 						clif_millenniumshield(sd,sce->val2);

 					sce->val3 = 1000; // Next Shield

 				} else

-					status_change_end(bl,SC_MILLENNIUMSHIELD,INVALID_TIMER); // All shields down

+					status_change_end(bl,SC_MILLENNIUMSHIELD, INVALID_TIMER); // All shields down

 			}

 			return 0;

 		}

@@ -533,9 +537,8 @@

 		}

 		//Now damage increasing effects

-		if( sc->data[SC_AETERNA] && skill_num != PF_SOULBURN )

-		{

-			if( src->type != BL_MER || skill_num == 0 )

+		if (sc->data[SC_AETERNA] && skill_num != PF_SOULBURN) {

+			if (src->type != BL_MER || skill_num == 0)

 				damage <<= 1; // Lex Aeterna only doubles damage of regular attacks from mercenaries

 			if( skill_num != ASC_BREAKER || !(flag&BF_WEAPON) )

@@ -556,11 +559,11 @@

 			if( sc->data[SC_DEEPSLEEP] ) {

 				damage += damage / 2; // 1.5 times more damage while in Deep Sleep.

-				status_change_end(bl,SC_DEEPSLEEP,INVALID_TIMER);

+				status_change_end(bl,SC_DEEPSLEEP, INVALID_TIMER);

 			}

 			if( sc->data[SC_VOICEOFSIREN] )

-				status_change_end(bl,SC_VOICEOFSIREN,INVALID_TIMER);

+				status_change_end(bl,SC_VOICEOFSIREN, INVALID_TIMER);

 		}

@@ -900,7 +903,7 @@

 }

 /*==========================================

- * HP/SP‹zŽû‚ÌŒvŽZ

+ * HP/SP drain calculation

  *------------------------------------------*/

 static int battle_calc_drain(int damage, int rate, int per)

 {

@@ -919,7 +922,7 @@

 }

 /*==========================================

- * ?C—ûƒ_??[ƒW

+ * Passif skill dammages increases

  *------------------------------------------*/

 int battle_addmastery(struct map_session_data *sd,struct block_list *target,int dmg,int type)

 {

@@ -1024,6 +1027,7 @@

 	return damage;

 }

+

 /*==========================================

  * Calculates the standard damage of a normal attack assuming it hits,

  * it calculates nothing extra fancy, is needed for magnum break's WATK_ELEMENT bonus. [Skotlex]

@@ -1607,7 +1611,8 @@

 						sd->inventory_data[index] &&

 						sd->inventory_data[index]->type == IT_ARMOR)

 						ATK_ADD(sd->inventory_data[index]->weight/10);

-				} else

+				}

+				else

 					ATK_ADD(sstatus->rhw.atk2); //Else use Atk2

 				break;

 			case HFLI_SBR44:	//[orn]

@@ -2303,7 +2308,7 @@

 							case 13261: // Coconut Bomb

 							case 13262: // Melon Bomb

 							case 13263: // Pinapple Bomb

-								skillratio += 400;	// Unconfirded

+								skillratio += 400;	// Unconfirmed

 								break;

 							case 13264: // Banana Bomb 2000%

 								skillratio += 1900;

@@ -3703,7 +3700,7 @@

 }

 /*==========================================

- * ‚»‚Ì‘Œƒ_??[ƒWŒvŽZ

+ * Calcule les degat d'une attaque Misc selon le skill

  *------------------------------------------*/

 struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag)

 {

@@ -4015,7 +4012,7 @@

 	return md;

 }

 /*==========================================

- * ƒ_??[ƒWŒvŽZˆêŠ‡?ˆ—?—p

+ *

  *------------------------------------------*/

 struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int count)

 {

@@ -4072,7 +4069,7 @@

 					rd1 = min(damage,status_get_max_hp(bl)) * sc->data[SC_DEATHBOUND]->val2 / 100; // Amplify damage.

 					*dmg = rd1 * 30 / 100; // Received damge = 30% of amplifly damage.

 					clif_skill_damage(src,bl,gettick(), status_get_amotion(src), 0, -30000, 1, RK_DEATHBOUND, sc->data[SC_DEATHBOUND]->val1,6);

-					status_change_end(bl,SC_DEATHBOUND,INVALID_TIMER);

+					status_change_end(bl,SC_DEATHBOUND, INVALID_TIMER);

 					rdamage += rd1;

 					if (rdamage < 1) rdamage = 1;

 				}

@@ -4142,6 +4139,7 @@

 	if (rhp || rsp)

 		status_zap(tbl, rhp, rsp);

 }

+

 // Deals the same damage to targets in area. [pakpil]

 int battle_damage_area( struct block_list *bl, va_list ap) {

 	unsigned int tick;

@@ -4172,8 +4170,9 @@

 	return 0;

 }

+

 /*==========================================

- * ’Ê??UŒ‚?ˆ—?‚Ü‚Æ‚ß

+ * 

  *------------------------------------------*/

 enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* target, unsigned int tick, int flag) {

 	struct map_session_data *sd = NULL, *tsd = NULL;

@@ -4240,13 +4239,13 @@

 			}

 		}

 	}

+        if(sc && sc->count){

+            if (sc->data[SC_CLOAKING] && !(sc->data[SC_CLOAKING]->val4&2))

+                    status_change_end(src, SC_CLOAKING, INVALID_TIMER);

-	if (sc && sc->data[SC_CLOAKING] && !(sc->data[SC_CLOAKING]->val4&2))

-		status_change_end(src, SC_CLOAKING, INVALID_TIMER);

-		

-	if (sc && sc->data[SC_CLOAKINGEXCEED] && !(sc->data[SC_CLOAKINGEXCEED]->val4&2))

-		status_change_end(src, SC_CLOAKINGEXCEED, INVALID_TIMER);

-

+            if (sc->data[SC_CLOAKINGEXCEED] && !(sc->data[SC_CLOAKINGEXCEED]->val4&2))

+                    status_change_end(src,SC_CLOAKINGEXCEED,INVALID_TIMER);

+        }

 	if( tsc && tsc->data[SC_AUTOCOUNTER] && status_check_skilluse(target, src, KN_AUTOCOUNTER, 1) )

 	{

 		int dir = map_calc_dir(target,src->x,src->y);

@@ -4289,8 +4288,9 @@

 			return ATK_MISS;

 		}

 	}

-

-	if (sc) {

+	

+	if (sc && sc->count)

+	{

 		if (sc->data[SC_SACRIFICE]) {

 			int skilllv = sc->data[SC_SACRIFICE]->val1;

 			damage_lv ret_val;

@@ -4502,6 +4502,10 @@

 				status_change_end(target, SC_POISONREACT, INVALID_TIMER);

 		}

 	}

+        if (sc && sc->data[SC_CAMOUFLAGE] && !(sc->data[SC_CAMOUFLAGE]->val3&2)){ //moved so basic attack get critical bonus

+		status_change_end(src,SC_CAMOUFLAGE,INVALID_TIMER);

+        }

+        

 	map_freeblock_unlock();

 	return wd.dmg_lv;

 }

@@ -4554,6 +4558,7 @@

 				if (((TBL_SKILL*)src)->group && ((TBL_SKILL*)src)->group->src_id)

 					src = map_id2bl(((TBL_SKILL*)src)->group->src_id);

 				break;

+			default: break; //other type doesn't have master (recursive check so don't showwarning)

 		}

 	} while (src && src != prev);

 	return prev;

@@ -4695,9 +4700,9 @@

 			int inf2 = 0;

 			if (!su->group)

 				return 0;

+			inf2 = skill_get_inf2(su->group->skill_id);

 			if( battle_config.vs_traps_bctall && (target->type&battle_config.vs_traps_bctall) &&

-				(inf2 = skill_get_inf2(su->group->skill_id))&INF2_TRAP &&

-					map_flag_vs(src->m) )

+				inf2&INF2_TRAP && map_flag_vs(src->m) )

 				return 1;//traps may target everyone

 			if (su->group->src_id == target->id) {

 				if (inf2&INF2_NO_TARGET_SELF)

@@ -4707,6 +4712,7 @@

 			}

 			break;

 		}

+		default: break; //unhandle others

 	}

 	switch( s_bl->type )

@@ -4847,7 +4853,7 @@

 	return (flag&state)?1:-1;

 }

 /*==========================================

- * ŽË’ö”»’è

+ * ￜ˒ￜￜￜￜￜ

  *------------------------------------------*/

 bool battle_check_range(struct block_list *src, struct block_list *bl, int range)

 {

Index: src/map/skill.c

===================================================================

--- src/map/skill.c	(revision 16039)

+++ src/map/skill.c	(working copy)

@@ -781,7 +781,7 @@

 						rate += rate*sc->data[SC_SKILLRATE_UP]->val2/100;

 						status_change_end(src, SC_SKILLRATE_UP, INVALID_TIMER);

 					}

-					sc_start4(src,SC_COMBO, rate, TK_COUNTER, bl->id,0,0,

+					sc_start2(src,SC_COMBO, rate, TK_COUNTER, bl->id,

 						(2000 - 4*sstatus->agi - 2*sstatus->dex));

 				}

 			}

@@ -795,7 +795,7 @@

 					skill_get_time2(AS_ENCHANTPOISON,sce->val1),0);

 			// Enchant Deadly Poison gives a chance to deadly poison attacked enemies

 			if((sce=sc->data[SC_EDP]))

-				sc_start4(bl,SC_DPOISON,sce->val2, sce->val1,0,0,0,

+				sc_start(bl,SC_DPOISON,sce->val2, sce->val1,

 					skill_get_time2(ASC_EDP,sce->val1));

 		}

 	}

@@ -1268,7 +1268,7 @@

 		if( dstsd )

 			skill_addtimerskill(src,tick+status_get_amotion(src),bl->id,0,0,skillid,skilllv,BF_WEAPON,0);

 		else if( dstmd && !is_boss(bl) )

-			sc_start(bl, SC_STUN, 100, skilllv, 1000 + 1000 * (rnd() %3));

+			sc_start(bl, SC_STUN, 100, skilllv, 1000 + 1000 * (rnd()%3));

 		break;

 	case SR_GENTLETOUCH_QUIET:

 		sc_start(bl, SC_SILENCE, 2 * skilllv, skilllv, skill_get_time(skillid, skilllv));

@@ -1331,7 +1331,7 @@

 					sc_start(bl, SC_MELON_BOMB, 100, skilllv, skill_get_time(GN_SLINGITEM, skilllv));	// Reduces ASPD and moviment speed

 					break;

 				case 13264:

-					sc_start(bl, SC_BANANA_BOMB, 100, skilllv, skill_get_time(GN_SLINGITEM, skilllv));	// Reduces LUK À?Needed confirm it, may be it's bugged in kRORE?

+					sc_start(bl, SC_BANANA_BOMB, 100, skilllv, skill_get_time(GN_SLINGITEM, skilllv));	// Reduces LUK ￜ?Needed confirm it, may be it's bugged in kRORE?

 					sc_start(bl, SC_BANANA_BOMB_SITDOWN, 75, skilllv, skill_get_time(GN_SLINGITEM_RANGEMELEEATK,skilllv)); // Sitdown for 3 seconds.

 					break;

 			}

@@ -2031,10 +2031,16 @@

 			break;

 		case BL_SKILL:

 			su = (struct skill_unit *)target;

-			if( su && su->group && (su->group->unit_id == UNT_ANKLESNARE || su->group->unit_id == UNT_ELECTRICSHOCKER

-				|| su->group->unit_id == UNT_CLUSTERBOMB || su->group->unit_id == UNT_REVERBERATION) )

-				return 0; // ankle snare, electricshocker, clusterbomb, reverberation cannot be knocked back

+			if( su && su->group)

+                            switch(su->group->unit_id){  //defined trap that cannot be knocked back

+                                case UNT_ANKLESNARE:     //allow easier modification [Lighta], @TODO set up an flag on skill_unit_db for that        

+                                case UNT_ELECTRICSHOCKER:

+                              //  case UNT_CLUSTERBOMB: //http://irowiki.org/wiki/Bomb_Cluster

+                                case UNT_REVERBERATION:

+				return 0;

+                            }

 			break;

+		default : break; //unhandled type

 	}

 	if (direction == -1) // <optimized>: do the computation here instead of outside

@@ -2104,7 +2110,7 @@

 	struct map_session_data *sd, *tsd;

 	int type,damage,rdamage=0;

-	if(skillid > 0 && skilllv <= 0) return 0;

+	if( skillid > 0 && skilllv <= 0 ) return 0; // Invalid skill id or level.

 	nullpo_ret(src);	//Source is the master behind the attack (player/mob/pet)

 	nullpo_ret(dsrc); //dsrc is the actual originator of the damage, can be the same as src, or a skill casted by src.

@@ -2674,12 +2680,12 @@

 }

 /*==========================================

- * ƒXƒLƒ‹”Í??U?—p(map_foreachinarea‚©‚çŒÄ‚΂ê‚é)

- * flag‚ɂ‚¢‚Ä?F16?i?‚ðŠm”F

+ * ï¿œXï¿œLￜￜￜￜ??U?ï¿œp(map_foreachinareaￜￜￜￜĂ΂ￜￜ)

+ * flagￜɂ‚ￜￜￜ?F16?i?ￜￜￜmï¿œF

  * MSB <- 00fTffff ->LSB

- *	T	=ƒ^?ƒQƒbƒg‘I?—p(BCT_*)

- *  ffff=Ž©—R‚ÉŽg—p‰Â”\

- *  0	=—\–ñ?B0‚ɌŒè

+ *	T	=ￜ^?ￜQￜbￜgￜI?ￜp(BCT_*)

+ *  ffff=ￜￜￜRￜɎgï¿œpￜ”\

+ *  0	=ï¿œ\ￜￜ?B0ￜɌŒￜ

  *------------------------------------------*/

 typedef int (*SkillFunc)(struct block_list *, struct block_list *, int, int, unsigned int, int);

 int skill_area_sub (struct block_list *bl, va_list ap)

@@ -2878,6 +2884,7 @@

 	{

 		case BL_HOM: sd = ((TBL_HOM*)bl)->master; break;

 		case BL_MER: sd = ((TBL_MER*)bl)->master; break;

+		default : break; //unhandled type

 	}

 	status = status_get_status_data(bl);

@@ -3104,10 +3111,10 @@

 							if( j )

 							{

 								i = applyeffects[rnd()%j];

-								status_change_start(target, i, 10000, skl->skill_lv,

+								sc_start4(target, i, 100, skl->skill_lv,

 									(i == SC_BURNING ? 1000 : 0),

 									(i == SC_BURNING ? src->id : 0),

-									0, skill_get_time(WL_TETRAVORTEX,skl->skill_lv), 0);

+									0, skill_get_time(WL_TETRAVORTEX,skl->skill_lv) );

 							}

 						}

 					}

@@ -3127,9 +3134,11 @@

 					break;

 				case LG_MOONSLASHER:

 				case SR_WINDMILL:

-					if( target->type == BL_PC ) {

-						struct map_session_data *tsd = NULL;

-						if( (tsd = ((TBL_PC*)target)) && !pc_issit(tsd) ) {

+					if( target->type == BL_PC )

+					{

+						TBL_PC *tsd = BL_CAST(BL_PC,target);

+						if( tsd && !pc_issit(tsd) )

+						{

 							pc_setsit(tsd);

 							skill_sit(tsd,1);

 							clif_sitting(&tsd->bl);

@@ -3229,6 +3238,7 @@

 	}

 	return 1;

 }

+

 static int skill_ative_reverberation( struct block_list *bl, va_list ap) {

 	struct skill_unit *su = (TBL_SKILL*)bl;

 	struct skill_unit_group *sg;

@@ -4155,7 +4165,7 @@

 				if( j == 0 )

 				{ // No Spheres

-					clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);

+					clif_skill_fail(sd,skillid,USESKILL_FAIL_SUMMON_NONE,0);

 					break;

 				}

@@ -4241,6 +4251,7 @@

 				sc_start(bl, SC_INFRAREDSCAN, 10000, skilllv, skill_get_time(skillid, skilllv));

 			status_change_end(bl, SC_HIDING, INVALID_TIMER);

 			status_change_end(bl, SC_CLOAKING, INVALID_TIMER);

+            status_change_end(bl, SC_CHASEWALK, INVALID_TIMER);

 			status_change_end(bl, SC_CLOAKINGEXCEED, INVALID_TIMER); // Need confirm it.

 		}

 		else

@@ -4304,20 +4315,26 @@

 		break;

 	case SR_HOWLINGOFLION:

-			status_change_end(bl, SC_SWINGDANCE, INVALID_TIMER);

-			status_change_end(bl, SC_SYMPHONYOFLOVER, INVALID_TIMER);

-			status_change_end(bl, SC_MOONLITSERENADE, INVALID_TIMER);

-			status_change_end(bl, SC_RUSHWINDMILL, INVALID_TIMER);

-			status_change_end(bl, SC_ECHOSONG, INVALID_TIMER);

-			status_change_end(bl, SC_HARMONIZE, INVALID_TIMER);

-			status_change_end(bl, SC_SIRCLEOFNATURE, INVALID_TIMER);

-			status_change_end(bl, SC_SATURDAYNIGHTFEVER, INVALID_TIMER);

-			status_change_end(bl, SC_DANCEWITHWUG, INVALID_TIMER);

-			status_change_end(bl, SC_LERADSDEW, INVALID_TIMER);

-			status_change_end(bl, SC_MELODYOFSINK, INVALID_TIMER);

-			status_change_end(bl, SC_BEYONDOFWARCRY, INVALID_TIMER);

-			status_change_end(bl, SC_UNLIMITEDHUMMINGVOICE, INVALID_TIMER);

+		{

+			struct status_change *tsc = status_get_sc(bl);

+            if(tsc && tsc->count){

+                int i=0;

+                const enum sc_type scs[] = {

+                    SC_SWINGDANCE, SC_SYMPHONYOFLOVER,

+                    SC_MOONLITSERENADE, SC_RUSHWINDMILL, SC_ECHOSONG, SC_HARMONIZE,

+                    SC_DEEPSLEEP, SC_VOICEOFSIREN, SC_SATURDAYNIGHTFEVER, SC_GLOOMYDAY, //Group B

+                    SC_UNLIMITEDHUMMINGVOICE, SC_SONGOFMANA, SC_DANCEWITHWUG, 

+                    SC_BEYONDOFWARCRY, SC_MELODYOFSINK, SC_LERADSDEW, SC_SIRCLEOFNATURE   //Group B Wanderer        

+                };

+                        

+                for (i = 0; i < ARRAYLENGTH(scs); i++){

+                        if(i==SC_SATURDAYNIGHTFEVER) tsc->data[i]->val2=0; //Mark a dispelled berserk to avoid setting hp to 100 by setting hp penalty to 0.

+                        if (tsc->data[scs[i]]) 

+                                status_change_end(bl, scs[i], INVALID_TIMER);

+                }

+            }    

 			skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag);

+		}

 		break;

 	case SR_EARTHSHAKER:

@@ -4346,10 +4363,10 @@

 			struct status_change *tsc = status_get_sc(bl);

 			if( tsc && tsc->data[SC_POISON] ) {

 				skill_attack(skill_get_type(skillid), src, src, bl, skillid, skilllv, tick, flag);

-				status_change_end(bl, SC_POISON, INVALID_TIMER);

+			status_change_end(bl, SC_POISON, INVALID_TIMER);

 			}

 			else if( sd )

-				clif_skill_fail(sd, skillid, 0, 0);

+			clif_skill_fail(sd, skillid, USESKILL_FAIL_LEVEL, 0);

 		}

 		break;

@@ -4417,7 +4434,7 @@

 	case EL_ROCK_CRUSHER:

 		clif_skill_nodamage(src,battle_get_master(src),skillid,skilllv,1);

 		clif_skill_damage(src, src, tick, status_get_amotion(src), 0, -30000, 1, skillid, skilllv, 6);

-		if( rnd()%100 < 50 )

+			if( rnd()%100 < 50 )

 			skill_attack(BF_MAGIC,src,src,bl,skillid,skilllv,tick,flag);

 		else

 			skill_attack(BF_WEAPON,src,src,bl,EL_ROCK_CRUSHER_ATK,skilllv,tick,flag);

@@ -4802,6 +4819,7 @@

 					else switch (src->type) {

 						case BL_MOB: target_id = ((TBL_MOB*)src)->target_id; break;

 						case BL_PET: target_id = ((TBL_PET*)src)->target_id; break;

+						default : break; //unhandled type

 					}

 					if (!target_id)

 						break;

@@ -7454,9 +7472,9 @@

 			if( (tsc && (tsc->data[SC_FREEZE] || tsc->data[SC_STONE] ||

 				tsc->data[SC_BLIND]))&& (rnd()%100 < 30+5*skilllv) )

 			{

-				status_change_end(bl, SC_FREEZE, INVALID_TIMER);

-				status_change_end(bl, SC_STONE, INVALID_TIMER);

-				status_change_end(bl, SC_BLIND, INVALID_TIMER);

+                status_change_end(bl, SC_FREEZE, INVALID_TIMER);

+                status_change_end(bl, SC_STONE, INVALID_TIMER);

+                status_change_end(bl, SC_BLIND, INVALID_TIMER);

 			}

 			// Success rate only applies to the curing effect and not stat bonus.

 			clif_skill_nodamage(bl, bl, skillid, skilllv,

@@ -7740,7 +7758,7 @@

 	case RA_WUGDASH:

 		if( tsce ) {

-			clif_skill_nodamage(src,bl,skillid,skilllv,status_change_end(bl, type, -1));

+			clif_skill_nodamage(src,bl,skillid,skilllv,status_change_end(bl, type, INVALID_TIMER));

 			map_freeblock_unlock();

 			return 0;

 		}

@@ -7830,7 +7848,7 @@

 				clif_skill_nodamage(src,bl,skillid,1,1);

 			}

 			else

-				clif_skill_fail(sd,skillid,0x15,0);

+				clif_skill_fail(sd,skillid,USESKILL_FAIL_GC_WEAPONBLOCKING,0);

 		}

 		break;

@@ -7938,7 +7956,7 @@

 								clif_skill_damage(src,bl,tick, status_get_amotion(src), 0, -30000, 1, skillid, skilllv, 6);

 								if( rate < brate )

 									map_foreachinrange(skill_area_sub,src,skill_get_splash(skillid,skilllv),BL_CHAR,src,skillid,skilllv,tick,flag|BCT_ENEMY|1,skill_castend_damage_id);

-								status_change_end(bl,SC_SHIELDSPELL_DEF,INVALID_TIMER);

+								status_change_end(bl,SC_SHIELDSPELL_DEF, INVALID_TIMER);

 								break;

 							case 2:

 								val = 10 * shield_data->def; // % Reflected damage.

@@ -8039,6 +8057,7 @@

 			clif_skill_nodamage(bl,src,skillid,skilllv,

 				sc_start(bl, type, 100, skilllv, skill_get_time(skillid, skilllv)));

 		break;

+

 	case SR_CURSEDCIRCLE:

 		if( flag&1 ) {

 			if( is_boss(bl) ) break;

@@ -8204,7 +8223,7 @@

 				status_fix_damage(src,bl,9999,clif_damage(src,bl,tick,0,0,9999,0,0,0));

 		} else if( sd ) {

 			if( !sd->status.party_id ) {

-				clif_skill_fail(sd,skillid,0x11,0);

+				clif_skill_fail(sd,skillid,USESKILL_FAIL_NEED_HELPER,0);

 				break;

 			}

 			if( map_foreachinrange(skill_area_sub, bl, skill_get_splash(skillid,skilllv),

@@ -8281,6 +8300,7 @@

 					else switch (src->type) {

 						case BL_MOB: target_id = ((TBL_MOB*)src)->target_id; break;

 						case BL_PET: target_id = ((TBL_PET*)src)->target_id; break;

+						default : break; //unhandled type

 					}

 					if (!target_id)

 						break;

@@ -8355,12 +8375,12 @@

 			// Remove previous elemental fisrt.

 			if( sd->ed && elemental_delete(sd->ed,0) ) {

-				clif_skill_fail(sd,skillid,0,0);

+				clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);

 				break;

 			}

 			// Summoning the new one.

 			if( !elemental_create(sd,elemental_class,skill_get_time(skillid,skilllv)) ) {

-				clif_skill_fail(sd,skillid,0,0);

+				clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);

 				break;

 			}

 			clif_skill_nodamage(src,bl,skillid,skilllv,1);

@@ -8371,12 +8391,12 @@

 		if( sd ) {

 			int mode = EL_MODE_PASSIVE;	// Standard mode.

 			if( !sd->ed ) {

-				clif_skill_fail(sd,skillid,0,0);

+				clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);

 				break;

 			}

 			if( skilllv == 4 ) {// At level 4 delete elementals.

 				if( elemental_delete(sd->ed, 0) )

-					clif_skill_fail(sd,skillid,0,0);

+					clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);

 				break;

 			}

 			switch( skilllv ) {// Select mode bassed on skill level used.

@@ -8385,7 +8405,7 @@

 				case 3: mode = EL_MODE_AGGRESSIVE; break;

 			}

 			if( !elemental_change_mode(sd->ed,mode) ) {

-				clif_skill_fail(sd,skillid,0,0);

+				clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);

 				break;

 			}

 			clif_skill_nodamage(src,bl,skillid,skilllv,1);

@@ -8407,11 +8427,11 @@

 			int s_hp = sd->battle_status.hp * 10 / 100, s_sp = sd->battle_status.sp * 10 / 100;

 			int e_hp, e_sp;

 			if( !ed ) {

-				clif_skill_fail(sd,skillid,0,0);

+				clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);

 				break;

 			}

 			if( !status_charge(&sd->bl,s_hp,s_sp) ) {

-				clif_skill_fail(sd,skillid,0,0);

+				clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);

 				break;

 			}

 			e_hp = ed->battle_status.max_hp * 10 / 100;

@@ -8434,7 +8454,7 @@

 			clif_skill_nodamage(src, bl, skillid, skilllv, 1);

 			sc_start2(bl, type, 100, skilllv, src->id, skill_get_time(skillid,skilllv));

 		} else if( sd ) {

-			clif_skill_fail(sd, skillid, 0, 0);

+			clif_skill_fail(sd, skillid, USESKILL_FAIL_LEVEL, 0);

 			break;

 		}

 		break;

@@ -8466,7 +8486,7 @@

 					else

 						skill_attack(BF_WEAPON,src,src,bl,GN_SLINGITEM_RANGEMELEEATK,skilllv,tick,flag);

 				} else //Otherwise, it fails, shows animation and removes items.

-					clif_skill_fail(sd,GN_SLINGITEM_RANGEMELEEATK,0xa,0);

+					clif_skill_fail(sd,GN_SLINGITEM_RANGEMELEEATK,USESKILL_FAIL,0);

 			} else {

 				struct script_code *script = sd->inventory_data[i]->script;

 				if( !script )

@@ -9617,7 +9637,7 @@

 	case LG_BANDING:

 		if( sc && sc->data[SC_BANDING] )

-			status_change_end(src,SC_BANDING,INVALID_TIMER);

+			status_change_end(src,SC_BANDING, INVALID_TIMER);

 		else if( (sg = skill_unitsetting(src,skillid,skilllv,src->x,src->y,0)) != NULL ) {

 			sc_start4(src,SC_BANDING,100,skilllv,0,0,sg->group_id,skill_get_time(skillid,skilllv));

 			if( sd ) pc_banding(sd,skilllv);

@@ -9686,7 +9706,7 @@

 			}

 		}

 		break;

-		

+

 	case SO_FIREWALK:

 	case SO_ELECTRICWALK:

 		if( sc && sc->data[type] )

@@ -11075,8 +11095,8 @@

 				// Reveal hidden players every 5 seconds.

 				if( sg->val2 % 5 == 0 ) {

 					// TODO: check if other hidden status can be removed.

-					status_change_end(bl,SC_HIDING,INVALID_TIMER);

-					status_change_end(bl,SC_CLOAKING,INVALID_TIMER);

+					status_change_end(bl,SC_HIDING, INVALID_TIMER);

+					status_change_end(bl,SC_CLOAKING, INVALID_TIMER);

 				}

 			}

 			/* Enable this if kRO fix the current skill. Currently no damage on undead and demon monster. [Jobbie]

@@ -12186,7 +12206,7 @@

 		case SC_MANHOLE:

 		case SC_DIMENSIONDOOR:

 			if( sc && sc->data[SC_MAGNETICFIELD] ) {

-				clif_skill_fail(sd,skill,0,0);

+			clif_skill_fail(sd,skill,USESKILL_FAIL_LEVEL,0);

 				return 0;

 			}

 			break;

@@ -12194,7 +12214,7 @@

 				int count;

 				count = skill_check_pc_partner(sd, skill, &lv, skill_get_splash(skill,lv), 0);

 				if( count < 1 ) {

-					clif_skill_fail(sd,skill,0x11,0);

+				clif_skill_fail(sd,skill,USESKILL_FAIL_NEED_HELPER,0);

 					return 0;

 				} else

 					require.sp -= require.sp * 20 * count / 100; //  -20% each W/M in the party.

@@ -12204,19 +12224,19 @@

 		case SO_ELECTRICWALK:	// Can't be casted until you've walked all cells.

 			if( sc && sc->data[SC_PROPERTYWALK] &&

 			   sc->data[SC_PROPERTYWALK]->val3 < skill_get_maxcount(sc->data[SC_PROPERTYWALK]->val1,sc->data[SC_PROPERTYWALK]->val2) ) {

-				clif_skill_fail(sd,skill,0x0,0);

+			clif_skill_fail(sd,skill,USESKILL_FAIL_LEVEL,0);

 				return 0;

 			}

 			break;

 		case SO_EL_CONTROL:

 			if( !sd->status.ele_id || !sd->ed ) {

-				clif_skill_fail(sd,skill,0x00,0);

+			clif_skill_fail(sd,skill,USESKILL_FAIL_LEVEL,0);

 				return 0;

 			}

 			break;

 		case RETURN_TO_ELDICASTES:

 			if( sd->sc.option&OPTION_MADOGEAR ) { //Cannot be used if Mado is equipped.

-				clif_skill_fail(sd,skill,0,0);

+			clif_skill_fail(sd,skill,USESKILL_FAIL_LEVEL,0);

 				return 0;

 			}

 			break;			

@@ -14251,7 +14271,7 @@

 				struct status_change *sc = NULL;

 				if( (sc = status_get_sc(src)) != NULL && sc->data[SC_NEUTRALBARRIER_MASTER] ) {

 					sc->data[SC_NEUTRALBARRIER_MASTER]->val2 = 0;

-					status_change_end(src,SC_NEUTRALBARRIER_MASTER,INVALID_TIMER);

+					status_change_end(src,SC_NEUTRALBARRIER_MASTER, INVALID_TIMER);

 				}

 			}

 			break;

@@ -14260,7 +14280,7 @@

 				struct status_change *sc = NULL;

 				if( (sc = status_get_sc(src)) != NULL && sc->data[SC_STEALTHFIELD_MASTER] ) {

 					sc->data[SC_STEALTHFIELD_MASTER]->val2 = 0;

-					status_change_end(src,SC_STEALTHFIELD_MASTER,INVALID_TIMER);

+					status_change_end(src,SC_STEALTHFIELD_MASTER, INVALID_TIMER);

 				}

 			}

 			break;

@@ -14269,7 +14289,7 @@

 				struct status_change *sc = NULL;

 				if( (sc = status_get_sc(src)) && sc->data[SC_BANDING] ) {

 					sc->data[SC_BANDING]->val4 = 0;

-					status_change_end(src,SC_BANDING,INVALID_TIMER);

+					status_change_end(src,SC_BANDING, INVALID_TIMER);

 				}

 			}

 			break;

@@ -15318,7 +15338,7 @@

 					break;

 				case GN_MAKEBOMB:

 				case GN_MIX_COOKING:

-					clif_msg_skill(sd,skill_id,0x627);

+					clif_msg_skill(sd,skill_id,1);

 					break;

 				case GN_S_PHARMACY:

 					break;	// No effects here.					

@@ -15387,13 +15407,13 @@

 						clif_additem(sd,0,0,flag);

 						map_addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0);

 					}

-					clif_msg_skill(sd,skill_id,0x628);

+					clif_msg_skill(sd,skill_id,2);

 				}

 				break;

 			case GN_S_PHARMACY:

 				break;	// No effects here.

 			case GN_MAKEBOMB:

-				clif_msg_skill(sd,skill_id,0x628);

+				clif_msg_skill(sd,skill_id,2);

 				break;				

 			default:

 				if( skill_produce_db[idx].itemlv > 10 && skill_produce_db[idx].itemlv <= 20 )

@@ -15591,10 +15611,10 @@

 	return 1;

 }

+

 int skill_select_menu(struct map_session_data *sd,int flag,int skill_id) {

 	int id, lv, prob, aslvl = 0;

 	nullpo_ret(sd);

-	

 	if (sd->sc.data[SC_STOP]) {

 		aslvl = sd->sc.data[SC_STOP]->val1;

 		status_change_end(&sd->bl,SC_STOP,INVALID_TIMER);

@@ -15612,6 +15632,7 @@

 	sc_start4(&sd->bl,SC__AUTOSHADOWSPELL,100,id,lv,prob,0,skill_get_time(SC_AUTOSHADOWSPELL,aslvl));

 	return 0;

 }

+

 int skill_elementalanalysis(struct map_session_data* sd, int n, int skill_lv, unsigned short* item_list) {

 	int i;

@@ -15631,7 +15652,7 @@

 		if( skill_lv == 2 )

 			del_amount -= (del_amount % 10);

 		add_amount = (skill_lv == 1) ? del_amount * (5 + rnd()%5) : del_amount / 10 ;

-		

+

 		if( (nameid = sd->status.inventory[idx].nameid) <= 0 || del_amount > sd->status.inventory[idx].amount ) {

 			clif_skill_fail(sd,SO_EL_ANALYSIS,0,0);

 			return 1;

@@ -16631,6 +16652,7 @@

 	return true;

 }

+

 static bool skill_parse_row_spellbookdb(char* split[], int columns, int current)

 {// SkillID,PreservePoints

@@ -16655,6 +16677,7 @@

 	return false;

 }

+

 static bool skill_parse_row_improvisedb(char* split[], int columns, int current)

 {// SkillID

 	int i = atoi(split[0]);

Index: src/map/unit.c

===================================================================

--- src/map/unit.c	(revision 16039)

+++ src/map/unit.c	(working copy)

@@ -7,6 +7,7 @@

 #include "../common/db.h"

 #include "../common/malloc.h"

 #include "../common/random.h"

+

 #include "unit.h"

 #include "map.h"

 #include "path.h"

@@ -136,8 +137,7 @@

 		return 0;

 	}

 	ud->walktimer = INVALID_TIMER;

-	if( bl->prev == NULL ) return 0; // block_list ‚©‚甲‚¯‚Ä‚¢‚é‚̂ňړ®’âŽ~‚·‚é

-

+	if( bl->prev == NULL ) return 0; // Stop moved because it is missing from the block_list

 	if(ud->walkpath.path_pos>=ud->walkpath.path_len)

 		return 0;

@@ -1010,8 +1008,8 @@

 	int temp = 0;

 	nullpo_ret(src);

-	if(status_isdead(src))

-		return 0; // Ž€‚ñ‚Å‚¢‚È‚¢‚©

+	if( status_isdead(src) )

+		return 0; //Do not continue source is dead

 	sd = BL_CAST(BL_PC, src);

 	ud = unit_bl2ud(src);

@@ -1097,7 +1095,7 @@

 		return 0;

 	tstatus = status_get_status_data(target);

-	//’Œ‘O‚̃XƒLƒ‹ó‹µ‚Ì‹L˜^

+	//The previous record of skill status

 	if(sd) {

 		switch(skill_num){

 		case SA_CASTCANCEL:

@@ -1132,11 +1130,10 @@

 			break;

 		case WL_WHITEIMPRISON:

 			if( battle_check_target(src,target,BCT_SELF|BCT_ENEMY) < 0 ) {

-				clif_skill_fail(sd,skill_num,0xb,0);

+				clif_skill_fail(sd,skill_num,USESKILL_FAIL_TOTARGET,0);

 				return 0;

 			}

 			break;

-

 		}

 		if (!skill_check_condition_castbegin(sd, skill_num, skill_lv))

 			return 0;

@@ -1259,6 +1256,7 @@

 					md->state.aggressive = (tstatus->mode&MD_ANGRY)?1:0;

 					md->min_chase = md->db->range3;

 					break;

+				default: break; //unhandled type

 				}

 			}

 		}

@@ -1295,11 +1293,11 @@

 			status_change_end(src,SC_CLOAKINGEXCEED, INVALID_TIMER);

 			if (!src->prev) return 0;

 		} else if( sc->data[SC_CAMOUFLAGE] && skill_num != RA_CAMOUFLAGE )

-			status_change_end(src,SC_CAMOUFLAGE,INVALID_TIMER);

+			status_change_end(src,SC_CAMOUFLAGE, INVALID_TIMER);

 		if( sc->data[SC_CURSEDCIRCLE_ATKER] ) {

 			sc->data[SC_CURSEDCIRCLE_ATKER]->val3 = 1;

-			status_change_end(src,SC_CURSEDCIRCLE_ATKER,INVALID_TIMER);

+			status_change_end(src,SC_CURSEDCIRCLE_ATKER, INVALID_TIMER);

 		}

 	}

@@ -1338,7 +1336,7 @@

 	nullpo_ret(src);

-	if(!src->prev) return 0; // map ã‚É‘¶Ý‚·‚é‚©

+	if(!src->prev) return 0; // Exists on the map

 	if(status_isdead(src)) return 0;

 	sd = BL_CAST(BL_PC, src);

@@ -1375,7 +1373,7 @@

 		return 0;

 	}

-	/* ŽË’ö‚ƏáŠQ•šƒ`ƒFƒbƒN */

+	/* Check range and obstacle */

 	bl.type = BL_NUL;

 	bl.m = src->m;

 	bl.x = skill_x;

@@ -1427,7 +1425,7 @@

 		if( sc->data[SC_CURSEDCIRCLE_ATKER] ) {

 			sc->data[SC_CURSEDCIRCLE_ATKER]->val3 = 1;

-			status_change_end(src,SC_CURSEDCIRCLE_ATKER,INVALID_TIMER);

+			status_change_end(src,SC_CURSEDCIRCLE_ATKER, INVALID_TIMER);

 		}

 	}

@@ -1499,8 +1497,8 @@

 }

 /*==========================================

- * UŒ‚—v‹

- * type‚ª1‚È‚çŒp‘±UŒ‚

+ * Attack request

+ * If type is an ongoing attack

  *------------------------------------------*/

 int unit_attack(struct block_list *src,int target_id,int continuous)

 {

@@ -1581,7 +1579,7 @@

 {

 	nullpo_retr(false, bl);

-	if( bl->x==x && bl->y==y )	// “¯‚¶ƒ}ƒX

+	if( bl->x==x && bl->y==y )	//Same place

 		return true;

 	return path_search(NULL,bl->m,bl->x,bl->y,x,y,easy,CELL_CHKNOREACH);

@@ -1625,7 +1623,7 @@

 	return path_search(NULL,bl->m,bl->x,bl->y,tbl->x-dx,tbl->y-dy,easy,CELL_CHKNOREACH);

 }

 /*==========================================

- * Calculates position of Pet/Mercenary/Homunculus

+ * Calculates position of Pet/Mercenary/Homunculus/Elemental

  *------------------------------------------*/

 int	unit_calc_pos(struct block_list *bl, int tx, int ty, int dir)

 {

@@ -1683,7 +1681,7 @@

 }

 /*==========================================

- * PC‚̍UŒ‚ (timerŠÖ”)

+ * Attack of the PC (function timer)

  *------------------------------------------*/

 static int unit_attack_timer_sub(struct block_list* src, int tid, unsigned int tick)

 {

@@ -1881,7 +1879,7 @@

 	return 1;

 }

-// unit_data ‚̏‰Šú‰»ˆ—

+// unit_data initialization process

 void unit_dataset(struct block_list *bl)

 {

 	struct unit_data *ud;

@@ -1922,7 +1920,7 @@

 }

 /*==========================================

- * Œ©‚œ–ڂ̃TƒCƒY‚ð•ÏX‚·‚é

+ * To change the size of the object (player or mob only)

  *------------------------------------------*/

 int unit_changeviewsize(struct block_list *bl,short size)

 {

@@ -2418,7 +2416,8 @@

 			elemental_summon_stop(ed);

 			break;

-		}			

+		}

+	    default: break; //unhandled type

 	}

 	skill_clear_unitgroup(bl);

Index: src/map/battle.h

===================================================================

--- src/map/battle.h	(revision 16039)

+++ src/map/battle.h	(working copy)

@@ -14,7 +14,7 @@

 	ATK_DEF      // attack connected

 } damage_lv;

-// ƒ_ƒ[ƒW

+// dammage structure

 struct Damage {

 	int damage,damage2;

 	int type,div_;

@@ -47,7 +47,7 @@

 int battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int damage,int div_,int skill_num,int skill_lv,int flag);

 int battle_calc_bg_damage(struct block_list *src,struct block_list *bl,int damage,int div_,int skill_num,int skill_lv,int flag);

-enum {	// ÅIŒvŽZ‚̃tƒ‰ƒO

+enum {	//Attack type for battle calc

 	BF_WEAPON	= 0x0001,

 	BF_MAGIC	= 0x0002,

 	BF_MISC		= 0x0004,

Index: src/map/skill.h

===================================================================

--- src/map/skill.h	(revision 16039)

+++ src/map/skill.h	(working copy)

@@ -87,7 +87,7 @@

 	int itemid[MAX_SKILL_ITEM_REQUIRE],amount[MAX_SKILL_ITEM_REQUIRE];

 };

-// ƒXƒLƒ‹ƒf?ƒ^ƒx?ƒX

+// Database skills

 struct s_skill_db {

 	char name[NAME_LENGTH];

 	char desc[40];

@@ -116,7 +116,7 @@

 extern struct s_skill_db skill_db[MAX_SKILL_DB];

 #define MAX_SKILL_UNIT_LAYOUT	50

-#define MAX_SQUARE_LAYOUT		5	// 11*11‚̃†ƒjƒbƒg”z’u‚ªÅ‘å

+#define MAX_SQUARE_LAYOUT		5	// 11*11 Placement of a maximum unit

 #define MAX_SKILL_UNIT_COUNT ((MAX_SQUARE_LAYOUT*2+1)*(MAX_SQUARE_LAYOUT*2+1))

 struct s_skill_unit_layout {

 	int count;

@@ -194,7 +194,7 @@

 	UF_DUALMODE      = 0x0800,	// Spells should trigger both ontimer and onplace/onout/onleft effects.

 };

-// ƒAƒCƒeƒ€ì¬ƒf?ƒ^ƒx?ƒX

+// Create Database item

 struct s_skill_produce_db {

 	int nameid, trigger;

 	int req_skill,req_skill_lv,itemlv;

@@ -202,14 +202,14 @@

 };

 extern struct s_skill_produce_db skill_produce_db[MAX_SKILL_PRODUCE_DB];

-// –îì¬ƒf?ƒ^ƒx?ƒX

+// Creating database arrow

 struct s_skill_arrow_db {

 	int nameid, trigger;

 	int cre_id[MAX_ARROW_RESOURCE],cre_amount[MAX_ARROW_RESOURCE];

 };

 extern struct s_skill_arrow_db skill_arrow_db[MAX_SKILL_ARROW_DB];

-// ƒAƒuƒ‰ƒJƒ_ƒuƒ‰ƒf?ƒ^ƒx?ƒX

+// Abracadabra database

 struct s_skill_abra_db {

 	int skillid;

 	int req_lv;

@@ -226,7 +226,8 @@

 //Returns the cast type of the skill: ground cast, castend damage, castend no damage

 enum { CAST_GROUND, CAST_DAMAGE, CAST_NODAMAGE };

 int skill_get_casttype(int id); //[Skotlex]

-// ƒXƒLƒ‹ƒf?ƒ^ƒx?ƒX‚ւ̃AƒNƒZƒT

+

+// Accessor to the skills database

 //

 int skill_get_index( int id );

 int	skill_get_type( int id );

@@ -276,13 +277,13 @@

 int skill_cleartimerskill(struct block_list *src);

 int skill_addtimerskill(struct block_list *src,unsigned int tick,int target,int x,int y,int skill_id,int skill_lv,int type,int flag);

-// ’ljÁ?‰Ê

+// Results? Added

 int skill_additional_effect( struct block_list* src, struct block_list *bl,int skillid,int skilllv,int attack_type,int dmg_lv,unsigned int tick);

 int skill_counter_additional_effect( struct block_list* src, struct block_list *bl,int skillid,int skilllv,int attack_type,unsigned int tick);

 int skill_blown(struct block_list* src, struct block_list* target, int count, int direction, int flag);

 int skill_break_equip(struct block_list *bl, unsigned short where, int rate, int flag);

 int skill_strip_equip(struct block_list *bl, unsigned short where, int rate, int lv, int time);

-// ƒ†ƒjƒbƒgƒXƒLƒ‹

+// Skills unit

 struct skill_unit_group* skill_id2group(int group_id);

 struct skill_unit_group *skill_unitsetting(struct block_list* src, short skillid, short skilllv, short x, short y, int flag);

 struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, int x, int y, int val1, int val2);

@@ -317,7 +318,7 @@

 // Guild skills [celest]

 int skill_guildaura_sub (struct map_session_data* sd, int id, int strvit, int agidex);

-// ‰r¥ƒLƒƒƒ“ƒZƒ‹

+// Chant canceled

 int skill_castcancel(struct block_list *bl,int type);

 int skill_sit (struct map_session_data *sd, int type);

@@ -331,7 +332,7 @@

 bool skill_check_cloaking(struct block_list *bl, struct status_change_entry *sce);

-// ƒXƒe?ƒ^ƒXˆÙí

+// Abnormal status

 int skill_enchant_elemental_end(struct block_list *bl, int type);

 int skillnotok(int skillid, struct map_session_data *sd);

 int skillnotok_hom(int skillid, struct homun_data *hd);

@@ -339,13 +340,13 @@

 int skill_chastle_mob_changetarget(struct block_list *bl,va_list ap);

-// ƒAƒCƒeƒ€ì¬

+// Item creation

 int skill_can_produce_mix( struct map_session_data *sd, int nameid, int trigger, int qty);

 int skill_produce_mix( struct map_session_data *sd, int skill_id, int nameid, int slot1, int slot2, int slot3, int qty );

 int skill_arrow_create( struct map_session_data *sd,int nameid);

-// mobƒXƒLƒ‹‚Ì‚œ‚ß

+// skills for the mob

 int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int skillid,int skilllv,unsigned int tick,int flag );

 int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int skillid,int skilllv,unsigned int tick,int flag );

 int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skilllv,unsigned int tick,int flag);

Index: src/map/unit.h

===================================================================

--- src/map/unit.h	(revision 16039)

+++ src/map/unit.h	(working copy)

@@ -68,61 +68,61 @@

 	unsigned dead_sit : 2;

 };

-// PC, MOB, PET ‚É‹€’Ê‚·‚鏈—‚ð‚P‚‚ɂ܂Ƃ߂éŒv‰æ

+// PC, MOB, PET Planning process into one that is common to

-// •àsŠJŽn

-//     –ß‚è’l‚́A0 ( ¬Œ÷ ), 1 ( Žž”s )

+// walk initiation

+//     The return value is 0 (success), 1 (failure)

 int unit_walktoxy( struct block_list *bl, short x, short y, int easy);

 int unit_walktobl( struct block_list *bl, struct block_list *target, int range, int easy);

 int unit_run(struct block_list *bl);

 int unit_calc_pos(struct block_list *bl, int tx, int ty, int dir);

-// •às’âŽ~

-// type‚͈ȉº‚Ì‘g‚ݍ‡‚킹 : 

-//     1: ˆÊ’uî•ñ‚Ì‘—M( ‚±‚̊֐”‚ÌŒã‚Ɉʒuî•ñ‚𑗐M‚·‚éê‡‚Í•s—v )

-//     2: ƒ_ƒ[ƒWƒfƒBƒŒƒC—L‚è

-//     4: •s–Ÿ(MOB‚̂݁H)

+// Stop walking

+// The combination of the following type:

+//     1: (If you want to send the location information after this function is not required) transmission of location information

+//     2: Damaged delay

+//     4: Unknown (only MOB?)

 int unit_stop_walking(struct block_list *bl,int type);

 int unit_can_move(struct block_list *bl);

 int unit_is_walking(struct block_list *bl);

 int unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int type);

 int unit_escape(struct block_list *bl, struct block_list *target, short dist);

-// ˆÊ’u‚Ì‹­§ˆÚ“®(‚«”ò‚΂µ‚È‚Ç)

+// Position of forced move (such as a blow)

 int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath);

 int unit_warp(struct block_list *bl, short map, short x, short y, clr_type type);

 int unit_setdir(struct block_list *bl,unsigned char dir);

 uint8 unit_getdir(struct block_list *bl);

 int unit_blown(struct block_list* bl, int dx, int dy, int count, int flag);

-// ‚»‚±‚Ü‚Å•às‚Å‚œ‚Ç‚è’…‚¯‚é‚©‚Ì”»’è

+// Determination of walking path until you reach in there

 bool unit_can_reach_pos(struct block_list *bl,int x,int y,int easy);

 bool unit_can_reach_bl(struct block_list *bl,struct block_list *tbl, int range, int easy, short *x, short *y);

-// UŒ‚ŠÖ˜A

+// Attack-related

 int unit_stop_attack(struct block_list *bl);

 int unit_attack(struct block_list *src,int target_id,int continuous);

 int unit_cancel_combo(struct block_list *bl);

-// ƒXƒLƒ‹Žg—p

+// Using the skill

 int unit_skilluse_id(struct block_list *src, int target_id, short skill_num, short skill_lv);

 int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_y, short skill_num, short skill_lv);

-// ƒXƒLƒ‹Žg—p( •â³Ï‚݃LƒƒƒXƒgŽžŠÔAƒLƒƒƒ“ƒZƒ‹•s‰ÂÝ’è•t‚« )

+// Skill use (corrected cast time, not with setting Cancel)

 int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, short skill_lv, int casttime, int castcancel);

 int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, short skill_num, short skill_lv, int casttime, int castcancel);

-// ‰r¥ƒLƒƒƒ“ƒZƒ‹

+// Chant canceled

 int unit_skillcastcancel(struct block_list *bl,int type);

 int unit_counttargeted(struct block_list *bl);

 int unit_set_target(struct unit_data* ud, int target_id);

-// unit_data ‚̏‰Šú‰»ˆ—

+// unit_data Initialization process

 void unit_dataset(struct block_list *bl);

 int unit_fixdamage(struct block_list *src,struct block_list *target,unsigned int tick,int sdelay,int ddelay,int damage,int div,int type,int damage2);

-// ‚»‚Ì‘Œ

+// Other

 struct unit_data* unit_bl2ud(struct block_list *bl);

 void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype);

 void unit_free_pc(struct map_session_data *sd);

@@ -131,7 +131,7 @@

 int unit_free(struct block_list *bl, clr_type clrtype);

 int unit_changeviewsize(struct block_list *bl,short size);

-// ‰Šú‰»ƒ‹[ƒ`ƒ“

+// Initialization routine

 int do_init_unit(void);

 int do_final_unit(void);

 /**

Index: src/map/mercenary.c

===================================================================

--- src/map/mercenary.c	(revision 16039)

+++ src/map/mercenary.c	(working copy)

@@ -371,7 +371,7 @@

 	const enum sc_type scs[] = { SC_MERC_FLEEUP, SC_MERC_ATKUP, SC_MERC_HPUP, SC_MERC_SPUP, SC_MERC_HITUP };

 	int index = rnd() % ARRAYLENGTH(scs);

-	status_change_start(&md->bl, scs[index], 10000, rnd()%5, 0, 0, 0, 600000, 0);

+	sc_start(&md->bl, scs[index], 100, rnd()%5, 600000);

 	return 0;

 }

Index: src/map/storage.c

===================================================================

--- src/map/storage.c	(revision 16039)

+++ src/map/storage.c	(working copy)

@@ -27,7 +27,7 @@

 static DBMap* guild_storage_db; // int guild_id -> struct guild_storage*

 /*==========================================

- * ‘qŒÉ“àƒAƒCƒeƒ€ƒ\[ƒg

+ * Sort items in the warehouse

  *------------------------------------------*/

 static int storage_comp_item(const void *_i1, const void *_i2)

 {

@@ -54,9 +54,9 @@

 }

 /*==========================================

- * ‰Šú‰»‚Æ‚©

+ * Init/Terminate

  *------------------------------------------*/

-int do_init_storage(void) // map.c::do_init()‚©‚çŒÄ‚΂ê‚é

+int do_init_storage(void) // Called from map.c::do_init()

 {

 	guild_storage_db=idb_alloc(DB_OPT_RELEASE_DATA);

 	return 1;

@@ -110,14 +110,18 @@

 	return 0;

 }

-// helper function

-int compare_item(struct item *a, struct item *b)

+/* helper function

+ * checking if 2 item structure are identique

+ * flag :

+ *      1 = not checking expire_time

+ */

+int compare_item(struct item *a, struct item *b, short flag)

 {

 	if( a->nameid == b->nameid &&

 		a->identify == b->identify &&

 		a->refine == b->refine &&

 		a->attribute == b->attribute &&

-		a->expire_time == b->expire_time )

+		(flag&1 || (a->expire_time == b->expire_time) ))

 	{

 		int i;

 		for (i = 0; i < MAX_SLOTS && (a->card[i] == b->card[i]); i++);

@@ -150,7 +154,7 @@

 	{//Stackable

 		for( i = 0; i < MAX_STORAGE; i++ )

 		{

-			if( compare_item(&stor->items[i], item_data) )

+			if( compare_item(&stor->items[i], item_data,0) )

 			{// existing items found, stack them

 				if( amount > MAX_AMOUNT - stor->items[i].amount )

 					return 1;

@@ -404,7 +408,7 @@

 	if(itemdb_isstackable2(data)){ //Stackable

 		for(i=0;i<MAX_GUILD_STORAGE;i++){

-			if(compare_item(&stor->items[i], item_data)) {

+			if(compare_item(&stor->items[i], item_data, 0)) {

 				if(stor->items[i].amount+amount > MAX_AMOUNT)

 					return 1;

 				stor->items[i].amount+=amount;

Index: src/map/storage.h

===================================================================

--- src/map/storage.h	(revision 16039)

+++ src/map/storage.h	(working copy)

@@ -23,6 +23,7 @@

 void do_reconnect_storage(void);

 void storage_storage_quit(struct map_session_data *sd, int flag);

+int compare_item(struct item *a, struct item *b, short flag);

 struct guild_storage* guild2storage(int guild_id);

 int guild_storage_delete(int guild_id);

 int storage_guild_storageopen(struct map_session_data *sd);

Index: src/map/buyingstore.c

===================================================================

--- src/map/buyingstore.c	(revision 16039)

+++ src/map/buyingstore.c	(working copy)

@@ -6,6 +6,7 @@

 #include "../common/showmsg.h"  // ShowWarning

 #include "../common/socket.h"  // RBUF*

 #include "../common/strlib.h"  // safestrncpy

+#include "../common/nullpo.h" //security check

 #include "atcommand.h"  // msg_txt

 #include "battle.h"  // battle_config.*

 #include "buyingstore.h"  // struct s_buyingstore

@@ -46,6 +47,8 @@

 bool buyingstore_setup(struct map_session_data* sd, unsigned char slots)

 {

+     nullpo_retr(sd,false);

+        

 	if( !battle_config.feature_buying_store || sd->state.vending || sd->state.buyingstore || sd->state.trading || slots == 0 )

 	{

 		return false;

@@ -90,6 +93,7 @@

 	{// canceled, or no items

 		return;

 	}

+        nullpo_retv(sd);

 	if( !battle_config.feature_buying_store || pc_istrading(sd) || sd->buyingstore.slots == 0 || count > sd->buyingstore.slots || zenylimit <= 0 || zenylimit > sd->status.zeny || !storename[0] )

 	{// disabled or invalid input

Index: src/map/mob.c

===================================================================

--- src/map/mob.c	(revision 16039)

+++ src/map/mob.c	(working copy)

@@ -239,12 +239,12 @@

 		if( i )

 		{

-			if( i&2 )

-				data->state.size = SZ_MEDIUM;

-			else if( i&4 )

-				data->state.size = SZ_BIG;

-			if( i&8 )

-				data->state.ai = 1;

+				if (i&2)

+					data->state.size=SZ_MEDIUM;

+				else if (i&4)

+					data->state.size=SZ_BIG;

+				if (i&8)

+					data->state.ai=1;

 		}

 		data->eventname[0] = '\0'; //Clear event as it is not used.

 	}

@@ -2508,6 +2508,7 @@

 				case BL_PET: sd = ((TBL_PET*)src)->msd; break;

 				case BL_HOM: sd = ((TBL_HOM*)src)->master; break;

 				case BL_MER: sd = ((TBL_MER*)src)->master; break;

+				default : break; //unhandled type

 			}

 		if( sd && sd->md && src && src->type != BL_HOM && mob_db(md->class_)->lv > sd->status.base_level/2 )

@@ -2722,7 +2723,7 @@

 }

 /*==========================================

- * mob‰ñ•œ

+ * mob heal, permet d'update la barre d'hp d'un mob pour le joueur

  *------------------------------------------*/

 void mob_heal(struct mob_data *md,unsigned int heal)

 {

@@ -2763,7 +2764,7 @@

 }

 /*==========================================

- * ‰æ–Ê“à‚ÌŽæ‚芪‚«‚̐”ŒvŽZ—p(foreachinarea)

+ *  Permet de savoir si un mob est le slave d'un mobid

  *------------------------------------------*/

 int mob_countslave_sub(struct block_list *bl,va_list ap)

 {

@@ -2778,7 +2779,7 @@

 }

 /*==========================================

- * ‰æ–Ê“à‚ÌŽæ‚芪‚«‚̐”ŒvŽZ

+ * Permet de compter le nombre de slave d'un mob sur la map

  *------------------------------------------*/

 int mob_countslave(struct block_list *bl)

 {

@@ -2884,7 +2885,7 @@

 }

 /*==========================================

- *MOBskill‚©‚çŠY“–skillid‚Ìskillidx‚ð•Ô‚·

+ * MOBskill lookup

  *------------------------------------------*/

 int mob_skillid2skillidx(int class_,int skillid)

 {

@@ -3896,7 +3897,7 @@

 	class_=atoi(str[0]);

-	if(mob_db(class_) == mob_dummy)	// ’l‚ªˆÙí‚Ȃ珈—‚µ‚È‚¢B

+	if(mob_db(class_) == mob_dummy)	// invalid class (probably undefined in db)

 	{

 		ShowWarning("mob_readdb_mobavail: Unknown mob id %d.\n", class_);

 		return false;

Index: src/map/clif.c

===================================================================

--- src/map/clif.c	(revision 16039)

+++ src/map/clif.c	(working copy)

@@ -196,7 +196,7 @@

 static int clif_parse (int fd);

 /*==========================================

- * mapŽI‚ÌipÝ’è

+ * map?¿œI?¿œ?¿œip?¿œÝ’ï¿œ

  *------------------------------------------*/

 int clif_setip(const char* ip)

 {

@@ -1358,9 +1358,9 @@

 	case BL_MOB:

 		{

 			TBL_MOB *md = ((TBL_MOB*)bl);

-			if(md->special_state.size==2) // tiny/big mobs [Valaris]

+			if(md->special_state.size==SZ_BIG) // tiny/big mobs [Valaris]

 				clif_specialeffect(&md->bl,423,AREA);

-			else if(md->special_state.size==1)

+			else if(md->special_state.size==SZ_MEDIUM)

 				clif_specialeffect(&md->bl,421,AREA);

 		}

 		break;

@@ -1564,9 +1564,9 @@

 	case BL_MOB:

 		{

 			TBL_MOB *md = ((TBL_MOB*)bl);

-			if(md->special_state.size==2) // tiny/big mobs [Valaris]

+			if(md->special_state.size==SZ_BIG) // tiny/big mobs [Valaris]

 				clif_specialeffect(&md->bl,423,AREA);

-			else if(md->special_state.size==1)

+			else if(md->special_state.size==SZ_MEDIUM)

 				clif_specialeffect(&md->bl,421,AREA);

 		}

 		break;

@@ -3161,7 +3161,7 @@

 	fd=sd->fd;

 	WFIFOHEAD(fd, packet_len(0x013c));

 	WFIFOW(fd,0)=0x013c;

-	WFIFOW(fd,2)=val+2;//–î‚̃AƒCƒeƒ€ID

+	WFIFOW(fd,2)=val+2;//Item ID of the arrow

 	WFIFOSET(fd,packet_len(0x013c));

 }

@@ -15856,7 +15856,7 @@

 		sd->menuskill_id = SC_AUTOSHADOWSPELL;

 		sd->menuskill_val = c;

 	} else {

-		status_change_end(&sd->bl,SC_STOP,-1);

+		status_change_end(&sd->bl,SC_STOP, INVALID_TIMER);

 		clif_skill_fail(sd,SC_AUTOSHADOWSPELL,0x15,0);

 	}

Index: src/map/chat.c

===================================================================

--- src/map/chat.c	(revision 16039)

+++ src/map/chat.c	(working copy)

@@ -156,11 +156,11 @@

 	pc_setchatid(sd,cd->bl.id);

-	clif_joinchatok(sd,cd);	// V‚œ‚ÉŽQ‰Á‚µ‚œl‚É‚Í‘Sˆõ‚̃ŠƒXƒg

-	clif_addchat(cd,sd);	// Šù‚É’†‚É‹‚œl‚ɂ͒ljÁ‚µ‚œl‚Ì•ñ

-	clif_dispchat(cd,0);	// ŽüˆÍ‚̐l‚ɂ͐l”•Ï‰»•ñ

+	clif_joinchatok(sd,cd);	//To the person who newly joined the list of all

+	clif_addchat(cd,sd);	//Reports To the person who already in the chat 

+	clif_dispchat(cd,0);	//Reported number of changes to the people around 

-	chat_triggerevent(cd); // ƒCƒxƒ“ƒg

+	chat_triggerevent(cd); //Event 

 	return 0;

 }

@@ -372,7 +372,7 @@

 }

 /*==========================================

- * ‹K’èl”ˆÈã‚ŃCƒxƒ“ƒg‚ª’è‹`‚³‚ê‚Ä‚é‚È‚çŽÀs

+ * Trigger npc event when we enter the chatroom

  *------------------------------------------*/

 int chat_triggerevent(struct chat_data *cd)

 {

Index: src/map/mob.h

===================================================================

--- src/map/mob.h	(revision 16039)

+++ src/map/mob.h	(working copy)

@@ -64,9 +64,9 @@

 };

 enum size {

-	SZ_SMALL = 0,

-	SZ_MEDIUM,

-	SZ_BIG,

+    SZ_SMALL = 0,

+    SZ_MEDIUM,

+    SZ_BIG,

 };

 struct mob_skill {

Index: src/map/guild.c

===================================================================

--- src/map/guild.c	(revision 16039)

+++ src/map/guild.c	(working copy)

@@ -39,12 +39,12 @@

 	struct eventlist *next;

 };

-// ƒMƒ‹ƒh‚ÌEXPƒLƒƒƒbƒVƒ…‚̃tƒ‰ƒbƒVƒ…‚ÉŠÖ˜A‚·‚é’萔

-#define GUILD_SEND_XY_INVERVAL	5000	// À•W‚â‚g‚o‘—M‚ÌŠÔŠu

-#define GUILD_PAYEXP_INVERVAL 10000	// ŠÔŠu(ƒLƒƒƒbƒVƒ…‚̍ő吶‘¶ŽžŠÔAƒ~ƒŠ•b)

-#define GUILD_PAYEXP_LIST 8192	// ƒLƒƒƒbƒVƒ…‚̍ő吔

+//Constant related to the flash of the Guild EXP cache

+#define GUILD_SEND_XY_INVERVAL	5000 // Interval of sending coordinates and HP

+#define GUILD_PAYEXP_INVERVAL 10000 //Interval (maximum survival time of the cache, in milliseconds)

+#define GUILD_PAYEXP_LIST 8192 //The maximum number of cache

-// ƒMƒ‹ƒh‚ÌEXPƒLƒƒƒbƒVƒ…

+//Guild EXP cache

 struct guild_expcache {

 	int guild_id, account_id, char_id;

 	uint64 exp;

@@ -91,7 +91,7 @@

 	return guild_skill_tree[id-GD_SKILLBASE].max;

 }

-// ƒMƒ‹ƒhƒXƒLƒ‹‚ª‚ ‚é‚©Šm”F

+// Retrive skilllv learned by guild

 int guild_checkskill(struct guild *g,int id)

 {

 	int idx = id-GD_SKILLBASE;

@@ -110,8 +110,7 @@

 	skillid = atoi(split[0]);

 	id = skillid - GD_SKILLBASE;

-	if( id < 0 || id >= MAX_GUILDSKILL )

-	{

+	if (id < 0 || id >= MAX_GUILDSKILL) {

 		ShowWarning("guild_read_guildskill_tree_db: Invalid skill id %d.\n", skillid);

 		return false;

 	}

@@ -119,13 +118,12 @@

 	guild_skill_tree[id].id = skillid;

 	guild_skill_tree[id].max = atoi(split[1]);

-	if( guild_skill_tree[id].id == GD_GLORYGUILD && battle_config.require_glory_guild && guild_skill_tree[id].max == 0 )

-	{// enable guild's glory when required for emblems

+	if (guild_skill_tree[id].id == GD_GLORYGUILD && battle_config.require_glory_guild && guild_skill_tree[id].max == 0) {

+		// enable guild's glory when required for emblems

 		guild_skill_tree[id].max = 1;

 	}

-	for( k = 0; k < MAX_GUILD_SKILL_REQUIRE; k++ )

-	{

+	for (k = 0; k < MAX_GUILD_SKILL_REQUIRE; k++) {

 		guild_skill_tree[id].need[k].id = atoi(split[k*2+2]);

 		guild_skill_tree[id].need[k].lv = atoi(split[k*2+3]);

 	}

@@ -147,8 +145,7 @@

 	if (idx < 0 || idx >= MAX_GUILDSKILL)

 		return 0;

-	for(i=0;i<MAX_GUILD_SKILL_REQUIRE;i++)

-	{

+	for (i = 0; i < MAX_GUILD_SKILL_REQUIRE; i++) {

 		if(guild_skill_tree[idx].need[i].id == 0) break;

 		if(guild_skill_tree[idx].need[i].lv > guild_checkskill(g,guild_skill_tree[idx].need[i].id))

 			return 0;

@@ -261,7 +258,7 @@

 	return( i < g->max_member ) ? g->member[i].position : -1;

 }

-// ƒƒ“ƒo[î•ñ‚̍쐬

+//Creation of member information

 void guild_makemember(struct guild_member *m,struct map_session_data *sd)

 {

 	nullpo_retv(sd);

@@ -283,7 +280,7 @@

 }

 /**

- *  ƒMƒ‹ƒh‚ÌEXPƒLƒƒƒbƒVƒ…‚ðinterŽI‚Ƀtƒ‰ƒbƒVƒ…‚·‚é

+ * Server cache to be flushed to inter the Guild EXP

  * @see DBApply

  */

 int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) {

@@ -392,7 +389,7 @@

 	return 1;

 }

-// ì¬‰Â”Û

+//Whether or not to create guilde

 int guild_created(int account_id,int guild_id)