Index: conf/atcommand_athena.conf

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

--- conf/atcommand_athena.conf	(revision 15963)

+++ conf/atcommand_athena.conf	(working copy)

@@ -58,4 +58,4 @@

 /* Commands help file */

 help: {

 	@include "conf/help.txt"

-}

\ No newline at end of file

+}

Index: src/map/atcommand.c

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

--- src/map/atcommand.c	(revision 15963)

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

@@ -52,6 +52,10 @@

 #define ACMD_FUNC(x) static int atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message)

 #define MAX_MSG 1000

+/// Atcommand suggestion settings

+#define MAX_SUGGESTIONS 10

+#define FULL_MATCH		1

+

 typedef struct AtCommandInfo AtCommandInfo;

 typedef struct AliasInfo AliasInfo;

@@ -79,6 +83,7 @@

 static AtCommandInfo* get_atcommandinfo_byname(const char *name); // @help

 static const char* atcommand_checkalias(const char *aliasname); // @help

+static void atcommand_get_suggestions(struct map_session_data* sd, const char *name, bool atcommand); // @help

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

 // Return the message string of the specified number by [Yor]

@@ -1657,11 +1662,13 @@

 	if (!pc_can_use_command(sd, command_name, COMMAND_ATCOMMAND)) {

 		sprintf(atcmd_output, msg_txt(153), message); // "%s is Unknown Command"

 		clif_displaymessage(fd, atcmd_output);

+		atcommand_get_suggestions(sd, command_name, true);

 		return -1;

 	}

 	if (!config_setting_lookup_string(help, command_name, &text)) {

 		clif_displaymessage(fd, "There is no help for this command_name.");

+		atcommand_get_suggestions(sd, command_name, true);

 		return -1;

 	}

@@ -6251,7 +6258,7 @@

 		};

 		int i;

 		ARR_FIND( 0, ARRAYLENGTH(emo), i, stricmp(message, emo[i]) == 0 );

-		if( i == E_DICE1 ) i = rand()%6 + E_DICE1; // randomize /dice

+		if( i == E_DICE1 ) i = rnd()%6 + E_DICE1; // randomize /dice

 		if( i < ARRAYLENGTH(emo) )

 		{

 			if (sd->emotionlasttime + 1 >= time(NULL)) { // not more than 1 per second

@@ -8744,6 +8751,66 @@

 	return aliasname;

 }

+/// AtCommand suggestion

+static void atcommand_get_suggestions(struct map_session_data* sd, const char *name, bool atcommand)

+{

+	DBIterator* atcommand_iter = db_iterator(atcommand_db);

+	DBIterator* alias_iter = db_iterator(atcommand_alias_db);

+	AtCommandInfo* command_info = NULL;

+	AliasInfo* alias_info = NULL;

+	AtCommandType type;

+	char* suggestions[MAX_SUGGESTIONS];

+	int count = 0;

+

+	if (atcommand)

+		type = COMMAND_ATCOMMAND;

+	else

+		type = COMMAND_CHARCOMMAND;

+

+	for (command_info = dbi_first(atcommand_iter); dbi_exists(atcommand_iter) && count < MAX_SUGGESTIONS; command_info = dbi_next(atcommand_iter)) {

+#if FULL_MATCH

+		if ( strstr(command_info->command, name) != NULL && pc_can_use_command(sd, command_info->command, type) )

+#else

+		if ( strstr(command_info->command, name) == command_info->command && pc_can_use_command(sd, command_info->command, type) )

+#endif

+		{

+			suggestions[count] = command_info->command;

+			++count;

+		}

+	}

+

+	for (alias_info = dbi_first(alias_iter); dbi_exists(alias_iter) && count < MAX_SUGGESTIONS; alias_info = dbi_next(alias_iter)) {

+#if FULL_MATCH

+		if ( strstr(alias_info->alias, name) != NULL && pc_can_use_command(sd, alias_info->command->command, type) )

+#else

+		if ( strstr(alias_info->alias, name) == alias_info->alias && pc_can_use_command(sd, alias_info->command->command, type) )

+#endif

+		{

+			suggestions[count] = alias_info->alias;

+			++count;

+		}

+	}

+

+	if (count > 0)

+	{

+		char buffer[512];

+		int i;

+

+		strcpy(buffer,"Maybe you meant:\n");

+		

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

+		{

+			strcat(buffer,suggestions[i]);

+			strcat(buffer," ");

+		}

+

+		clif_displaymessage(sd->fd, buffer);

+	}

+

+	dbi_destroy(atcommand_iter);

+	dbi_destroy(alias_iter);

+}

+

 /// Executes an at-command.

 bool is_atcommand(const int fd, struct map_session_data* sd, const char* message, int type)

 {

@@ -8842,6 +8909,7 @@

 		if( pc_get_group_level(sd) ) { // TODO: remove or replace with proper permission

 			sprintf(output, msg_txt(153), command); // "%s is Unknown Command."

 			clif_displaymessage(fd, output);

+			atcommand_get_suggestions(sd, command + 1, *message == atcommand_symbol);

 			return true;

 		} else

 			return false;

@@ -8998,4 +9066,4 @@

 void do_final_atcommand(void)

 {

 	atcommand_db_clear();

-}

\ No newline at end of file

+}

Index: src/map/script.c

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

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

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

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

 			sd->npc_menu -= menu_countoptions(text, sd->npc_menu, &menu);

 			if( sd->npc_menu <= 0 )

 				break;// entry found

+			pc_setregstr(sd, add_str("@options$"),text);

 		}

 		pc_setreg(sd, add_str("@menu"), menu);

 		script_pushint(st, menu);

@@ -5467,10 +5468,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);

@@ -5498,22 +5499,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;

@@ -6384,7 +6382,7 @@

 	return 0;

 }

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

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

+ * return the name of a partyid

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

 BUILDIN_FUNC(getpartyname)

 {

@@ -9073,7 +9071,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)

 {

@@ -9616,7 +9615,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 15963)

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

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

 #include "../common/mmo.h"

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

 #include "../common/utils.h"

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

 #include "log.h"

 #include "clif.h"

@@ -247,12 +248,15 @@

 			case SC_UPHEAVAL_OPTION:

 			case SC_CIRCLE_OF_FIRE_OPTION:

 			case SC_TIDAL_WEAPON_OPTION:

-				if( bl ) status_change_end(bl,type,-1);	// Master

-				status_change_end(&ed->bl,type-1,-1);	// Elemental Spirit

+				if( bl ) status_change_end(bl,type,INVALID_TIMER);	// Master

+				status_change_end(&ed->bl,type-1,INVALID_TIMER);	// Elemental Spirit

 				break;

 			case SC_ZEPHYR:

-				if( bl ) status_change_end(bl,type,-1);

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

 				break;

+			default:

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

+				break;

 		}

 	}

 	if( skill_get_unit_id(skill_num,0) )

@@ -345,8 +349,8 @@

 	if( elemental_skillnotok(skillnum, ed) )

 		return 0;

-	

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

+

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

 		return 0;

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

 		return 0;

@@ -409,8 +413,8 @@

 	if( elemental_skillnotok(skillnum, ed) )

 		return 0;

-	

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

+

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

 		return 0;

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

 		return 0;

@@ -562,11 +566,11 @@

 		return 0;

 	ed->last_thinktime = tick;

-	

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

+

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

 		return 0;

-	

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

+

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

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

 	if(ed->ud.walkpath.path_pos < ed->ud.walkpath.path_len && ed->ud.target == sd->bl.id)

@@ -582,13 +586,13 @@

 	master_dist = distance_bl(&sd->bl, &ed->bl);

 	if( master_dist > AREA_SIZE ) {	// Master out of vision range.

 		elemental_unlocktarget(ed);

-		unit_warp(&ed->bl,sd->bl.m,sd->bl.x,sd->bl.y,3);

+		unit_warp(&ed->bl,sd->bl.m,sd->bl.x,sd->bl.y,CLR_TELEPORT);

 		return 0;

 	} else if( master_dist > MAX_ELEDISTANCE ) {	// Master too far, chase.

 		short x = sd->bl.x, y = sd->bl.y;

 		if( ed->target_id )

 			elemental_unlocktarget(ed);

-		if( ed->ud.walktimer != -1 && ed->ud.target == sd->bl.id )

+		if( ed->ud.walktimer != INVALID_TIMER && ed->ud.target == sd->bl.id )

 			return 0; //Already walking to him

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

 			return 0; //Can't move yet.

@@ -608,14 +612,15 @@

 			return 1;

 		}

-		if( battle_check_range(&ed->bl,target,ed->db->range2) && rand()%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;

 		}

 		//Attempt to attack.

 		//At this point we know the target is attackable, we just gotta check if the range matches.

-		if( ed->ud.target == target->id && ed->ud.attacktimer != -1 ) //Already locked.

+		if( ed->ud.target == target->id && ed->ud.attacktimer != INVALID_TIMER ) //Already locked.

 			return 1;

 		if( battle_check_range(&ed->bl, target, ed->base_status.rhw.range) ) {//Target within range, engage

@@ -639,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/battle.c

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

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

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

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

 	return bl_list[rnd()%c];

 }

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

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

 struct delay_damage {

 	struct block_list *src;

 	int target;

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

 	return 0;

 }

+

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

 {

@@ -340,7 +341,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 +396,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,-1); // 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 +470,7 @@

 						clif_millenniumshield(sd,sce->val2);

 					sce->val3 = 1000; // Next Shield

 				} else

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

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

 			}

 			return 0;

 		}

@@ -556,11 +558,11 @@

 			if( sc->data[SC_DEEPSLEEP] ) {

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

-				status_change_end(bl,SC_DEEPSLEEP,-1);

+				status_change_end(bl,SC_DEEPSLEEP, INVALID_TIMER);

 			}

 			if( sc->data[SC_VOICEOFSIREN] )

-				status_change_end(bl,SC_VOICEOFSIREN,-1);

+				status_change_end(bl,SC_VOICEOFSIREN, INVALID_TIMER);

 		}

@@ -632,9 +634,9 @@

 		//Finally added to remove the status of immobile when aimedbolt is used. [Jobbie]

 		if( skill_num == RA_AIMEDBOLT && (sc->data[SC_BITE] || sc->data[SC_ANKLE] || sc->data[SC_ELECTRICSHOCKER]) )

 		{

-			status_change_end(bl, SC_BITE, -1);

-			status_change_end(bl, SC_ANKLE, -1);

-			status_change_end(bl, SC_ELECTRICSHOCKER, -1);

+			status_change_end(bl, SC_BITE, INVALID_TIMER);

+			status_change_end(bl, SC_ANKLE, INVALID_TIMER);

+			status_change_end(bl, SC_ELECTRICSHOCKER, INVALID_TIMER);

 		}

 		//Finally Kyrie because it may, or not, reduce damage to 0.

@@ -652,7 +654,7 @@

 		if (!damage) return 0;

-		if( (sce = sc->data[SC_LIGHTNINGWALK]) && flag&BF_LONG && rand()%100 < sce->val1 ) {

+		if( (sce = sc->data[SC_LIGHTNINGWALK]) && flag&BF_LONG && rnd()%100 < sce->val1 ) {

 			int dx[8]={0,-1,-1,-1,0,1,1,1};

 			int dy[8]={1,1,0,-1,-1,-1,0,1};

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

@@ -661,7 +663,7 @@

 				unit_setdir(bl, dir);

 			}

 			d->dmg_lv = ATK_DEF;

-			status_change_end(bl, SC_LIGHTNINGWALK, -1);

+			status_change_end(bl, SC_LIGHTNINGWALK, INVALID_TIMER);

 			return 0;

 		}

@@ -674,20 +676,20 @@

 		if( sd && (sce = sc->data[SC_FORCEOFVANGUARD]) && flag&BF_WEAPON && rnd()%100 < sce->val2 )

 			pc_addspiritball(sd,skill_get_time(LG_FORCEOFVANGUARD,sce->val1),sce->val3);

-		if( sc->data[SC__DEADLYINFECT] && damage > 0 && rand()%100 < 65 + 5 * sc->data[SC__DEADLYINFECT]->val1 )

+		if( sc->data[SC__DEADLYINFECT] && damage > 0 && rnd()%100 < 65 + 5 * sc->data[SC__DEADLYINFECT]->val1 )

 			status_change_spread(bl, src); // Deadly infect attacked side

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

 			struct block_list *s_bl = map_id2bl(sc->data[SC__SHADOWFORM]->val2);

 			if( !s_bl ) { // If the shadow form target is not present remove the sc.

-				status_change_end(bl, SC__SHADOWFORM, -1);

+				status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);

 			} else if( status_isdead(s_bl) || !battle_check_target(src,s_bl,BCT_ENEMY)) { // If the shadow form target is dead or not your enemy remove the sc in both.

-				status_change_end(bl, SC__SHADOWFORM, -1);

+				status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);

 				if( s_bl->type == BL_PC )

 					((TBL_PC*)s_bl)->shadowform_id = 0;

 			} else {

 				if( (--sc->data[SC__SHADOWFORM]->val3) < 0 ) { // If you have exceded max hits supported, remove the sc in both.

-					status_change_end(bl, SC__SHADOWFORM, -1);

+					status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);

 					if( s_bl->type == BL_PC )

 						((TBL_PC*)s_bl)->shadowform_id = 0;

 				} else {

@@ -730,7 +732,7 @@

 		}

 		if( sc->data[SC_POISONINGWEAPON] && skill_num != GC_VENOMPRESSURE && (flag&BF_WEAPON) && damage > 0 && rnd()%100 < sc->data[SC_POISONINGWEAPON]->val3 )

 			sc_start(bl,sc->data[SC_POISONINGWEAPON]->val2,100,sc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON,sc->data[SC_POISONINGWEAPON]->val1));

-		if( sc->data[SC__DEADLYINFECT] && damage > 0 && rand()%100 < 65 + 5 * sc->data[SC__DEADLYINFECT]->val1 )

+		if( sc->data[SC__DEADLYINFECT] && damage > 0 && rnd()%100 < 65 + 5 * sc->data[SC__DEADLYINFECT]->val1 )

 			status_change_spread(src, bl);

 	}

@@ -768,7 +770,7 @@

 			mobskill_event((TBL_MOB*)bl,src,gettick(),MSC_SKILLUSED|(skill_num<<16));

 	}

 	if( sd ) {

-		if( (sd->sc.option&OPTION_MADOGEAR) && rand()%100 < 50 ) {

+		if( (sd->sc.option&OPTION_MADOGEAR) && rnd()%100 < 50 ) {

 			short element = skill_get_ele(skill_num, skill_lv);

 			if( !skill_num || element == -1 ) { //Take weapon's element

 				struct status_data *sstatus = NULL;

@@ -900,7 +902,7 @@

 }

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

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

+ * HP/SP drain calculation

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

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

 {

@@ -919,7 +921,7 @@

 }

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

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

+ * Passif skill dammages increases

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

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

 {

@@ -1589,11 +1591,11 @@

 				i*=i;

 				ATK_ADD(i); //Add str bonus.

 				switch (tstatus->size) { //Size-fix. Is this modified by weapon perfection?

-					case 0: //Small: 125%

+					case SZ_SMALL: //Small: 125%

 						ATK_RATE(125);

 						break;

 					//case 1: //Medium: 100%

-					case 2: //Large: 75%

+					case SZ_BIG: //Large: 75%

 						ATK_RATE(75);

 						break;

 				}

@@ -1610,8 +1612,8 @@

 						sd->inventory_data[index] &&

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

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

-					break;

-				} else

+				}

+				else

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

 				break;

 			case HFLI_SBR44:	//[orn]

@@ -2123,9 +2125,9 @@

 					break;

 				case NC_ARMSCANNON:

 					switch( tstatus->size ) {

-						case 0: skillratio += 100 + 500 * skill_lv; break;// Small

-						case 1: skillratio += 100 + 400 * skill_lv; break;// Medium

-						case 2: skillratio += 100 + 300 * skill_lv; break;// Large

+						case SZ_SMALL: skillratio += 100 + 500 * skill_lv; break;// Small

+						case SZ_MEDIUM: skillratio += 100 + 400 * skill_lv; break;// Medium

+						case SZ_BIG: skillratio += 100 + 300 * skill_lv; break;// Large

 					}

 					if( status_get_lv(src) > 100 ) skillratio += skillratio * (status_get_lv(src) - 100) / 200;	// Base level bonus.

 					//NOTE: Their's some other factors that affects damage, but not sure how exactly. Will recheck one day. [Rytech]

@@ -3299,10 +3301,10 @@

 						skillratio += 10*skill_lv-30;

 						break;

 					case SL_STIN:

-						skillratio += (tstatus->size?-99:10*skill_lv); //target size must be small (0) for full damage.

+						skillratio += (tstatus->size!=SZ_SMALL?-99:10*skill_lv); //target size must be small (0) for full damage.

 						break;

 					case SL_STUN:

-						skillratio += (tstatus->size!=2?5*skill_lv:-99); //Full damage is dealt on small/medium targets

+						skillratio += (tstatus->size!=SZ_BIG?5*skill_lv:-99); //Full damage is dealt on small/medium targets

 						break;

 					case SL_SMA:

 						skillratio += -60 + status_get_lv(src); //Base damage is 40% + lv%

@@ -3708,7 +3710,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)

 {

@@ -3765,7 +3767,7 @@

 		{

 			int level = sd?sd->status.base_level:status_get_lv(src);

 			md.damage = skill_lv*sstatus->dex*(3+level/100)*(1+sstatus->int_/35);

-			md.damage+= md.damage*(rand()%20-10)/100;

+			md.damage+= md.damage*(rnd()%20-10)/100;

 			md.damage+= 40*(sd?pc_checkskill(sd,RA_RESEARCHTRAP):0);

 		}

 		break;

@@ -4022,7 +4024,7 @@

 	return md;

 }

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

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

+ * ï¿œ_??[ï¿œ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)

 {

@@ -4079,12 +4081,12 @@

 					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,-1);

+					status_change_end(bl,SC_DEATHBOUND, INVALID_TIMER);

 					rdamage += rd1;

 					if (rdamage < 1) rdamage = 1;

 				}

 			}

-			if( sc && sc->data[SC_CRESCENTELBOW] && !(flag&BF_SKILL) && !is_boss(src) && rand()%100 < sc->data[SC_CRESCENTELBOW]->val2 )

+			if( sc && sc->data[SC_CRESCENTELBOW] && !(flag&BF_SKILL) && !is_boss(src) && rnd()%100 < sc->data[SC_CRESCENTELBOW]->val2 )

 			{	// Stimated formula from test

 				rdamage += (int)((*dmg) + (*dmg) * status_get_hp(src) * 2.15 / 100000);

 				if( rdamage < 1 ) rdamage = 1;

@@ -4180,7 +4182,7 @@

 	return 0;

 }

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

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

+ * ￜￜ??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;

@@ -4247,13 +4249,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);

@@ -4322,7 +4324,7 @@

 			return ATK_MISS;

 		}

 		if( sc->data[SC_GT_ENERGYGAIN] ) {

-			if( sd && rand()%100 < 10 + 5 * sc->data[SC_GT_ENERGYGAIN]->val1)

+			if( sd && rnd()%100 < 10 + 5 * sc->data[SC_GT_ENERGYGAIN]->val1)

 				pc_addspiritball(sd,

 								 skill_get_time(MO_CALLSPIRITS, sc->data[SC_GT_ENERGYGAIN]->val1),

 								 sc->data[SC_GT_ENERGYGAIN]->val1);

@@ -4344,9 +4346,9 @@

 			if( --(sc->data[SC_SPELLFIST]->val1) >= 0 )

 				wd = battle_calc_attack(BF_MAGIC,src,target,sc->data[SC_SPELLFIST]->val3,sc->data[SC_SPELLFIST]->val4,flag);

 			else

-				status_change_end(src,SC_SPELLFIST,-1);

+				status_change_end(src,SC_SPELLFIST,INVALID_TIMER);

 		}

-		if( sc->data[SC_GIANTGROWTH] && (wd.flag&BF_SHORT) && rand()%100 < sc->data[SC_GIANTGROWTH]->val2 )

+		if( sc->data[SC_GIANTGROWTH] && (wd.flag&BF_SHORT) && rnd()%100 < sc->data[SC_GIANTGROWTH]->val2 )

 			wd.damage *= 3; // Triple Damage

 	}

 	if (sd && sd->state.arrow_atk) //Consume arrow.

@@ -4452,7 +4454,7 @@

 		}

 	}

 	if (sd) {

-		if( wd.flag&BF_SHORT && sc && sc->data[SC__AUTOSHADOWSPELL] && rand()%100 < sc->data[SC__AUTOSHADOWSPELL]->val3 &&

+		if( wd.flag&BF_SHORT && sc && sc->data[SC__AUTOSHADOWSPELL] && rnd()%100 < sc->data[SC__AUTOSHADOWSPELL]->val3 &&

 			sd->status.skill[sc->data[SC__AUTOSHADOWSPELL]->val1].id != 0 && sd->status.skill[sc->data[SC__AUTOSHADOWSPELL]->val1].flag == SKILL_FLAG_PLAGIARIZED )

 		{

 			int r_skill = sd->status.skill[sc->data[SC__AUTOSHADOWSPELL]->val1].id,

@@ -4509,6 +4511,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;

 }

@@ -4685,6 +4691,7 @@

 				return 0; // Disable guardians/emperiums owned by Guilds on non-woe times.

 			break;

 		}

+		default: break; //other type doesn't have slave yet

 	}

 	switch( src->type )

@@ -4701,9 +4708,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)

@@ -4853,7 +4860,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 15963)

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

@@ -955,7 +955,7 @@

 		status_zap(bl, 0, rate);

   		break;

 	case SL_STUN:

-		if (tstatus->size==1) //Only stuns mid-sized mobs.

+		if (tstatus->size==SZ_MEDIUM) //Only stuns mid-sized mobs.

 			sc_start(bl,SC_STUN,(30+10*skilllv),skilllv,skill_get_time(skillid,skilllv));

 		break;

@@ -1186,11 +1186,11 @@

 	case NC_PILEBUNKER:

 		if( rnd()%100 < 5 + 15*skilllv )

 		{ //Deactivatable Statuses: Kyrie Eleison, Auto Guard, Steel Body, Assumptio, and Millennium Shield

-			status_change_end(bl, SC_KYRIE, -1);

-			status_change_end(bl, SC_AUTOGUARD, -1);

-			status_change_end(bl, SC_STEELBODY, -1);

-			status_change_end(bl, SC_ASSUMPTIO, -1);

-			status_change_end(bl, SC_MILLENNIUMSHIELD, -1);

+			status_change_end(bl, SC_KYRIE, INVALID_TIMER);

+			status_change_end(bl, SC_AUTOGUARD, INVALID_TIMER);

+			status_change_end(bl, SC_STEELBODY, INVALID_TIMER);

+			status_change_end(bl, SC_ASSUMPTIO, INVALID_TIMER);

+			status_change_end(bl, SC_MILLENNIUMSHIELD, INVALID_TIMER);

 		}

 		break;

 	case NC_FLAMELAUNCHER:

@@ -1260,7 +1260,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 * (rand()%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));

@@ -1269,7 +1269,7 @@

 		sc_start(bl, SC_FEAR, 5 + 5 * skilllv, skilllv, skill_get_time(skillid, skilllv));

 		break;

 	case WM_SOUND_OF_DESTRUCTION:

-		if( rand()%100 < 5 + 5 * skilllv ) { // Temporarly Check Until We Get the Official Formula

+		if( rnd()%100 < 5 + 5 * skilllv ) { // Temporarly Check Until We Get the Official Formula

 			status_change_end(bl, SC_DANCING, INVALID_TIMER);

 			status_change_end(bl, SC_RICHMANKIM, INVALID_TIMER);

 			status_change_end(bl, SC_ETERNALCHAOS, INVALID_TIMER);

@@ -1323,7 +1323,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;

 			}

@@ -2635,7 +2635,7 @@

 					struct status_change *ssc = status_get_sc(src);

 					if( ssc && ssc->data[SC_POISONINGWEAPON] && rnd()%100 < 70 + 5*skilllv ) {

 						sc_start(bl,ssc->data[SC_POISONINGWEAPON]->val2,100,ssc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON,ssc->data[SC_POISONINGWEAPON]->val1));

-						status_change_end(src,SC_POISONINGWEAPON,-1);

+						status_change_end(src,SC_POISONINGWEAPON,INVALID_TIMER);

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

 					}

 				}

@@ -2666,12 +2666,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)

@@ -3096,10 +3096,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) );

 							}

 						}

 					}

@@ -3119,9 +3119,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);

@@ -4001,7 +4003,7 @@

 		else

 		{

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

-			status_change_end(src,SC_ROLLINGCUTTER,-1);

+			status_change_end(src,SC_ROLLINGCUTTER,INVALID_TIMER);

 		}

 		break;

@@ -4147,7 +4149,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;

 				}

@@ -4231,9 +4233,10 @@

 		{ //TODO: Need a confirmation if the other type of hidden status is included to be scanned. [Jobbie]

 			if( rnd()%100 < 50 )

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

-			status_change_end(bl, SC_HIDING, -1);

-			status_change_end(bl, SC_CLOAKING, -1);

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

+			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

 		{

@@ -4296,30 +4299,36 @@

 		break;

 	case SR_HOWLINGOFLION:

-			status_change_end(bl, SC_SWINGDANCE, -1);

-			status_change_end(bl, SC_SYMPHONYOFLOVER, -1);

-			status_change_end(bl, SC_MOONLITSERENADE, -1);

-			status_change_end(bl, SC_RUSHWINDMILL, -1);

-			status_change_end(bl, SC_ECHOSONG, -1);

-			status_change_end(bl, SC_HARMONIZE, -1);

-			status_change_end(bl, SC_SIRCLEOFNATURE, -1);

-			status_change_end(bl, SC_SATURDAYNIGHTFEVER, -1);

-			status_change_end(bl, SC_DANCEWITHWUG, -1);

-			status_change_end(bl, SC_LERADSDEW, -1);

-			status_change_end(bl, SC_MELODYOFSINK, -1);

-			status_change_end(bl, SC_BEYONDOFWARCRY, -1);

-			status_change_end(bl, SC_UNLIMITEDHUMMINGVOICE, -1);

+		{

+			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:

 		if( flag&1 ) {

 			struct status_change *tsc = status_get_sc(bl);

 			if( tsc && (tsc->data[SC_HIDING] || tsc->data[SC_CHASEWALK] || tsc->data[SC_CLOAKING] || tsc->data[SC_CLOAKINGEXCEED]) ) {

-				status_change_end(bl, SC_HIDING, -1);

-				status_change_end(bl, SC_CLOAKING, -1);

-				status_change_end(bl, SC_CHASEWALK, -1);

-				status_change_end(bl, SC_CLOAKINGEXCEED, -1);

+				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);

 				sc_start(bl,SC_STUN, 25 + 5 * skilllv,skilllv,skill_get_time(skillid,skilllv));//Does it apply the stun chance to targets knocked out of hiding, or it applys allways? [Rytech]

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

 			} else

@@ -4330,7 +4339,7 @@

 		break;

 	case WM_LULLABY_DEEPSLEEP:

-		if( rand()%100 < 88 + 2 * skilllv )

+		if( rnd()%100 < 88 + 2 * skilllv )

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

 		break;

@@ -4338,10 +4347,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, -1);

+			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;

@@ -4355,7 +4364,7 @@

 		break;

 	case GN_CRAZYWEED:

-		if( rand()%100 < 75 ) {

+		if( rnd()%100 < 75 ) {

 			if( bl->type == BL_SKILL ) {

 				struct skill_unit *su = (struct skill_unit *)bl;

 				if( !su )

@@ -4399,7 +4408,7 @@

 			int i = skill_get_splash(skillid,skilllv);

 			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( rand()%100 < 30 )

+			if( rnd()%100 < 30 )

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

 			else

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

@@ -4409,7 +4418,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( rand()%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);

@@ -4422,7 +4431,7 @@

 			int i = skill_get_splash(skillid,skilllv);

 			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( rand()%100 < 30 )

+			if( rnd()%100 < 30 )

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

 			else

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

@@ -4451,7 +4460,7 @@

 			if( (sc && sc->data[type2]) || (tsc && tsc->data[type]) ) {

 				elemental_clean_single_effect(ele, skillid);

 			}

-			if( rand()%100 < 50 )

+			if( rnd()%100 < 50 )

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

 			else {

 				sc_start(src,type2,100,skilllv,skill_get_time(skillid,skilllv));

@@ -5435,8 +5444,8 @@

 	case NC_EMERGENCYCOOL:

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

-		status_change_end(src,SC_OVERHEAT_LIMITPOINT,-1);

-		status_change_end(src,SC_OVERHEAT,-1);

+		status_change_end(src,SC_OVERHEAT_LIMITPOINT,INVALID_TIMER);

+		status_change_end(src,SC_OVERHEAT,INVALID_TIMER);

 		break;

 	case SR_WINDMILL:

 	case GN_CART_TORNADO:

@@ -7446,9 +7455,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, -1);

-				status_change_end(bl, SC_STONE, -1);

-				status_change_end(bl, SC_BLIND, -1);

+                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,

@@ -7465,9 +7474,9 @@

 			if( (tsc && (tsc->data[SC_SLEEP] || tsc->data[SC_STUN] ||

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

 			{

-				status_change_end(bl, SC_SLEEP, -1);

-				status_change_end(bl, SC_STUN, -1);

-				status_change_end(bl, SC_SILENCE, -1);

+				status_change_end(bl, SC_SLEEP, INVALID_TIMER);

+				status_change_end(bl, SC_STUN, INVALID_TIMER);

+				status_change_end(bl, SC_SILENCE, INVALID_TIMER);

 			}

 			clif_skill_nodamage(bl, bl, skillid, skilllv,

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

@@ -7540,7 +7549,7 @@

 					break;

 				}

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

-				status_change_end(bl,(sc_type)i,-1);

+				status_change_end(bl,(sc_type)i,INVALID_TIMER);

 			}

 			break;

 		}

@@ -7606,7 +7615,7 @@

 				break; // Already work on this target

 			if( tsc && tsc->data[SC_STONE] )

-				status_change_end(bl,SC_STONE,-1);

+				status_change_end(bl,SC_STONE,INVALID_TIMER);

 			else

 				status_change_start(bl,SC_STONE,10000,skilllv,0,0,1000,(8+2*skilllv)*1000,2);

 		}

@@ -7622,7 +7631,7 @@

 				else

 				{

 					rate = 1;

-					status_change_end(bl,SC_STONE,-1);

+					status_change_end(bl,SC_STONE,INVALID_TIMER);

 				}

 				if( rate )

@@ -7732,7 +7741,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;

 		}

@@ -7822,7 +7831,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;

@@ -7840,11 +7849,11 @@

 			if( tsc && (tsc->data[SC_HIDING] || tsc->data[SC_CLOAKING] ||

 						tsc->data[SC_CHASEWALK] || tsc->data[SC_CLOAKINGEXCEED] ||

 						tsc->data[SC__INVISIBILITY]) ) {

-				status_change_end(bl, SC_HIDING, -1);

-				status_change_end(bl, SC_CLOAKING, -1);

-				status_change_end(bl, SC_CHASEWALK, -1);

-				status_change_end(bl, SC_CLOAKINGEXCEED, -1);

-				status_change_end(bl, SC__INVISIBILITY, -1);

+				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);

+				status_change_end(bl, SC__INVISIBILITY, INVALID_TIMER);

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

 				sc_start(bl,SC_BLIND,53 + 2 * skilllv,skilllv,skill_get_time(skillid,skilllv));

@@ -7894,7 +7903,7 @@

 	case LG_REFLECTDAMAGE:

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

-			status_change_end(bl,type,-1);

+			status_change_end(bl,type,INVALID_TIMER);

 		else

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

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

@@ -7930,7 +7939,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,-1);

+								status_change_end(bl,SC_SHIELDSPELL_DEF, INVALID_TIMER);

 								break;

 							case 2:

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

@@ -7958,7 +7967,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|2,skill_castend_damage_id);

-							status_change_end(bl,SC_SHIELDSPELL_MDEF,-1);

+							status_change_end(bl,SC_SHIELDSPELL_MDEF,INVALID_TIMER);

 							break;

 						case 2:

 							sc_start(bl,SC_SHIELDSPELL_MDEF,100,opt,-1);

@@ -8149,7 +8158,7 @@

 			if( !status_isdead(bl) )

 				break;

-			if( rand()%100 < 88 + 2 * skilllv ) {

+			if( rnd()%100 < 88 + 2 * skilllv ) {

 				int heal = tstatus->sp;

 				if( heal <= 0 )

 					heal = 1;

@@ -8196,7 +8205,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),

@@ -8246,9 +8255,9 @@

 	case WM_RANDOMIZESPELL: {

 			int improv_skillid = 0, improv_skilllv;

 			do {

-				i = rand() % MAX_SKILL_IMPROVISE_DB;

+				i = rnd() % MAX_SKILL_IMPROVISE_DB;

 				improv_skillid = skill_improvise_db[i].skillid;

-			} while( improv_skillid == 0 || rand()%10000 >= skill_improvise_db[i].per );

+			} while( improv_skillid == 0 || rnd()%10000 >= skill_improvise_db[i].per );

 			improv_skilllv = 4 + skilllv;

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

@@ -8777,7 +8786,7 @@

 		if (ud->state.running && ud->skillid == TK_JUMPKICK)

         {

             ud->state.running = 0;

-            status_change_end(src, SC_RUN, -1);

+            status_change_end(src, SC_RUN, INVALID_TIMER);

 			flag = 1;

 		}

@@ -9505,7 +9514,7 @@

 		}

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

 		skill_unitsetting(src, skillid, skilllv, x, y, flag);

-		status_change_end(src,SC_POISONINGWEAPON,-1);

+		status_change_end(src,SC_POISONINGWEAPON,INVALID_TIMER);

 		break;

 	/**

 	 * Arch Bishop

@@ -9609,7 +9618,7 @@

 	case LG_BANDING:

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

-			status_change_end(src,SC_BANDING,-1);

+			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);

@@ -9678,11 +9687,11 @@

 			}

 		}

 		break;

-		

+

 	case SO_FIREWALK:

 	case SO_ELECTRICWALK:

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

-			status_change_end(src,type,-1);

+			status_change_end(src,type,INVALID_TIMER);

 		clif_skill_nodamage(src, src ,skillid, skilllv,

 							sc_start2(src, type, 100, skillid, skilllv, skill_get_time(skillid, skilllv)));

 		break;

@@ -11052,18 +11061,14 @@

 					}

 					hp = tstatus->max_hp * hp / 100;

 					sp = tstatus->max_sp * sp / 100;

-					status_heal(bl, hp, sp, 0);

-					if( tstatus->hp < tstatus->max_hp )

-						clif_skill_nodamage(&src->bl, bl, AL_HEAL, hp, 1);

-					if( tstatus->sp < tstatus->max_sp )

-						clif_skill_nodamage(&src->bl, bl, MG_SRECOVERY, sp, 1);

+					status_heal(bl, hp, sp, 2);

 					sc_start(bl, type, 100, sg->skill_lv, (sg->interval * 3) + 100);

 				}

 				// 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,-1);

-					status_change_end(bl,SC_CLOAKING,-1);

+					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]

@@ -11105,7 +11110,7 @@

 			if( tsc ) {

 				if( !sg->val2 ) {

 					int sec = skill_get_time2(sg->skill_id, sg->skill_lv);

-					if( status_change_start(bl, type, 10000, sg->skill_lv, 0, 0, 0, sec, 0) ) {

+					if( sc_start(bl, type, 100, sg->skill_lv, sec) ) {

 						const struct TimerData* td = tsc->data[type]?get_timer(tsc->data[type]->timer):NULL; 

 						if( td )

 							sec = DIFF_TICK(td->tick, tick);

@@ -12172,7 +12177,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;

@@ -12180,7 +12185,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.

@@ -12190,19 +12195,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;			

@@ -13929,7 +13934,7 @@

 		if( !wall )

 		{

 			if( sce->val1 < 3 ) //End camouflage.

-				status_change_end(bl, SC_CAMOUFLAGE, -1);

+				status_change_end(bl, SC_CAMOUFLAGE, INVALID_TIMER);

 			else

 			if( sce->val3&1 )

 			{	//Remove wall bonus

@@ -14042,7 +14047,7 @@

 		case RA_ELECTRICSHOCKER: {

 				struct block_list* target = map_id2bl(group->val2);

 				if( target )

-					status_change_end(target, SC_ELECTRICSHOCKER, -1);	

+					status_change_end(target, SC_ELECTRICSHOCKER, INVALID_TIMER);	

 			}

 			break;

 		case SC_MAELSTROM:

@@ -14237,7 +14242,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,-1);

+					status_change_end(src,SC_NEUTRALBARRIER_MASTER, INVALID_TIMER);

 				}

 			}

 			break;

@@ -14246,7 +14251,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,-1);

+					status_change_end(src,SC_STEALTHFIELD_MASTER, INVALID_TIMER);

 				}

 			}

 			break;

@@ -14255,7 +14260,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,-1);

+					status_change_end(src,SC_BANDING, INVALID_TIMER);

 				}

 			}

 			break;

@@ -15118,10 +15123,10 @@

 						qty = 3;

 						break;				//3 items to make at once.

 					case 9:

-						qty = 3 + rand()%3;

+						qty = 3 + rnd()%3;

 						break;					//3~5 items to make at once.

 					case 10:

-						qty = 4 + rand()%3;

+						qty = 4 + rnd()%3;

 						break;					//4~6 items to make at once.

 					default:

 						qty = 2;

@@ -15237,8 +15242,8 @@

 			tmp_item.amount = 0;

 			if( skill_id == GN_MIX_COOKING && firstQty > 1 ) {// Mix Cooking level 2.

 			// Success. As I see the chance as level 2 is global, not indiviual.

-				if( rand()%10000 < make_per )

-					tmp_item.amount = 5 + rand()%5;

+				if( rnd()%10000 < make_per )

+					tmp_item.amount = 5 + rnd()%5;

 			} else {

 				for (i=0; i< qty; i++) {	//Apply quantity modifiers.

 					if (rnd()%10000 < make_per || qty == 1) { //Success

@@ -15357,11 +15362,11 @@

 					memset(&tmp_item,0,sizeof(tmp_item));

 					tmp_item.nameid = nameid;

 					do {

-						i = rand()%5;

+						i = rnd()%5;

 						tmp_item.nameid = products[i][0];

 					}

-					while( rand()%10000 >= products[i][1] );

-					tmp_item.amount = (firstQty > 1 )? 5 + rand()%5 : 1; // When it fails it gives a random amount of items.

+					while( rnd()%10000 >= products[i][1] );

+					tmp_item.amount = (firstQty > 1 )? 5 + rnd()%5 : 1; // When it fails it gives a random amount of items.

 					tmp_item.identify = 1;

 					if( pc_additem(sd,&tmp_item,tmp_item.amount,LOG_TYPE_PRODUCE) ) {

 						clif_additem(sd,0,0,flag);

@@ -15521,7 +15526,7 @@

 	int i, j, points, skillid, preserved = 0, max_preserve;

 	nullpo_ret(sd);

-	if( sd->sc.data[SC_STOP] ) status_change_end(&sd->bl,SC_STOP,-1);

+	if( sd->sc.data[SC_STOP] ) status_change_end(&sd->bl,SC_STOP,INVALID_TIMER);

 	if( nameid <= 0 ) return 0;

 	if( pc_search_inventory(sd,nameid) < 0 )

@@ -15571,13 +15576,13 @@

 	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,-1);

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

 	}

 	if( (id = sd->status.skill[skill_id].id) == 0 || sd->status.skill[skill_id].flag != SKILL_FLAG_PLAGIARIZED ||

@@ -15592,6 +15597,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;

@@ -15610,8 +15616,8 @@

 		if( skill_lv == 2 )

 			del_amount -= (del_amount % 10);

-		add_amount = (skill_lv == 1) ? del_amount * (5 + rand()%5) : 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;

@@ -15638,7 +15644,7 @@

 			return 1;

 		}

-		if( skill_lv == 2 && rand()%100 < 25 ) {	// At level 2 have a fail chance. You loose your items if it fails.

+		if( skill_lv == 2 && rnd()%100 < 25 ) {	// At level 2 have a fail chance. You loose your items if it fails.

 			clif_skill_fail(sd,SO_EL_ANALYSIS,0,0);

 			return 1;

 		}

Index: src/map/unit.c

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

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

+++ 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;

@@ -155,7 +155,7 @@

 	if(map_getcell(bl->m,x+dx,y+dy,CELL_CHKNOPASS))

 		return unit_walktoxy_sub(bl);

-	// ƒoƒVƒŠƒJ”»’è

+	// ￜoￜVￜￜￜJￜￜￜￜ

 	map_foreachinmovearea(clif_outsight, bl, AREA_SIZE, dx, dy, sd?BL_ALL:BL_PC, bl);

@@ -309,8 +309,8 @@

 		map_random_dir(bl, &ud->to_x, &ud->to_y);

 	if(ud->walktimer != INVALID_TIMER) {

-		// Œ»Ý•à‚¢‚Ä‚¢‚éÅ’†‚Ì–Ú“I’n•ÏX‚Ȃ̂Ń}ƒX–Ú‚Ì’†S‚É—ˆ‚œŽž‚É

-		// timerŠÖ”‚©‚çunit_walktoxy_sub‚ðŒÄ‚Ô‚æ‚€‚É‚·‚é

+		// ￜￜￜݕￜￜￜￜĂￜￜￜŒￜￜ̖ړIï¿œnￜύXￜȂ̂Ń}ï¿œXￜڂ̒ￜￜSￜɗￜￜￜￜￜￜￜ

+		// timerￜ֐ￜￜￜￜￜunit_walktoxy_subￜￜￜĂԂ悀ￜɂￜￜￜ

 		ud->state.change_walk_target = 1;

 		return 1;

 	}

@@ -491,7 +491,7 @@

 	nullpo_ret(bl);

 	if (!unit_can_move(bl)) {

-		status_change_end(bl,SC_WUGDASH,-1);

+		status_change_end(bl,SC_WUGDASH,INVALID_TIMER);

 		return 0;

 	}

@@ -516,7 +516,7 @@

 	if(to_x == bl->x && to_y == bl->y) {

 		unit_bl2ud(bl)->state.running = 0;

-		status_change_end(bl,SC_WUGDASH,-1);

+		status_change_end(bl,SC_WUGDASH, INVALID_TIMER);

 		if( sd ){

 			clif_fixpos(bl);

@@ -533,7 +533,7 @@

 	if (i==0) {

 		unit_bl2ud(bl)->state.running = 0;

-		status_change_end(bl,SC_WUGDASH,-1);

+		status_change_end(bl,SC_WUGDASH,INVALID_TIMER);

 		if( sd ){

 			clif_fixpos(bl);

@@ -1004,8 +1004,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);

@@ -1091,7 +1091,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:

@@ -1126,11 +1126,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;

@@ -1293,11 +1292,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,-1);

+			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,-1);

+			status_change_end(src,SC_CURSEDCIRCLE_ATKER, INVALID_TIMER);

 		}

 	}

@@ -1336,7 +1335,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);

@@ -1373,7 +1372,7 @@

 		return 0;

 	}

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

+	/* Check range and obstacle */

 	bl.type = BL_NUL;

 	bl.m = src->m;

 	bl.x = skill_x;

@@ -1425,7 +1424,7 @@

 		if( sc->data[SC_CURSEDCIRCLE_ATKER] ) {

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

-			status_change_end(src,SC_CURSEDCIRCLE_ATKER,-1);

+			status_change_end(src,SC_CURSEDCIRCLE_ATKER, INVALID_TIMER);

 		}

 	}

@@ -1476,8 +1475,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)

 {

@@ -1564,7 +1563,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);

@@ -1608,7 +1607,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)

 {

@@ -1666,7 +1665,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)

 {

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

 	return 1;

 }

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

+// unit_data initialization process

 void unit_dataset(struct block_list *bl)

 {

 	struct unit_data *ud;

@@ -1930,7 +1929,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)

 {

Index: src/map/battle.h

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

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

+++ 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 15963)

+++ 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 15963)

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

@@ -66,60 +66,60 @@

 	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 target_lv);

-// 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);

@@ -128,7 +128,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 15963)

+++ 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 15963)

+++ 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 15963)

+++ 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);