Removed trailing whitespace (sources)

Signed-off-by: Haru <haru@dotalux.com>

71 files changed, 1147 insertions, 1143 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 6c0902644..289df62a4 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -797,7 +797,7 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 					StrBuf->Printf(&buf, "UPDATE `%s` SET `amount`='%d', `equip`='%d', `identify`='%d', `refine`='%d',`attribute`='%d', `expire_time`='%u', `bound`='%d'",
 						tablename, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time, items[i].bound);
  					for( j = 0; j < MAX_SLOTS; ++j )for( j = 0; j < MAX_SLOTS; ++j )
-						StrBuf->Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);	
+						StrBuf->Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
  					StrBuf->Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
 
 					if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
@@ -1674,7 +1674,7 @@ int make_new_char_sql(struct char_session_data* sd, char* name_, int str, int ag
 			{
 				if( SQL_ERROR == SQL->Query(sql_handle,
 					"INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')",
-					inventory_db, char_id, start_items[k], 1, 1) 
+					inventory_db, char_id, start_items[k], 1, 1)
 					)
 					Sql_ShowDebug(sql_handle);
 			}
@@ -2048,7 +2048,7 @@ int mmo_char_send006b(int fd, struct char_session_data* sd)
 	int j, offset = 0;
 #if PACKETVER >= 20100413
 	offset += 3;
-#endif	
+#endif
 	if (save_log)
 		ShowInfo("Loading Char Data ("CL_BOLD"%d"CL_RESET")\n",sd->account_id);
 	
@@ -3978,7 +3978,7 @@ static void char_delete2_req(int fd, struct char_session_data* sd)
 	// see issue: 7338
 	if( char_aegis_delete )
 	{
-		if( SQL_SUCCESS != SQL->Query(sql_handle, "SELECT `party_id`, `guild_id` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) 
+		if( SQL_SUCCESS != SQL->Query(sql_handle, "SELECT `party_id`, `guild_id` FROM `%s` WHERE `char_id`='%d'", char_db, char_id)
 		|| SQL_SUCCESS != SQL->NextRow(sql_handle)
 		)
 		{
@@ -4268,7 +4268,7 @@ int parse_char(int fd)
 				
 #if PACKETVER >= 20110309
 				if( *pincode->enabled ){ // hack check
-					struct online_char_data* character;	
+					struct online_char_data* character;
 					character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
 					if( character && character->pincode_enable == -1){
 						WFIFOHEAD(fd,3);
@@ -4508,7 +4508,7 @@ int parse_char(int fd)
 				int i;
 #if PACKETVER >= 20110309
 				if( *pincode->enabled ){ // hack check
-					struct online_char_data* character;	
+					struct online_char_data* character;
 					character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
 					if( character && character->pincode_enable == -1 ){
 						WFIFOHEAD(fd,3);
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 886b5be26..d246e9851 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -268,7 +268,7 @@ static void mapif_parse_Auction_requestlist(int fd)
 
 	for( auction = dbi_first(iter); dbi_exists(iter); auction = dbi_next(iter) )
 	{
-		if( (type == 0 && auction->type != IT_ARMOR && auction->type != IT_PETARMOR) || 
+		if( (type == 0 && auction->type != IT_ARMOR && auction->type != IT_PETARMOR) ||
 			(type == 1 && auction->type != IT_WEAPON) ||
 			(type == 2 && auction->type != IT_CARD) ||
 			(type == 3 && auction->type != IT_ETC) ||
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 3e4a743d6..5dd64a32b 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -652,7 +652,7 @@ int mapif_parse_PartyChangeMap(int fd, int party_id, int account_id, int char_id
 	if (p == NULL)
 		return 0;
 
-	for(i = 0; i < MAX_PARTY && 
+	for(i = 0; i < MAX_PARTY &&
 		(p->party.member[i].account_id != account_id ||
 		p->party.member[i].char_id != char_id); i++);
 
@@ -666,7 +666,7 @@ int mapif_parse_PartyChangeMap(int fd, int party_id, int account_id, int char_id
 		else
 			p->party.count--;
 		// Even share check situations: Family state (always breaks)
-		// character logging on/off is max/min level (update level range) 
+		// character logging on/off is max/min level (update level range)
 		// or character logging on/off has a different level (update level range using new level)
 		if (p->family ||
 			(p->party.member[i].lv <= p->min_lv || p->party.member[i].lv >= p->max_lv) ||
@@ -731,7 +731,7 @@ int mapif_parse_PartyLeaderChange(int fd,int party_id,int account_id,int char_id
 
 	for (i = 0; i < MAX_PARTY; i++)
 	{
-		if(p->party.member[i].leader) 
+		if(p->party.member[i].leader)
 			p->party.member[i].leader = 0;
 		if(p->party.member[i].account_id == account_id &&
 			p->party.member[i].char_id == char_id)
diff --git a/src/char/int_party.h b/src/char/int_party.h
index 098c1e9a9..33325b46b 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -6,7 +6,7 @@
 
 //Party Flags on what to save/delete.
 enum {
-	PS_CREATE = 0x01, //Create a new party entry (index holds leader's info) 
+	PS_CREATE = 0x01, //Create a new party entry (index holds leader's info)
 	PS_BASIC = 0x02, //Update basic party info.
 	PS_LEADER = 0x04, //Update party's leader
 	PS_ADDMEMBER = 0x08, //Specify new party member (index specifies which party member)
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 00b92dc60..d33a4c1aa 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -505,7 +505,7 @@ bool hplugins_addpacket(unsigned short cmd, short length,void (*receive) (int fd
 	
 	return true;
 }
-/* 
+/*
  0 = unknown
  1 = OK
  2 = incomplete
@@ -635,7 +635,7 @@ bool hpm_add_arg(unsigned int pluginID, char *name, bool has_param, void (*func)
 	
 	CREATE(data, struct HPMArgData, 1);
 	
-	data->pluginID = pluginID;	
+	data->pluginID = pluginID;
 	data->name = aStrdup(name);
 	data->func = func;
 	data->help = help;
diff --git a/src/common/atomic.h b/src/common/atomic.h
index 8c01943e7..1349d0887 100644
--- a/src/common/atomic.h
+++ b/src/common/atomic.h
@@ -4,16 +4,16 @@
 #ifndef _COMMON_ATOMIC_H_
 #define _COMMON_ATOMIC_H_
 
-// Atomic Operations 
+// Atomic Operations
 // (Interlocked CompareExchange, Add .. and so on ..)
-// 
+//
 // Implementation varies / depends on:
 //	- Architecture
 //	- Compiler
 //	- Operating System
 //
 // our Abstraction is fully API-Compatible to Microsofts implementation @ NT5.0+
-// 
+//
 #include "../common/cbasetypes.h"
 
 #if defined(_MSC_VER)
@@ -36,7 +36,7 @@ forceinline int64 InterlockedCompareExchange64(volatile int64 *dest, int64 exch,
 		mov ecx,4[edi];
 		mov esi,dest;
 		
-		lock CMPXCHG8B [esi];					
+		lock CMPXCHG8B [esi];
 	}
 }
 
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index da0d6b307..ac65b08a8 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -313,7 +313,7 @@ typedef char bool;
 #undef swap
 #endif
 // hmm only ints?
-//#define swap(a,b) { int temp=a; a=b; b=temp;} 
+//#define swap(a,b) { int temp=a; a=b; b=temp;}
 // if using macros then something that is type independent
 //#define swap(a,b) ((a == b) || ((a ^= b), (b ^= a), (a ^= b)))
 // Avoid "value computed is not used" warning and generates the same assembly code
diff --git a/src/common/db.c b/src/common/db.c
index 1781aa96f..bbeaf0b61 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -94,7 +94,7 @@
 \*****************************************************************************/
 
 /**
- * If defined statistics about database nodes, database creating/destruction 
+ * If defined statistics about database nodes, database creating/destruction
  * and function usage are keept and displayed when finalizing the database
  * system.
  * WARNING: This adds overhead to every database operation (not shure how much).
@@ -522,7 +522,7 @@ static void db_rebalance_erase(DBNode node, DBNode *root)
 			x_parent = y->parent;
 			if (x) x->parent = y->parent;
 			y->parent->left = x;
-			// put the right of 'node' in 'y' 
+			// put the right of 'node' in 'y'
 			y->right = node->right;
 			node->right->parent = y;
 			// 'y' is a direct child of 'node'
@@ -1409,7 +1409,7 @@ DBData* dbit_obj_prev(DBIterator* self, DBKey* out_key)
 
 /**
  * Returns true if the fetched entry exists.
- * The databases entries might have NULL data, so use this to to test if 
+ * The databases entries might have NULL data, so use this to to test if
  * the iterator is done.
  * @param self Iterator
  * @return true if the entry exists
@@ -1426,7 +1426,7 @@ bool dbit_obj_exists(DBIterator* self)
 
 /**
  * Removes the current entry from the database.
- * NOTE: {@link DBIterator#exists} will return false until another entry 
+ * NOTE: {@link DBIterator#exists} will return false until another entry
  *       is fetched
  * Puts data of the removed entry in out_data, if out_data is not NULL.
  * @param self Iterator
@@ -1477,7 +1477,7 @@ void dbit_obj_destroy(DBIterator* self)
 /**
  * Returns a new iterator for this database.
  * The iterator keeps the database locked until it is destroyed.
- * The database will keep functioning normally but will only free internal 
+ * The database will keep functioning normally but will only free internal
  * memory when unlocked, so destroy the iterator as soon as possible.
  * @param self Database
  * @return New iterator
@@ -1615,7 +1615,7 @@ static DBData* db_obj_get(DBMap* self, DBKey key)
  * It puts a maximum of <code>max</code> entries into <code>buf</code>.
  * If <code>buf</code> is NULL, it only counts the matches.
  * Returns the number of entries that matched.
- * NOTE: if the value returned is greater than <code>max</code>, only the 
+ * NOTE: if the value returned is greater than <code>max</code>, only the
  * first <code>max</code> entries found are put into the buffer.
  * @param self Interface of the database
  * @param buf Buffer to put the data of the matched entries
@@ -1686,7 +1686,7 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max,
  * It puts a maximum of <code>max</code> entries into <code>buf</code>.
  * If <code>buf</code> is NULL, it only counts the matches.
  * Returns the number of entries that matched.
- * NOTE: if the value returned is greater than <code>max</code>, only the 
+ * NOTE: if the value returned is greater than <code>max</code>, only the
  * first <code>max</code> entries found are put into the buffer.
  * @param self Interface of the database
  * @param buf Buffer to put the data of the matched entries
@@ -1714,7 +1714,7 @@ static unsigned int db_obj_getall(DBMap* self, DBData **buf, unsigned int max, D
 
 /**
  * Get the data of the entry identified by the key.
- * If the entry does not exist, an entry is added with the data returned by 
+ * If the entry does not exist, an entry is added with the data returned by
  * <code>create</code>.
  * @param self Interface of the database
  * @param key Key that identifies the entry
@@ -1813,7 +1813,7 @@ static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_li
 /**
  * Just calls {@link DBMap#vensure}.
  * Get the data of the entry identified by the key.
- * If the entry does not exist, an entry is added with the data returned by 
+ * If the entry does not exist, an entry is added with the data returned by
  * <code>create</code>.
  * @param self Interface of the database
  * @param key Key that identifies the entry
@@ -2163,7 +2163,7 @@ static int db_obj_vclear(DBMap* self, DBApply func, va_list args)
  * Before deleting an entry, func is applied to it.
  * Releases the key and the data.
  * Returns the sum of values returned by func, if it exists.
- * NOTE: This locks the database globally. Any attempt to insert or remove 
+ * NOTE: This locks the database globally. Any attempt to insert or remove
  * a database entry will give an error and be aborted (except for clearing).
  * @param self Interface of the database
  * @param func Function to be applied to every entry before deleting
@@ -2191,7 +2191,7 @@ static int db_obj_clear(DBMap* self, DBApply func, ...)
  * Finalize the database, feeing all the memory it uses.
  * Before deleting an entry, func is applied to it.
  * Returns the sum of values returned by func, if it exists.
- * NOTE: This locks the database globally. Any attempt to insert or remove 
+ * NOTE: This locks the database globally. Any attempt to insert or remove
  * a database entry will give an error and be aborted (except for clearing).
  * @param self Interface of the database
  * @param func Function to be applied to every entry before deleting
@@ -2246,7 +2246,7 @@ static int db_obj_vdestroy(DBMap* self, DBApply func, va_list args)
  * Before deleting an entry, func is applied to it.
  * Releases the key and the data.
  * Returns the sum of values returned by func, if it exists.
- * NOTE: This locks the database globally. Any attempt to insert or remove 
+ * NOTE: This locks the database globally. Any attempt to insert or remove
  * a database entry will give an error and be aborted.
  * @param self Database
  * @param func Function to be applied to every entry before deleting
@@ -2448,7 +2448,7 @@ DBHasher db_default_hash(DBType type)
 }
 
 /**
- * Returns the default releaser for the specified type of database with the 
+ * Returns the default releaser for the specified type of database with the
  * specified options.
  * NOTE: the options are fixed with {@link #db_fix_options(DBType,DBOptions)}
  * before choosing the releaser.
@@ -2509,7 +2509,7 @@ DBReleaser db_custom_release(DBRelease which)
  * @param line Line of the file where the database is being allocated
  * @param type Type of database
  * @param options Options of the database
- * @param maxlen Maximum length of the string to be used as key in string 
+ * @param maxlen Maximum length of the string to be used as key in string
  *          databases. If 0, the maximum number of maxlen is used (64K).
  * @return The interface of the database
  * @public
diff --git a/src/common/db.h b/src/common/db.h
index 0d2548806..f5714ceaf 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -79,7 +79,7 @@ typedef enum DBRelease {
 
 /**
  * Supported types of database.
- * See {@link #db_fix_options(DBType,DBOptions)} for restrictions of the 
+ * See {@link #db_fix_options(DBType,DBOptions)} for restrictions of the
  * types of databases.
  * @param DB_INT Uses int's for keys
  * @param DB_UINT Uses unsigned int's for keys
@@ -107,14 +107,14 @@ typedef enum DBType {
 
 /**
  * Bitfield of options that define the behaviour of the database.
- * See {@link #db_fix_options(DBType,DBOptions)} for restrictions of the 
+ * See {@link #db_fix_options(DBType,DBOptions)} for restrictions of the
  * types of databases.
  * @param DB_OPT_BASE Base options: does not duplicate keys, releases nothing
  *          and does not allow NULL keys or NULL data.
- * @param DB_OPT_DUP_KEY Duplicates the keys internally. If DB_OPT_RELEASE_KEY 
+ * @param DB_OPT_DUP_KEY Duplicates the keys internally. If DB_OPT_RELEASE_KEY
  *          is defined, the real key is freed as soon as the entry is added.
  * @param DB_OPT_RELEASE_KEY Releases the key.
- * @param DB_OPT_RELEASE_DATA Releases the data whenever an entry is removed 
+ * @param DB_OPT_RELEASE_DATA Releases the data whenever an entry is removed
  *          from the database.
  *          WARNING: for funtions that return the data (like DBMap::remove),
  *          a dangling pointer will be returned.
@@ -188,7 +188,7 @@ typedef struct DBData {
 } DBData;
 
 /**
- * Format of functions that create the data for the key when the entry doesn't 
+ * Format of functions that create the data for the key when the entry doesn't
  * exist in the database yet.
  * @param key Key of the database entry
  * @param args Extra arguments of the function
@@ -200,9 +200,9 @@ typedef struct DBData {
 typedef DBData (*DBCreateData)(DBKey key, va_list args);
 
 /**
- * Format of functions to be applied to an unspecified quantity of entries of 
+ * Format of functions to be applied to an unspecified quantity of entries of
  * a database.
- * Any function that applies this function to the database will return the sum 
+ * Any function that applies this function to the database will return the sum
  * of values returned by this function.
  * @param key Key of the database entry
  * @param data Data of the database entry
@@ -280,7 +280,7 @@ typedef struct DBMap DBMap;
  * Database iterator.
  * Supports forward iteration, backward iteration and removing entries from the database.
  * The iterator is initially positioned before the first entry of the database.
- * While the iterator exists the database is locked internally, so invoke 
+ * While the iterator exists the database is locked internally, so invoke
  * {@link DBIterator#destroy} as soon as possible.
  * @public
  * @see #DBMap
@@ -334,7 +334,7 @@ struct DBIterator
 
 	/**
 	 * Returns true if the fetched entry exists.
-	 * The databases entries might have NULL data, so use this to to test if 
+	 * The databases entries might have NULL data, so use this to to test if
 	 * the iterator is done.
 	 * @param self Iterator
 	 * @return true is the entry exists
@@ -344,7 +344,7 @@ struct DBIterator
 
 	/**
 	 * Removes the current entry from the database.
-	 * NOTE: {@link DBIterator#exists} will return false until another entry 
+	 * NOTE: {@link DBIterator#exists} will return false until another entry
 	 *       is fetched
 	 * Puts data of the removed entry in out_data, if out_data is not NULL.
 	 * @param self Iterator
@@ -375,7 +375,7 @@ struct DBMap {
 	/**
 	 * Returns a new iterator for this database.
 	 * The iterator keeps the database locked until it is destroyed.
-	 * The database will keep functioning normally but will only free internal 
+	 * The database will keep functioning normally but will only free internal
 	 * memory when unlocked, so destroy the iterator as soon as possible.
 	 * @param self Database
 	 * @return New iterator
@@ -407,7 +407,7 @@ struct DBMap {
 	 * It puts a maximum of <code>max</code> entries into <code>buf</code>.
 	 * If <code>buf</code> is NULL, it only counts the matches.
 	 * Returns the number of entries that matched.
-	 * NOTE: if the value returned is greater than <code>max</code>, only the 
+	 * NOTE: if the value returned is greater than <code>max</code>, only the
 	 * first <code>max</code> entries found are put into the buffer.
 	 * @param self Database
 	 * @param buf Buffer to put the data of the matched entries
@@ -425,7 +425,7 @@ struct DBMap {
 	 * It puts a maximum of <code>max</code> entries into <code>buf</code>.
 	 * If <code>buf</code> is NULL, it only counts the matches.
 	 * Returns the number of entries that matched.
-	 * NOTE: if the value returned is greater than <code>max</code>, only the 
+	 * NOTE: if the value returned is greater than <code>max</code>, only the
 	 * first <code>max</code> entries found are put into the buffer.
 	 * @param self Database
 	 * @param buf Buffer to put the data of the matched entries
@@ -441,7 +441,7 @@ struct DBMap {
 	/**
 	 * Just calls {@link DBMap#vensure}.
 	 * Get the data of the entry identified by the key.
-	 * If the entry does not exist, an entry is added with the data returned by 
+	 * If the entry does not exist, an entry is added with the data returned by
 	 * <code>create</code>.
 	 * @param self Database
 	 * @param key Key that identifies the entry
@@ -455,7 +455,7 @@ struct DBMap {
 
 	/**
 	 * Get the data of the entry identified by the key.
-	 * If the entry does not exist, an entry is added with the data returned by 
+	 * If the entry does not exist, an entry is added with the data returned by
 	 * <code>create</code>.
 	 * @param self Database
 	 * @param key Key that identifies the entry
@@ -552,7 +552,7 @@ struct DBMap {
 	 * Before deleting an entry, func is applied to it.
 	 * Releases the key and the data.
 	 * Returns the sum of values returned by func, if it exists.
-	 * NOTE: This locks the database globally. Any attempt to insert or remove 
+	 * NOTE: This locks the database globally. Any attempt to insert or remove
 	 * a database entry will give an error and be aborted (except for clearing).
 	 * @param self Database
 	 * @param func Function to be applied to every entry before deleting
@@ -567,7 +567,7 @@ struct DBMap {
 	 * Finalize the database, feeing all the memory it uses.
 	 * Before deleting an entry, func is applied to it.
 	 * Returns the sum of values returned by func, if it exists.
-	 * NOTE: This locks the database globally. Any attempt to insert or remove 
+	 * NOTE: This locks the database globally. Any attempt to insert or remove
 	 * a database entry will give an error and be aborted (except for clearing).
 	 * @param self Database
 	 * @param func Function to be applied to every entry before deleting
@@ -759,7 +759,7 @@ DBComparator (*default_cmp) (DBType type);
 DBHasher (*default_hash) (DBType type);
 
 /**
- * Returns the default releaser for the specified type of database with the 
+ * Returns the default releaser for the specified type of database with the
  * specified options.
  * NOTE: the options are fixed by {@link #db_fix_options(DBType,DBOptions)}
  * before choosing the releaser
@@ -788,7 +788,7 @@ DBReleaser (*custom_release)  (DBRelease which);
 
 /**
  * Allocate a new database of the specified type.
- * It uses the default comparator, hasher and releaser of the specified 
+ * It uses the default comparator, hasher and releaser of the specified
  * database type and fixed options.
  * NOTE: the options are fixed by {@link #db_fix_options(DBType,DBOptions)}
  * before creating the database.
@@ -796,7 +796,7 @@ DBReleaser (*custom_release)  (DBRelease which);
  * @param line Line of the file where the database is being allocated
  * @param type Type of database
  * @param options Options of the database
- * @param maxlen Maximum length of the string to be used as key in string 
+ * @param maxlen Maximum length of the string to be used as key in string
  *          databases. If 0, the maximum number of maxlen is used (64K).
  * @return The interface of the database
  * @public
diff --git a/src/common/ers.c b/src/common/ers.c
index d9895e4f2..39e05a14c 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -78,7 +78,7 @@ typedef struct ers_cache
 	// Memory blocks array
 	unsigned char **Blocks;
 
-	// Max number of blocks 
+	// Max number of blocks
 	unsigned int Max;
 
 	// Free objects count
@@ -190,26 +190,19 @@ static void *ers_obj_alloc_entry(ERS self)
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 	void *ret;
 
-	if (instance == NULL) 
-	{
+	if (instance == NULL) {
 		ShowError("ers_obj_alloc_entry: NULL object, aborting entry freeing.\n");
 		return NULL;
 	}
 
-	if (instance->Cache->ReuseList != NULL)
-	{
+	if (instance->Cache->ReuseList != NULL) {
 		ret = (void *)((unsigned char *)instance->Cache->ReuseList + sizeof(struct ers_list));
 		instance->Cache->ReuseList = instance->Cache->ReuseList->Next;
-	} 
-	else if (instance->Cache->Free > 0) 
-	{
+	} else if (instance->Cache->Free > 0) {
 		instance->Cache->Free--;
 		ret = &instance->Cache->Blocks[instance->Cache->Used - 1][instance->Cache->Free * instance->Cache->ObjectSize + sizeof(struct ers_list)];
-	} 
-	else 
-	{
-		if (instance->Cache->Used == instance->Cache->Max) 
-		{
+	} else {
+		if (instance->Cache->Used == instance->Cache->Max) {
 			instance->Cache->Max = (instance->Cache->Max * 4) + 3;
 			RECREATE(instance->Cache->Blocks, unsigned char *, instance->Cache->Max);
 		}
@@ -237,13 +230,10 @@ static void ers_obj_free_entry(ERS self, void *entry)
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 	struct ers_list *reuse = (struct ers_list *)((unsigned char *)entry - sizeof(struct ers_list));
 
-	if (instance == NULL) 
-	{
+	if (instance == NULL) {
 		ShowError("ers_obj_free_entry: NULL object, aborting entry freeing.\n");
 		return;
-	} 
-	else if (entry == NULL) 
-	{
+	} else if (entry == NULL) {
 		ShowError("ers_obj_free_entry: NULL entry, nothing to free.\n");
 		return;
 	}
@@ -261,11 +251,10 @@ static size_t ers_obj_entry_size(ERS self)
 {
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 
-	if (instance == NULL) 
-	{
+	if (instance == NULL) {
 		ShowError("ers_obj_entry_size: NULL object, aborting entry freeing.\n");
 		return 0;
-	} 
+	}
 
 	return instance->Cache->ObjectSize;
 }
@@ -274,8 +263,7 @@ static void ers_obj_destroy(ERS self)
 {
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 
-	if (instance == NULL) 
-	{
+	if (instance == NULL) {
 		ShowError("ers_obj_destroy: NULL object, aborting entry freeing.\n");
 		return;
 	}
diff --git a/src/common/ers.h b/src/common/ers.h
index 23a996923..7eceaf87a 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -55,7 +55,7 @@
 /**
  * Define this to disable the Entry Reusage System.
  * All code except the typedef of ERInterface will be disabled.
- * To allow a smooth transition, 
+ * To allow a smooth transition,
  */
 //#define DISABLE_ERS
 
@@ -63,7 +63,7 @@
  * Entries are aligned to ERS_ALIGNED bytes in the blocks of entries.
  * By default it aligns to one byte, using the "natural order" of the entries.
  * This should NEVER be set to zero or less.
- * If greater than one, some memory can be wasted. This should never be needed 
+ * If greater than one, some memory can be wasted. This should never be needed
  * but is here just in case some aligment issues arise.
  */
 #ifndef ERS_ALIGNED
@@ -118,7 +118,7 @@ typedef struct eri {
 	/**
 	 * Destroy this instance of the manager.
 	 * The manager is actually only destroyed when all the instances are destroyed.
-	 * When destroying the manager a warning is shown if the manager has 
+	 * When destroying the manager a warning is shown if the manager has
 	 * missing/extra entries.
 	 * @param self Interface of the entry manager
 	 */
@@ -140,7 +140,7 @@ typedef struct eri {
 #	define ers_report()
 #	define ers_final()
 #else /* not DISABLE_ERS */
-// These defines should be used to allow the code to keep working whenever 
+// These defines should be used to allow the code to keep working whenever
 // the system is disabled
 #	define ers_alloc(obj,type) ((type *)(obj)->alloc(obj))
 #	define ers_free(obj,entry) ((obj)->free((obj),(entry)))
@@ -151,9 +151,9 @@ typedef struct eri {
 /**
  * Get a new instance of the manager that handles the specified entry size.
  * Size has to greater than 0.
- * If the specified size is smaller than a pointer, the size of a pointer is 
+ * If the specified size is smaller than a pointer, the size of a pointer is
  * used instead.
- * It's also aligned to ERS_ALIGNED bytes, so the smallest multiple of 
+ * It's also aligned to ERS_ALIGNED bytes, so the smallest multiple of
  * ERS_ALIGNED that is greater or equal to size is what's actually used.
  * @param The requested size of the entry in bytes
  * @return Interface of the object
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 13cf0b5ce..74303fa92 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -21,7 +21,7 @@ struct malloc_interface iMalloc_s;
 
 #if defined(MEMWATCH)
 
-#	include <string.h> 
+#	include <string.h>
 #	include "memwatch.h"
 #	define MALLOC(n,file,line,func)    mwMalloc((n),(file),(line))
 #	define CALLOC(m,n,file,line,func)  mwCalloc((m),(n),(file),(line))
@@ -421,7 +421,7 @@ void _mfree(void *ptr, const char *file, int line, const char *func )
 	struct unit_head *head;
 
 	if (ptr == NULL)
-		return; 
+		return;
 
 	head = (struct unit_head *)((char *)ptr - sizeof(struct unit_head) + sizeof(long));
 	if(head->size == 0) {
diff --git a/src/common/mutex.c b/src/common/mutex.c
index 12524c3b7..1de707e95 100644
--- a/src/common/mutex.c
+++ b/src/common/mutex.c
@@ -119,7 +119,7 @@ void ramutex_unlock( ramutex m ){
 
 ///////////////
 // Condition Variables
-// 
+//
 // Implementation:
 //
 
diff --git a/src/common/mutex.h b/src/common/mutex.h
index 3b83b66d6..f78e31841 100644
--- a/src/common/mutex.h
+++ b/src/common/mutex.h
@@ -1,5 +1,5 @@
 // Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder  
+// For more information, see LICENCE in the main folder
 
 #ifndef _COMMON_MUTEX_H_
 #define _COMMON_MUTEX_H_
@@ -10,36 +10,36 @@ typedef struct ramutex *ramutex; // Mutex
 typedef struct racond *racond; // Condition Var
 
 /**
- * Creates a Mutex 
+ * Creates a Mutex
  *
  * @return not NULL
  */
 ramutex ramutex_create();
 
-/** 
+/**
  * Destroys a Mutex
- * 
+ *
  * @param m - the mutex to destroy
  */
 void ramutex_destroy( ramutex m );
 
-/** 
+/**
  * Gets a lock
  *
  * @param m - the mutex to lock
  */
 void ramutex_lock( ramutex m);
 
-/** 
+/**
  * Trys to get the Lock
- * 
+ *
  * @param m - the mutex try to lock
- * 
+ *
  * @return boolean (true = got the lock)
  */
 bool ramutex_trylock( ramutex m );
 
-/** 
+/**
  * Unlocks a mutex
  *
  * @param m - the mutex to unlock
@@ -47,14 +47,14 @@ bool ramutex_trylock( ramutex m );
 void ramutex_unlock( ramutex m);
 
 
-/** 
+/**
  * Creates a Condition variable
  *
  * @return not NULL
  */
 racond racond_create();
 
-/** 
+/**
  * Destroy a Condition variable
  *
  * @param c - the condition varaible to destroy
@@ -63,14 +63,14 @@ void racond_destroy( racond c );
 
 /**
  * Waits Until state is signalled
- * 
- * @param c - the condition var to wait for signalled state 
+ *
+ * @param c - the condition var to wait for signalled state
  * @param m - the mutex used for syncronization
  * @param timeout_ticks - timeout in ticks ( -1 = INFINITE )
  */
 void racond_wait( racond c,  ramutex m,  sysint timeout_ticks);
 
-/** 
+/**
  * Sets the given condition var to signalled state
  *
  * @param c - condition var to set in signalled state.
@@ -80,13 +80,13 @@ void racond_wait( racond c,  ramutex m,  sysint timeout_ticks);
  */
 void racond_signal( racond c );
 
-/** 
+/**
  * Sets notifys all waiting threads thats signalled.
  * @param c - condition var to set in signalled state
- * 
+ *
  * @note:
  *  All Waiters getting notified.
- */ 
+ */
 void racond_broadcast( racond c );
 
 
diff --git a/src/common/nullpo.c b/src/common/nullpo.c
index 1891835f1..a3471b00d 100644
--- a/src/common/nullpo.c
+++ b/src/common/nullpo.c
@@ -14,7 +14,7 @@
 
 /**
  * Reports failed assertions or NULL pointers
- * 
+ *
  * @param file       Source file where the error was detected
  * @param line       Line
  * @param func       Function
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 1dbcba282..2a8e2d5f8 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -91,7 +91,7 @@ int console_msg_log = 0;//[Ind] msg error logging
 //  ansi compatible printf with control sequence parser for windows
 //  fast hack, handle with care, not everything implemented
 //
-// \033[#;...;#m - Set Graphics Rendition (SGR) 
+// \033[#;...;#m - Set Graphics Rendition (SGR)
 //
 //  printf("\x1b[1;31;40m");	// Bright red on black
 //  printf("\x1b[3;33;45m");	// Blinking yellow on magenta (blink not implemented)
@@ -110,19 +110,19 @@ int console_msg_log = 0;//[Ind] msg error logging
 //  8 - Concealed (invisible)
 //
 // \033[#A - Cursor Up (CUU)
-//    Moves the cursor up by the specified number of lines without changing columns. 
+//    Moves the cursor up by the specified number of lines without changing columns.
 //    If the cursor is already on the top line, this sequence is ignored. \e[A is equivalent to \e[1A.
 //
 // \033[#B - Cursor Down (CUD)
-//    Moves the cursor down by the specified number of lines without changing columns. 
+//    Moves the cursor down by the specified number of lines without changing columns.
 //    If the cursor is already on the bottom line, this sequence is ignored. \e[B is equivalent to \e[1B.
 //
 // \033[#C - Cursor Forward (CUF)
-//    Moves the cursor forward by the specified number of columns without changing lines. 
+//    Moves the cursor forward by the specified number of columns without changing lines.
 //    If the cursor is already in the rightmost column, this sequence is ignored. \e[C is equivalent to \e[1C.
 //
 // \033[#D - Cursor Backward (CUB)
-//    Moves the cursor back by the specified number of columns without changing lines. 
+//    Moves the cursor back by the specified number of columns without changing lines.
 //    If the cursor is already in the leftmost column, this sequence is ignored. \e[D is equivalent to \e[1D.
 //
 // \033[#E - Cursor Next Line (CNL)
@@ -135,15 +135,15 @@ int console_msg_log = 0;//[Ind] msg error logging
 //    Moves the cursor to indicated column in current row. \e[G is equivalent to \e[1G.
 //
 // \033[#;#H - Cursor Position (CUP)
-//    Moves the cursor to the specified position. The first # specifies the line number, 
-//    the second # specifies the column. If you do not specify a position, the cursor moves to the home position: 
+//    Moves the cursor to the specified position. The first # specifies the line number,
+//    the second # specifies the column. If you do not specify a position, the cursor moves to the home position:
 //    the upper-left corner of the screen (line 1, column 1).
 //
 // \033[#;#f - Horizontal & Vertical Position
 //    (same as \033[#;#H)
 //
 // \033[s - Save Cursor Position (SCP)
-//    The current cursor position is saved. 
+//    The current cursor position is saved.
 //
 // \033[u - Restore cursor position (RCP)
 //    Restores the cursor position saved with the (SCP) sequence \033[s.
@@ -213,7 +213,7 @@ int	VFPRINTF(HANDLE handle, const char *fmt, va_list argptr)
 			WriteFile(handle, p, (DWORD)(q-p), &written, 0);
 
 		if( q[1]!='[' )
-		{	// write the escape char (whatever purpose it has) 
+		{	// write the escape char (whatever purpose it has)
 			if(0==WriteConsole(handle, q, 1, &written, 0) )
 				WriteFile(handle,q, 1, &written, 0);
 			p=q+1;	//and start searching again
@@ -233,7 +233,7 @@ int	VFPRINTF(HANDLE handle, const char *fmt, va_list argptr)
 			q=q+2;
 			for(;;)
 			{
-				if( ISDIGIT(*q) ) 
+				if( ISDIGIT(*q) )
 				{	// add number to number array, only accept 2digits, shift out the rest
 					// so // \033[123456789m will become \033[89m
 					numbers[numpoint] = (numbers[numpoint]<<4) | (*q-'0');
@@ -350,12 +350,12 @@ int	VFPRINTF(HANDLE handle, const char *fmt, va_list argptr)
 					else if(num==2)
 					{	// Number of chars on screen.
 						cnt = info.dwSize.X * info.dwSize.Y;
-						SetConsoleCursorPosition(handle, origin); 
+						SetConsoleCursorPosition(handle, origin);
 					}
 					else// 0 and default
 					{	// number of chars from cursor to end
 						origin = info.dwCursorPosition;
-						cnt = info.dwSize.X * (info.dwSize.Y - info.dwCursorPosition.Y) - info.dwCursorPosition.X; 
+						cnt = info.dwSize.X * (info.dwSize.Y - info.dwCursorPosition.Y) - info.dwCursorPosition.X;
 					}
 					FillConsoleOutputAttribute(handle, info.wAttributes, cnt, origin, &tmp);
 					FillConsoleOutputCharacter(handle, ' ',              cnt, origin, &tmp);
@@ -389,7 +389,7 @@ int	VFPRINTF(HANDLE handle, const char *fmt, va_list argptr)
 				else if( *q == 'H' || *q == 'f' )
 				{	// \033[#;#H - Cursor Position (CUP)
 					// \033[#;#f - Horizontal & Vertical Position
-					// The first # specifies the line number, the second # specifies the column. 
+					// The first # specifies the line number, the second # specifies the column.
 					// The default for both is 1
 					info.dwCursorPosition.X = (numbers[numpoint])?(numbers[numpoint]>>4)*10+((numbers[numpoint]&0x0F)-1):0;
 					info.dwCursorPosition.Y = (numpoint && numbers[numpoint-1])?(numbers[numpoint-1]>>4)*10+((numbers[numpoint-1]&0x0F)-1):0;
@@ -486,7 +486,7 @@ int	VFPRINTF(HANDLE handle, const char *fmt, va_list argptr)
 					--q;
 				}
 				// skip the sequencer and search again
-				p = q+1; 
+				p = q+1;
 				break;
 			}// end while
 		}
@@ -542,7 +542,7 @@ int	VFPRINTF(FILE *file, const char *fmt, va_list argptr)
 	{	// find the escape character
 		fprintf(file, "%.*s", (int)(q-p), p); // write up to the escape
 		if( q[1]!='[' )
-		{	// write the escape char (whatever purpose it has) 
+		{	// write the escape char (whatever purpose it has)
 			fprintf(file, "%.*s", 1, q);
 			p=q+1;	//and start searching again
 		}
@@ -555,7 +555,7 @@ int	VFPRINTF(FILE *file, const char *fmt, va_list argptr)
 			q=q+2;
 			while(1)
 			{
-				if( ISDIGIT(*q) ) 
+				if( ISDIGIT(*q) )
 				{
 					++q;
 					// and next character
@@ -624,7 +624,7 @@ int	VFPRINTF(FILE *file, const char *fmt, va_list argptr)
 					--q;
 				}
 				// skip the sequencer and search again
-				p = q+1; 
+				p = q+1;
 				break;
 			}// end while
 		}
diff --git a/src/common/socket.c b/src/common/socket.c
index 3738f2c2a..ac6be68fe 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -64,7 +64,7 @@ struct socket_interface sockt_s;
 /////////////////////////////////////////////////////////////////////
 #if defined(WIN32)
 /////////////////////////////////////////////////////////////////////
-// windows portability layer 
+// windows portability layer
 
 typedef int socklen_t;
 
@@ -110,7 +110,7 @@ int sock2fd(SOCKET s)
 
 /// Inserts the socket into the global array of sockets.
 /// Returns a new fd associated with the socket.
-/// If there are too many sockets it closes the socket, sets an error and 
+/// If there are too many sockets it closes the socket, sets an error and
 //  returns -1 instead.
 /// Since fd 0 is reserved, it returns values in the range [1,FD_SETSIZE[.
 ///
@@ -293,8 +293,8 @@ void set_defaultparse(ParseFunc defaultparse)
  *--------------------------------------*/
 void set_nonblocking(int fd, unsigned long yes)
 {
-	// FIONBIO Use with a nonzero argp parameter to enable the nonblocking mode of socket s. 
-	// The argp parameter is zero if nonblocking is to be disabled. 
+	// FIONBIO Use with a nonzero argp parameter to enable the nonblocking mode of socket s.
+	// The argp parameter is zero if nonblocking is to be disabled.
 	if( sIoctl(fd, FIONBIO, &yes) != 0 )
 		ShowError("set_nonblocking: Failed to set socket #%d to non-blocking mode (%s) - Please report this!!!\n", fd, error_msg());
 }
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 0058e1d83..1c0825181 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -57,7 +57,7 @@ static forceinline void FinalizeSpinLock(PSPIN_LOCK lck){
 static forceinline void EnterSpinLock(PSPIN_LOCK lck){
 		int tid = rathread_get_tid();
 		
-		// Get Sync Lock && Check if the requester thread already owns the lock. 
+		// Get Sync Lock && Check if the requester thread already owns the lock.
 		// if it owns, increase nesting level
 		getsynclock(&lck->sync_lock);
 		if(InterlockedCompareExchange(&lck->lock, tid, tid) == tid){
@@ -69,7 +69,7 @@ static forceinline void EnterSpinLock(PSPIN_LOCK lck){
 		dropsynclock(&lck->sync_lock);
 		
 		
-		// Spin until we've got it ! 
+		// Spin until we've got it !
 		while(1){
 				
 				if(InterlockedCompareExchange(&lck->lock, tid, 0) == 0){
diff --git a/src/common/sql.c b/src/common/sql.c
index aeb56bff0..ffc4d63ef 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -402,8 +402,7 @@ void Sql_ShowDebug_(Sql* self, const char* debug_file, const unsigned long debug
 
 
 /// Frees a Sql handle returned by Sql_Malloc.
-void Sql_Free(Sql* self) 
-{
+void Sql_Free(Sql* self) {
 	if( self )
 	{
 		SQL->FreeResult(self);
@@ -549,7 +548,7 @@ static void Sql_P_ShowDebugMysqlFieldInfo(const char* prefix, enum enum_field_ty
 		SHOW_DEBUG_OF(MYSQL_TYPE_NULL);
 #undef SHOW_DEBUG_TYPE_OF
 	}
-	ShowDebug("%stype=%s%s, length=%d%s\n", prefix, sign, type_string, length, length_postfix); 
+	ShowDebug("%stype=%s%s, length=%d%s\n", prefix, sign, type_string, length, length_postfix);
 }
 
 
diff --git a/src/common/sql.h b/src/common/sql.h
index 807e0843c..64d8307fc 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -147,10 +147,10 @@ struct sql_interface {
 	///////////////////////////////////////////////////////////////////////////////
 	// Prepared Statements
 	///////////////////////////////////////////////////////////////////////////////
-	// Parameters are placed in the statement by embedding question mark ('?') 
+	// Parameters are placed in the statement by embedding question mark ('?')
 	// characters into the query at the appropriate positions.
 	// The markers are legal only in places where they represent data.
-	// The markers cannot be inside quotes. Quotes will be added automatically 
+	// The markers cannot be inside quotes. Quotes will be added automatically
 	// when they are required.
 	//
 	// example queries with parameters:
@@ -236,7 +236,7 @@ struct sql_interface {
 
 	/// Binds the result of a column to a buffer.
 	/// The buffer will be filled with data when the next row is fetched.
-	/// For string/enum buffer types there has to be enough space for the data 
+	/// For string/enum buffer types there has to be enough space for the data
 	/// and the nul-terminator (an extra byte).
 	///
 	/// @return SQL_SUCCESS or SQL_ERROR
diff --git a/src/common/strlib.c b/src/common/strlib.c
index e2e802915..10e893c3a 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -192,7 +192,7 @@ char* normalize_name(char* str,const char* delims)
 	return str;
 }
 
-//stristr: Case insensitive version of strstr, code taken from 
+//stristr: Case insensitive version of strstr, code taken from
 //http://www.daniweb.com/code/snippet313.html, Dave Sinkula
 //
 const char* stristr(const char* haystack, const char* needle)
@@ -618,13 +618,13 @@ int sv_parse_next(struct s_svstate* svstate)
 /// out_pos[0] and out_pos[1] are the start and end of line.
 /// Other position pairs are the start and end of fields.
 /// Returns the number of fields found or -1 if an error occurs.
-/// 
+///
 /// out_pos can be NULL.
 /// If a line terminator is found, the end position is placed there.
-/// out_pos[2] and out_pos[3] for the first field, out_pos[4] and out_pos[5] 
+/// out_pos[2] and out_pos[3] for the first field, out_pos[4] and out_pos[5]
 /// for the seconds field and so on.
 /// Unfilled positions are set to -1.
-/// 
+///
 /// @param str String to parse
 /// @param len Length of the string
 /// @param startoff Where to start parsing
@@ -668,11 +668,11 @@ int sv_parse(const char* str, int len, int startoff, char delim, int* out_pos, i
 /// out_fields[0] is the start of the next line.
 /// Other entries are the start of fields (nul-teminated).
 /// Returns the number of fields found or -1 if an error occurs.
-/// 
+///
 /// out_fields can be NULL.
 /// Fields that don't fit in out_fields are not nul-terminated.
 /// Extra entries in out_fields are filled with the end of the last field (empty string).
-/// 
+///
 /// @param str String to parse
 /// @param len Length of the string
 /// @param startoff Where to start parsing
diff --git a/src/common/thread.c b/src/common/thread.c
index 4f73aa9b3..bba56e7eb 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -17,7 +17,7 @@
 #ifdef WIN32
 #	include "../common/winapi.h"
 #	define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
-#	define __thread __declspec( thread ) 
+#	define __thread __declspec( thread )
 #else
 #	include <stdlib.h>
 #	include <unistd.h>
@@ -28,8 +28,8 @@
 #endif
 
 // When Compiling using MSC (on win32..) we know we have support in any case!
-#ifdef _MSC_VER 
-#define HAS_TLS 
+#ifdef _MSC_VER
+#define HAS_TLS
 #endif
 
 
@@ -40,7 +40,7 @@ struct rAthread {
 	
 	RATHREAD_PRIO  prio;
 	rAthreadProc proc;
-	void *param; 
+	void *param;
 
 	#ifdef WIN32
 	HANDLE hThread;
@@ -82,9 +82,9 @@ void rathread_init(){
 void rathread_final(){
 	register unsigned int i;
 	
-	// Unterminated Threads Left? 
+	// Unterminated Threads Left?
 	// Should'nt happen ..
-	// Kill 'em all! 
+	// Kill 'em all!
 	//
 	for(i = 1; i < RA_THREADS_MAX; i++){
 		if(l_threads[i].proc != NULL){
@@ -116,12 +116,12 @@ static void *_raThreadMainRedirector( void *p ){
 	
 	// Update myID @ TLS to right id.
 #ifdef HAS_TLS
-	g_rathread_ID = ((rAthread)p)->myID; 
+	g_rathread_ID = ((rAthread)p)->myID;
 #endif
 
 #ifndef WIN32
 	// When using posix threads
-	// the threads inherits the Signal mask from the thread which's spawned 
+	// the threads inherits the Signal mask from the thread which's spawned
 	// this thread
 	// so we've to block everything we dont care about.
 	sigemptyset(&set);
@@ -136,7 +136,7 @@ static void *_raThreadMainRedirector( void *p ){
 
 	ret = ((rAthread)p)->proc( ((rAthread)p)->param ) ;
 
-#ifdef WIN32	
+#ifdef WIN32
 	CloseHandle( ((rAthread)p)->hThread );
 #endif
 
@@ -154,7 +154,7 @@ static void *_raThreadMainRedirector( void *p ){
 
 ///
 /// API Level
-/// 
+///
 rAthread rathread_create( rAthreadProc entryPoint,  void *param ){
 	return rathread_createEx( entryPoint, param,  (1<<23) /*8MB*/,  RAT_PRIO_NORMAL );
 }//end: rathread_create()
@@ -175,7 +175,7 @@ rAthread rathread_createEx( rAthreadProc entryPoint,  void *param,  size_t szSta
 		szStack += tmp;
 
 
-	// Get a free Thread Slot. 
+	// Get a free Thread Slot.
 	for(i = 0; i < RA_THREADS_MAX; i++){
 		if(l_threads[i].proc == NULL){
 			handle = &l_threads[i];
@@ -223,7 +223,6 @@ void rathread_destroy ( rAthread handle ){
 	if( pthread_cancel( handle->hThread ) == 0){
 	
 		// We have to join it, otherwise pthread wont re-cycle its internal ressources assoc. with this thread.
-		// 
 		pthread_join( handle->hThread, NULL );
 		
 		// Tell our manager to release ressources ;)
@@ -236,10 +235,10 @@ rAthread rathread_self( ){
 #ifdef HAS_TLS
 	rAthread handle = &l_threads[g_rathread_ID];
 	
-	if(handle->proc != NULL) // entry point set, so its used!	
+	if(handle->proc != NULL) // entry point set, so its used!
 		return handle;
 #else
-	// .. so no tls means we have to search the thread by its api-handle .. 
+	// .. so no tls means we have to search the thread by its api-handle ..
 	int i;
 
 	#ifdef WIN32
@@ -257,13 +256,13 @@ rAthread rathread_self( ){
 	
 #endif
 		
-	return NULL;	
+	return NULL;
 }//end: rathread_self()
 
 
 int rathread_get_tid(){
 
-#ifdef HAS_TLS	
+#ifdef HAS_TLS
 	return g_rathread_ID;
 #else
 	// todo
@@ -286,7 +285,7 @@ bool rathread_wait( rAthread handle,  void* *out_exitCode ){
 	//
 #ifdef WIN32
 	WaitForSingleObject(handle->hThread, INFINITE);
-	return true; 
+	return true;
 #else
 	if(pthread_join(handle->hThread, out_exitCode) == 0)
 		return true;
@@ -297,8 +296,8 @@ bool rathread_wait( rAthread handle,  void* *out_exitCode ){
 
 
 void rathread_prio_set( rAthread handle, RATHREAD_PRIO prio ){
-	handle->prio = RAT_PRIO_NORMAL; 
-	//@TODO 
+	handle->prio = RAT_PRIO_NORMAL;
+	//@TODO
 }//end: rathread_prio_set()
 
 
@@ -308,9 +307,9 @@ RATHREAD_PRIO rathread_prio_get( rAthread handle){
 
 
 void rathread_yield(){
-#ifdef WIN32 
+#ifdef WIN32
 	SwitchToThread();
 #else
 	sched_yield();
-#endif	
+#endif
 }//end: rathread_yield()
diff --git a/src/common/thread.h b/src/common/thread.h
index 887c03179..7ad326509 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -12,7 +12,7 @@ typedef void* (*rAthreadProc)(void*);
 typedef enum RATHREAD_PRIO {
 	RAT_PRIO_LOW = 0,
 	RAT_PRIO_NORMAL,
-	RAT_PRIO_HIGH	
+	RAT_PRIO_HIGH
 } RATHREAD_PRIO;
 
 
@@ -21,18 +21,18 @@ typedef enum RATHREAD_PRIO {
  *
  * @param entyPoint  - entryProc,
  * @param param - general purpose parameter, would be given as parameter to the thread's entrypoint.
- * 
+ *
  * @return not NULL if success
  */
 rAthread rathread_create( rAthreadProc entryPoint,  void *param );
 
 
-/** 
+/**
  * Creates a new Thread (with more creation options)
  *
  * @param entyPoint  - entryProc,
  * @param param - general purpose parameter, would be given as parameter to the thread's entrypoint
- * @param szStack - stack Size in bytes 
+ * @param szStack - stack Size in bytes
  * @param prio - Priority of the Thread @ OS Scheduler..
  *
  * @return not NULL if success
@@ -43,29 +43,29 @@ rAthread rathread_createEx( rAthreadProc entryPoint,  void *param,  size_t szSta
 /**
  * Destroys the given Thread immediatly
  *
- * @note The Handle gets invalid after call! dont use it afterwards. 
+ * @note The Handle gets invalid after call! dont use it afterwards.
  *
  * @param handle - thread to destroy.
  */
 void rathread_destroy ( rAthread handle );
 
 
-/** 
+/**
  * Returns the thread handle of the thread calling this function
- * 
+ *
  * @note this wont work @ programms main thread
- * @note the underlying implementation might not perform very well, cache the value received! 
- * 
+ * @note the underlying implementation might not perform very well, cache the value received!
+ *
  * @return not NULL if success
  */
 rAthread rathread_self( );
 
 
 /**
- * Returns own thrad id (TID) 
+ * Returns own thrad id (TID)
  *
- * @note this is an unique identifier for the calling thread, and 
- *        depends on platfrom / compiler, and may not be the systems Thread ID! 
+ * @note this is an unique identifier for the calling thread, and
+ *        depends on platfrom / compiler, and may not be the systems Thread ID!
  *
  * @return -1 when fails, otherwise >= 0
  */
@@ -73,26 +73,26 @@ int rathread_get_tid();
 
 
 /**
- * Waits for the given thread to terminate 
+ * Waits for the given thread to terminate
  *
  * @param handle - thread to wait (join) for
  * @param out_Exitcode - [OPTIONAL] - if given => Exitcode (value) of the given thread - if it's terminated
- * 
+ *
  * @return true - if the given thread has been terminated.
  */
 bool rathread_wait( rAthread handle,  void* *out_exitCode );
 
 
-/** 
+/**
  * Sets the given PRIORITY @ OS Task Scheduler
- * 
+ *
  * @param handle - thread to set prio for
  * @param rio - the priority (RAT_PRIO_LOW ... )
  */
 void rathread_prio_set( rAthread handle, RATHREAD_PRIO prio );
 
 
-/** 
+/**
  * Gets the current Prio of the given trhead
  *
  * @param handle - the thread to get the prio for.
@@ -102,9 +102,9 @@ RATHREAD_PRIO rathread_prio_get( rAthread handle);
 
 /**
  * Tells the OS scheduler to yield the execution of the calling thread
- * 
+ *
  * @note: this will not "pause" the thread,
- *			it just allows the OS to spent the remaining time 
+ *			it just allows the OS to spent the remaining time
  *			of the slice to another thread.
  */
 void rathread_yield();
diff --git a/src/common/timer.c b/src/common/timer.c
index 5d67455dc..5240ec202 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -130,7 +130,7 @@ static void rdtsc_calibrate(){
 		t1 = _rdtsc();
 		usleep(1000000); //1000 MS
 		t2 = _rdtsc();
-		RDTSC_CLOCK += (t2 - t1) / 1000; 
+		RDTSC_CLOCK += (t2 - t1) / 1000;
 	}
 	RDTSC_CLOCK /= 5;
 	
@@ -453,7 +453,7 @@ void timer_final(void) {
 	if (free_timer_list) aFree(free_timer_list);
 }
 /*=====================================
-* Default Functions : timer.h 
+* Default Functions : timer.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/common/timer.h b/src/common/timer.h
index 1ce8cf203..a07f81612 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -30,13 +30,13 @@ struct TimerData {
 	int interval;
 
 	// general-purpose storage
-	int id; 
+	int id;
 	intptr_t data;
 };
 
 
 /*=====================================
-* Interface : timer.h 
+* Interface : timer.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/common/utils.c b/src/common/utils.c
index 84925f707..80954f848 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -265,9 +265,9 @@ uint32 MakeDWord(uint16 word0, uint16 word1)
 		( (uint32)(word0        ) )|
 		( (uint32)(word1 << 0x10) );
 }
+
 /*************************************
-* Big-endian compatibility functions * 
-* From mapcache.c                    *
+* Big-endian compatibility functions *
 *************************************/
 
 // Converts an int16 from current machine order to little-endian
diff --git a/src/common/winapi.h b/src/common/winapi.h
index 7ce555049..b7c2bea1e 100644
--- a/src/common/winapi.h
+++ b/src/common/winapi.h
@@ -7,7 +7,7 @@
 #define WINVER 0x0500
 #define _WIN32_IE 	0x0600
 #define WIN32_LEAN_AND_MEAN
-#define NOCOMM 
+#define NOCOMM
 #define NOKANJI
 #define NOHELP
 #define NOMCX
@@ -32,5 +32,3 @@
 #include <Ws2tcpip.h>
 #include <Mswsock.h>
 #include <MMSystem.h>
-
-
diff --git a/src/config/const.h b/src/config/const.h
index ba06d70cb..23467bfa6 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * "Sane Checks" to save you from compiling with cool bugs 
+ * "Sane Checks" to save you from compiling with cool bugs
  **/
 #if SECURE_NPCTIMEOUT_INTERVAL <= 0
 	#error SECURE_NPCTIMEOUT_INTERVAL should be at least 1 (1s)
diff --git a/src/login/login.c b/src/login/login.c
index cb46e0226..43883c6ce 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -173,7 +173,7 @@ static int online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
 static int online_data_cleanup(int tid, int64 tick, int id, intptr_t data) {
 	online_db->foreach(online_db, online_data_cleanup_sub);
 	return 0;
-} 
+}
 
 
 //--------------------------------------------------------------------
@@ -1109,7 +1109,7 @@ void login_auth_ok(struct login_session_data* sd)
 		WFIFOW(fd,0) = 0x81;
 		WFIFOB(fd,2) = 1; // 01 = Server closed
 		WFIFOSET(fd,3);
-		return;		
+		return;
 	}
 
 	server_num = 0;
@@ -1827,7 +1827,7 @@ int do_init(int argc, char** argv)
 	HPM->config_read(NULL, 0);
 	HPM->event(HPET_INIT);
 	
-	// server port open & binding	
+	// server port open & binding
 	if( (login_fd = make_listen_bind(login_config.login_ip,login_config.login_port)) == -1 ) {
 		ShowFatalError("Failed to bind to port '"CL_WHITE"%d"CL_RESET"'\n",login_config.login_port);
 		exit(EXIT_FAILURE);
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7a6ad84e4..96fa9c350 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1123,14 +1123,14 @@ ACMD(item)
 	memset(item_name, '\0', sizeof(item_name));
 
 	if (!strcmpi(info->command,"itembound") && (!message || !*message || (
-		sscanf(message, "\"%99[^\"]\" %d %d", item_name, &number, &bound) < 2 && 
-		sscanf(message, "%99s %d %d", item_name, &number, &bound) < 2 
+		sscanf(message, "\"%99[^\"]\" %d %d", item_name, &number, &bound) < 2 &&
+		sscanf(message, "%99s %d %d", item_name, &number, &bound) < 2
 	))) {
 		clif->message(fd, msg_txt(295)); // Please enter an item name or ID (usage: @itembound <item name/ID> <quantity> <bound_type>).
 		return false;
 	} else if (!message || !*message || (
-		sscanf(message, "\"%99[^\"]\" %d", item_name, &number) < 1 && 
-		sscanf(message, "%99s %d", item_name, &number) < 1 )) 
+		sscanf(message, "\"%99[^\"]\" %d", item_name, &number) < 1 &&
+		sscanf(message, "%99s %d", item_name, &number) < 1 ))
 		{
  		clif->message(fd, msg_txt(983)); // Please enter an item name or ID (usage: @item <item name/ID> <quantity>).
 		return false;
@@ -10088,7 +10088,7 @@ void atcommand_config_read(const char* config_filename) {
 			}
 			commandinfo->log = false;
 		}
-	}	
+	}
 	
 	// Commands help
 	// We only check if all commands exist
@@ -10135,7 +10135,7 @@ static inline int AtCommandType2idx(AtCommandType type) { return (type-1); }
 
 /**
  * Loads permissions for groups to use commands.
- * 
+ *
  */
 void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **commands_, size_t sz)
 {
diff --git a/src/map/battle.c b/src/map/battle.c
index 0865ee4ba..fc2f4d3cf 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -446,7 +446,7 @@ int64 battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, u
 	if( sc && sc->count ){
 		if( sc->data[SC_ZENKAI] && watk->ele == sc->data[SC_ZENKAI]->val2 )
 			eatk += 200;
-	#ifdef RENEWAL_EDP	
+	#ifdef RENEWAL_EDP
 		if( sc->data[SC_EDP] && skill_id != AS_GRIMTOOTH && skill_id != AS_VENOMKNIFE && skill_id != ASC_BREAKER ){
 			eatk = eatk * (sc->data[SC_EDP]->val4 / 100 - 1);
 			damage = damage * (sc->data[SC_EDP]->val4 / 100);
@@ -655,7 +655,7 @@ int64 battle_addmastery(struct map_session_data *sd,struct block_list *target,in
 					damage += (skill_lv * 10);
 				else if(pc_isriding(sd))
 					damage += (skill_lv * 5);
-				else 
+				else
 					damage += (skill_lv * 4);
 			}
 			break;
@@ -737,7 +737,7 @@ int64 battle_calc_masteryfix(struct block_list *src, struct block_list *target,
 #endif
 				)
 				damage += 3 * skill2_lv;
-			break;	
+			break;
 #ifndef RENEWAL
 		case NJ_KUNAI:
 			if( weapon )
@@ -748,7 +748,7 @@ int64 battle_calc_masteryfix(struct block_list *src, struct block_list *target,
 			if( sd->weight )
 				damage += sd->weight / 8 ;
 		case RA_WUGSTRIKE:
-		case RA_WUGBITE:	
+		case RA_WUGBITE:
 			damage += 30*pc->checkskill(sd, RA_TOOTHOFWUG);
 			break;
 		case HT_FREEZINGTRAP:
@@ -999,7 +999,7 @@ int64 battle_calc_cardfix(int attack_type, struct block_list *src, struct block_
 							cardfix = cardfix * (100 + sd->right_weapon.addrace[RC_NONDEMIHUMAN]+sd->arrow_addrace[RC_NONDEMIHUMAN]) / 100;
 					}else{ // Melee attack
 						if( !battle_config.left_cardfix_to_right ){
-							cardfix=cardfix*(100+sd->right_weapon.addrace[tstatus->race])/100;					
+							cardfix=cardfix*(100+sd->right_weapon.addrace[tstatus->race])/100;
 							if( !(nk&NK_NO_ELEFIX) ){
 								int ele_fix = sd->right_weapon.addele[tstatus->def_ele];
 								for (i = 0; ARRAYLENGTH(sd->right_weapon.addele2) > i && sd->right_weapon.addele2[i].rate != 0; i++) {
@@ -1019,9 +1019,9 @@ int64 battle_calc_cardfix(int attack_type, struct block_list *src, struct block_
 								cardfix = cardfix * (100 + sd->right_weapon.addrace[RC_NONDEMIHUMAN]) / 100;
 
 							if( cflag&1 ){
-								cardfix_ = cardfix_*(100+sd->left_weapon.addrace[tstatus->race])/100;						
+								cardfix_ = cardfix_*(100+sd->left_weapon.addrace[tstatus->race])/100;
 								if (!(nk&NK_NO_ELEFIX)){
-									int ele_fix_lh = sd->left_weapon.addele[tstatus->def_ele];							
+									int ele_fix_lh = sd->left_weapon.addele[tstatus->def_ele];
 									for (i = 0; ARRAYLENGTH(sd->left_weapon.addele2) > i && sd->left_weapon.addele2[i].rate != 0; i++) {
 										if (sd->left_weapon.addele2[i].ele != tstatus->def_ele) continue;
 										if(!(sd->left_weapon.addele2[i].flag&wflag&BF_WEAPONMASK &&
@@ -1221,7 +1221,7 @@ int64 battle_calc_defense(int attack_type, struct block_list *src, struct block_
 			 **/
 			defType def1 = status->get_def(target); //Don't use tstatus->def1 due to skill timer reductions.
 			short def2 = tstatus->def2, vit_def;
-#ifdef RENEWAL			
+#ifdef RENEWAL
 			def1 = status->calc_def2(target, tsc, def1, false); // equip def(RE)
 			def2 = status->calc_def(target, tsc, def2, false); // status def(RE)
 #else
@@ -1301,7 +1301,7 @@ int64 battle_calc_defense(int attack_type, struct block_list *src, struct block_
 
 			if( def1 < -399 ) // it stops at -399
 				def1 = 399; // in aegis it set to 1 but in our case it may lead to exploitation so limit it to 399
-				//return 1; 
+				//return 1;
 
 			if( flag&2 )
 				damage += def1 >> 1;
@@ -1357,7 +1357,7 @@ int64 battle_calc_defense(int attack_type, struct block_list *src, struct block_
 			 **/
 			if( mdef < -99 ) // it stops at -99
 				mdef = 99; // in aegis it set to 1 but in our case it may lead to exploitation so limit it to 99
-				//return 1; 
+				//return 1;
 
 			damage = (int)((100.0f - mdef / (mdef + 100.0f) * 90.0f) / 100.0f * damage - mdef2);
 		#else
@@ -2538,7 +2538,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 					skillratio += sc->data[SC_LKCONCENTRATION]->val2;
 				if( sd && sd->status.weapon == W_KATAR && (i=pc->checkskill(sd,ASC_KATAR)) > 0 )
 					skillratio += skillratio * (10 + 2 * i) / 100;
-#endif	
+#endif
 				if( sc && sc->data[SC_CRUSHSTRIKE] ){
 					if( sd )
 					{//ATK [{Weapon Level * (Weapon Upgrade Level + 6) * 100} + (Weapon ATK) + (Weapon Weight)]%
@@ -2985,7 +2985,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 			rnd()%100 < sce->val3)
 			status->heal(src, damage*sce->val4/100, 0, 3);
 
-		if( (sce = sc->data[SC_FORCEOFVANGUARD]) && flag&BF_WEAPON 
+		if( (sce = sc->data[SC_FORCEOFVANGUARD]) && flag&BF_WEAPON
 			&& rnd()%100 < sce->val2 && sc->fv_counter <= sce->val3 )
 				clif->millenniumshield(bl, sc->fv_counter++);
 
@@ -4517,7 +4517,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 						ATK_RATE(50);
 					RE_SKILL_REDUCTION();
 				}
-				break;	
+				break;
 			case NJ_SYURIKEN: // [malufett]
 				GET_NORMAL_ATTACK( (sc && sc->data[SC_MAXIMIZEPOWER]?1:0)|(sc && sc->data[SC_WEAPONPERFECT]?8:0) );
 				wd.damage += battle->calc_masteryfix(src, target, skill_id, skill_lv, 4 * skill_lv + (sd ? sd->bonus.arrow_atk : 0), wd.div_, 0, flag.weapon) - status->get_total_def(target);
@@ -4886,7 +4886,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 				ATK_ADDRATE(sd->bonus.long_attack_atk_rate);
 			if( sc && sc->data[SC_MTF_RANGEATK] )
 				ATK_ADDRATE(25);// temporary it should be 'bonus.long_attack_atk_rate'
-	#endif	
+	#endif
 			if( (i=pc->checkskill(sd,AB_EUCHARISTICA)) > 0 &&
 				(tstatus->race == RC_DEMON || tstatus->def_ele == ELE_DARK) )
 				ATK_ADDRATE(-i);
@@ -5124,12 +5124,13 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 			temp = pc->checkskill(sd,TF_DOUBLE);
 			wd.damage2 = wd.damage * (1 + (temp * 2))/100;
 
-			if(wd.damage && !wd.damage2) wd.damage2 = 
+			if(wd.damage && !wd.damage2) {
 #ifdef RENEWAL
-				0;
+				wd.damage2 = 0;
 #else
-				1;
+				wd.damage2 = 1;
 #endif
+			}
 			flag.lh = 1;
 		}
 	}
diff --git a/src/map/battle.h b/src/map/battle.h
index fbe097c78..8d7e4183a 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -537,9 +537,9 @@ struct battle_interface {
 	int64 (*attr_fix) (struct block_list *src, struct block_list *target, int64 damage, int atk_elem, int def_type, int def_lv);
 	/* applies card modifiers */
 	int64 (*calc_cardfix) (int attack_type, struct block_list *src, struct block_list *target, int nk, int s_ele, int s_ele_, int64 damage, int left, int flag);
-	/* applies element modifiers */	
+	/* applies element modifiers */
 	int64 (*calc_elefix) (struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int nk, int n_ele, int s_ele, int s_ele_, bool left, int flag);
-	/* applies mastery modifiers */	
+	/* applies mastery modifiers */
 	int64 (*calc_masteryfix) (struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int div, bool left, bool weapon);
 	/* calculates chorus bonus */
 	int (*calc_chorusbonus) (struct map_session_data *sd);
diff --git a/src/map/chat.c b/src/map/chat.c
index c9d3e6d46..40a9d2348 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -157,8 +157,8 @@ bool chat_joinchat(struct map_session_data* sd, int chatid, const char* pass) {
 	pc_setchatid(sd,cd->bl.id);
 
     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 
+    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->trigger_event(cd); //Event
 
@@ -446,7 +446,7 @@ bool chat_npckickall(struct chat_data* cd)
 }
 
 /*=====================================
-* Default Functions : chat.h 
+* Default Functions : chat.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/chat.h b/src/map/chat.h
index cbc2a391e..6e4fae1c0 100644
--- a/src/map/chat.h
+++ b/src/map/chat.h
@@ -17,7 +17,7 @@ struct npc_data;
 
 struct chat_data {
 	struct block_list bl;            // data for this map object
-	char title[CHATROOM_TITLE_SIZE]; // room title 
+	char title[CHATROOM_TITLE_SIZE]; // room title
 	char pass[CHATROOM_PASS_SIZE];   // password
 	bool pub;                        // private/public flag
 	uint8 users;                     // current user count
@@ -34,7 +34,7 @@ struct chat_data {
 };
 
 /*=====================================
-* Interface : chat.h 
+* Interface : chat.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 81e2d387c..a69cca573 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -271,7 +271,7 @@ bool chrif_save(struct map_session_data *sd, int flag) {
 	if (flag)
 		sd->state.storage_flag = 0; //Force close it.
 
-	//Saving of registry values. 
+	//Saving of registry values.
 	if (sd->vars_dirty)
 		intif->saveregistry(sd);
 
@@ -291,7 +291,7 @@ bool chrif_save(struct map_session_data *sd, int flag) {
 	if( sd->md && mercenary->get_lifetime(sd->md) > 0 )
 		mercenary->save(sd->md);
 	if( sd->ed && elemental->get_lifetime(sd->ed) > 0 )
-		elemental->save(sd->ed);	
+		elemental->save(sd->ed);
 	if( sd->save_quest )
 		intif->quest_save(sd);
 
@@ -1367,7 +1367,7 @@ int chrif_parse(int fd) {
 		if (cmd < 0x2af8 || cmd >= 0x2af8 + ARRAYLENGTH(chrif->packet_len_table) || chrif->packet_len_table[cmd-0x2af8] == 0) {
 			r = intif->parse(fd); // Passed on to the intif
 
-			if (r == 1) continue;	// Treated in intif 
+			if (r == 1) continue;	// Treated in intif
 			if (r == 2) return 0;	// Didn't have enough data (len==-1)
 
 			ShowWarning("chrif_parse: session #%d, intif->parse failed (unrecognized command 0x%.4x).\n", fd, cmd);
@@ -1638,7 +1638,7 @@ void do_init_chrif(bool minimal) {
 
 
 /*=====================================
-* Default Functions : chrif.h 
+* Default Functions : chrif.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 84efc66d3..661ba8f84 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -41,7 +41,7 @@ struct auth_node {
 };
 
 /*=====================================
-* Interface : chrif.h 
+* Interface : chrif.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/clif.c b/src/map/clif.c
index 068cb1e07..d1ae2eb07 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1105,7 +1105,7 @@ void clif_spawn_unit(struct block_list* bl, enum send_target target) {
 		p.accessory = status->get_emblem_id(bl);
 		p.accessory2 = GetWord(g_id, 1);
 		p.accessory3 = GetWord(g_id, 0);
-	}	
+	}
 	p.headpalette = vd->hair_color;
 	p.bodypalette = vd->cloth_color;
 	p.headDir = (sd)? sd->head_dir : 0;
@@ -1225,7 +1225,7 @@ void clif_set_unit_walking(struct block_list* bl, struct map_session_data *tsd,
 		p.GID = -bl->id;
 #else
 		p.GID = -bl->id;
-#endif 
+#endif
 		clif->send(&p,sizeof(p),bl,SELF);
 	}
 }
@@ -5639,7 +5639,7 @@ void clif_displaymessage2(const int fd, const char* mes) {
 			}
 			line = strtok(NULL, "\n");
 		}
-		aFree(message);		
+		aFree(message);
 	}
 }
 /* oh noo! another version of 0x8e! */
@@ -6170,7 +6170,7 @@ void clif_item_refine_list(struct map_session_data *sd)
 	WFIFOHEAD(fd, MAX_INVENTORY * 13 + 4);
 	WFIFOW(fd,0)=0x221;
 	for(i=c=0;i<MAX_INVENTORY;i++){
-		if(sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].identify 
+		if(sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].identify
 			&& (wlv=itemdb_wlv(sd->status.inventory[i].nameid)) >=1
 			&& !sd->inventory_data[i]->flag.no_refine
 			&& !(sd->status.inventory[i].equip&EQP_ARMS)){
@@ -8429,7 +8429,7 @@ void clif_message(struct block_list* bl, const char* msg) {
 /**
  * Notifies the client that the storage window is still open
  *
- * Should only be used in cases where the client closed the 
+ * Should only be used in cases where the client closed the
  * storage window without server's consent
  **/
 void clif_refresh_storagewindow( struct map_session_data *sd ) {
@@ -10312,7 +10312,7 @@ void clif_hercules_chsys_quit(struct map_session_data *sd) {
 
 	sd->channel_count = 0;
 	aFree(sd->channels);
-	sd->channels = NULL;	
+	sd->channels = NULL;
 }
 
 /// Request for an action.
@@ -11163,8 +11163,8 @@ void clif_parse_GetItemFromCart(int fd,struct map_session_data *sd)
 /// 012a
 void clif_parse_RemoveOption(int fd,struct map_session_data *sd)
 {
-	if( !(sd->sc.option&(OPTION_RIDING|OPTION_FALCON|OPTION_DRAGON|OPTION_MADOGEAR)) 
-#ifdef NEW_CARTS		
+	if( !(sd->sc.option&(OPTION_RIDING|OPTION_FALCON|OPTION_DRAGON|OPTION_MADOGEAR))
+#ifdef NEW_CARTS
 		&& sd->sc.data[SC_PUSH_CART] ){
 		pc->setcart(sd,0);
 #else
@@ -13716,7 +13716,7 @@ void clif_parse_GMReqNoChat(int fd,struct map_session_data *sd) {
 			return;
 
 		value = battle_config.client_accept_chatdori;
-		dstsd = sd;	
+		dstsd = sd;
 	} else {
 		dstsd = map->id2sd(id);
 		if( dstsd == NULL )
@@ -17557,7 +17557,7 @@ void clif_parse_CashShopOpen(int fd, struct map_session_data *sd) {
 	WFIFOW(fd, 0) = 0x845;
 	WFIFOL(fd, 2) = sd->cashPoints; //[Ryuuzaki] - switched positions to reflect proper values
 	WFIFOL(fd, 6) = sd->kafraPoints;
-	WFIFOSET(fd, 10);			
+	WFIFOSET(fd, 10);
 }
 
 void clif_parse_CashShopClose(int fd, struct map_session_data *sd) {
@@ -17792,7 +17792,7 @@ void clif_bgqueue_ack(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_ACK
 			clif->send(&p,sizeof(p), &sd->bl, SELF);
 		}
 			break;
-	}	
+	}
 }
 
 
@@ -17824,7 +17824,7 @@ void clif_parse_bgqueue_register(int fd, struct map_session_data *sd) {
 		default:
 			clif->bgqueue_ack(sd,BGQA_FAIL_TYPE_INVALID, arena->id);
 			return;
-	}	
+	}
 
 	bg->queue_add(sd, arena, (enum bg_queue_types)p->type);
 }
@@ -19024,7 +19024,7 @@ void clif_defaults(void) {
 	clif->search_store_info_failed = clif_search_store_info_failed;
 	clif->open_search_store_info = clif_open_search_store_info;
 	clif->search_store_info_click_ack = clif_search_store_info_click_ack;
-	/* elemental-related */ 
+	/* elemental-related */
 	clif->elemental_info = clif_elemental_info;
 	clif->elemental_updatestatus = clif_elemental_updatestatus;
 	/* bgqueue */
@@ -19034,7 +19034,7 @@ void clif_defaults(void) {
 	clif->bgqueue_joined = clif_bgqueue_joined;
 	clif->bgqueue_pcleft = clif_bgqueue_pcleft;
 	clif->bgqueue_battlebegins = clif_bgqueue_battlebegins;
-	/* misc-handling */ 
+	/* misc-handling */
 	clif->adopt_reply = clif_Adopt_reply;
 	clif->adopt_request = clif_Adopt_request;
 	clif->readbook = clif_readbook;
@@ -19071,7 +19071,7 @@ void clif_defaults(void) {
 	clif->npc_market_purchase_ack = clif_npc_market_purchase_ack;
 	/*------------------------
 	 *- Parse Incoming Packet
-	 *------------------------*/ 
+	 *------------------------*/
 	clif->pWantToConnection = clif_parse_WantToConnection;
 	clif->pLoadEndAck = clif_parse_LoadEndAck;
 	clif->pTickSend = clif_parse_TickSend;
@@ -19125,7 +19125,7 @@ void clif_defaults(void) {
 	clif->pUseSkillToPos = clif_parse_UseSkillToPos;
 	clif->pUseSkillToPosSub = clif_parse_UseSkillToPosSub;
 	clif->pUseSkillToPos_homun = clif_parse_UseSkillToPos_homun;
-	clif->pUseSkillToPos_mercenary = clif_parse_UseSkillToPos_mercenary;	
+	clif->pUseSkillToPos_mercenary = clif_parse_UseSkillToPos_mercenary;
 	clif->pUseSkillToPosMoreInfo = clif_parse_UseSkillToPosMoreInfo;
 	clif->pUseSkillMap = clif_parse_UseSkillMap;
 	clif->pRequestMemo = clif_parse_RequestMemo;
diff --git a/src/map/duel.c b/src/map/duel.c
index a423ef240..4e4eeef1f 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -128,7 +128,7 @@ void duel_leave(const unsigned int did, struct map_session_data* sd) {
 	duel->list[did].members_count--;
 	
 	if(duel->list[did].members_count == 0) {
-		map->foreachpc(duel_leave_sub, did); 
+		map->foreachpc(duel_leave_sub, did);
 		duel->count--;
 	}
 	
@@ -176,7 +176,7 @@ void do_init_duel(bool minimal) {
 }
 
 /*=====================================
-* Default Functions : duel.h 
+* Default Functions : duel.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/duel.h b/src/map/duel.h
index 956aed36d..91dfa8f83 100644
--- a/src/map/duel.h
+++ b/src/map/duel.h
@@ -18,7 +18,7 @@ struct duel {
 #define MAX_DUEL 1024
 
 /*=====================================
-* Interface : duel.h 
+* Interface : duel.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/elemental.c b/src/map/elemental.c
index 323df41e1..b414d5b9f 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -951,7 +951,7 @@ void do_final_elemental(void) {
 }
 
 /*=====================================
-* Default Functions : elemental.h 
+* Default Functions : elemental.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/elemental.h b/src/map/elemental.h
index aa27aadc9..beddd3ea1 100644
--- a/src/map/elemental.h
+++ b/src/map/elemental.h
@@ -64,7 +64,7 @@ struct elemental_data {
 };
 
 /*=====================================
-* Interface : elemental.h 
+* Interface : elemental.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/guild.c b/src/map/guild.c
index 69f67238d..935cac8c0 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1004,7 +1004,7 @@ int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int onlin
 	//Ensure validity of pointer (ie: player logs in/out, changes map-server)
 	g->member[idx].sd = guild->sd_check(guild_id, account_id, char_id);
 
-	if(oldonline!=online) 
+	if(oldonline!=online)
 		clif->guild_memberlogin_notice(g, idx, online);
 	
 	if(!g->member[idx].sd)
@@ -2008,7 +2008,7 @@ void guild_castle_reconnect_sub(void *key, void *data, va_list ap)
 }
 
 /**
- * Saves pending guild castle data changes when char-server is 
+ * Saves pending guild castle data changes when char-server is
  * disconnected.
  * On reconnect pushes all changes to char-server for saving.
  */
@@ -2363,7 +2363,7 @@ void guild_defaults(void) {
 	guild->flag_add = guild_flag_add;
 	guild->flag_remove = guild_flag_remove;
 	guild->flags_clear = guild_flags_clear;
-	/* guild aura */ 
+	/* guild aura */
 	guild->aura_refresh = guild_guildaura_refresh;
 	/* */
 	guild->payexp_timer = guild_payexp_timer;
diff --git a/src/map/intif.c b/src/map/intif.c
index 383150fbc..75379f6c0 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -2305,7 +2305,7 @@ int intif_parse(int fd)
 }
 
 /*=====================================
-* Default Functions : intif.h 
+* Default Functions : intif.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/intif.h b/src/map/intif.h
index b6ee727f3..d0eeccc6d 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -32,7 +32,7 @@ struct s_pet;
 
 
 /*=====================================
-* Interface : intif.h 
+* Interface : intif.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
@@ -42,7 +42,7 @@ struct intif_interface {
 	/* funcs */
 	int (*parse) (int fd);
 	int (*create_pet)(int account_id, int char_id, short pet_type, short pet_lv, short pet_egg_id,
-					  short pet_equip, short intimate, short hungry, char rename_flag, char incuvate, char *pet_name);
+	                  short pet_equip, short intimate, short hungry, char rename_flag, char incuvate, char *pet_name);
 	int (*broadcast) (const char* mes, size_t len, int type);
 	int (*broadcast2) (const char* mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY);
 	int (*main_message) (struct map_session_data* sd, const char* message);
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 1981f435c..9bc352276 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -27,7 +27,7 @@
 struct itemdb_interface itemdb_s;
 
 /**
- * Search for item name 
+ * Search for item name
  * name = item alias, so we should find items aliases first. if not found then look for "jname" (full name)
  * @see DBApply
  */
@@ -55,7 +55,7 @@ int itemdb_searchname_sub(DBKey key, DBData *data, va_list ap)
 }
 
 /*==========================================
- * Return item data from item name. (lookup) 
+ * Return item data from item name. (lookup)
  *------------------------------------------*/
 struct item_data* itemdb_searchname(const char *str) {
 	struct item_data* item;
@@ -256,7 +256,7 @@ void itemdb_package_item(struct map_session_data *sd, struct item_package *packa
 	return;
 }
 /*==========================================
- * Return a random item id from group. (takes into account % chance giving/tot group) 
+ * Return a random item id from group. (takes into account % chance giving/tot group)
  *------------------------------------------*/
 int itemdb_searchrandomid(struct item_group *group) {
 
@@ -312,7 +312,7 @@ const char* itemdb_typename(int type)
 }
 
 /*==========================================
- * Converts the jobid from the format in itemdb 
+ * Converts the jobid from the format in itemdb
  * to the format used by the map server. [Skotlex]
  *------------------------------------------*/
 void itemdb_jobid2mapid(unsigned int *bclass, unsigned int jobmask)
@@ -470,8 +470,7 @@ int itemdb_isequip(int nameid)
 /*==========================================
  * Alternate version of itemdb_isequip
  *------------------------------------------*/
-int itemdb_isequip2(struct item_data *data)
-{ 
+int itemdb_isequip2(struct item_data *data) {
 	nullpo_ret(data);
 	switch(data->type) {
 		case IT_WEAPON:
@@ -937,7 +936,7 @@ void itemdb_read_packages(void) {
 	if( HCache->check(config_filename) ) {
 		if( itemdb->read_cached_packages(config_filename) )
 			return;
-	}		
+	}
 	
 	if (libconfig->read_file(&item_packages_conf, config_filename)) {
 		ShowError("can't read %s\n", config_filename);
@@ -1445,7 +1444,7 @@ void itemdb_read_combos() {
 		p++;
 
 		str[1] = p;
-		p = strchr(p,',');		
+		p = strchr(p,',');
 		p++;
 		
 		if (str[1][0] != '{') {
@@ -2217,7 +2216,7 @@ void itemdb_name_constants(void) {
 	script->parser_current_file = NULL;
 #endif // ENABLE_CASE_CHECK
 
-	dbi_destroy(iter);	
+	dbi_destroy(iter);
 }
 void do_final_itemdb(void) {
 	itemdb->clear(true);
diff --git a/src/map/map.c b/src/map/map.c
index 01d3dbb9f..e37e902f6 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -494,7 +494,7 @@ static int bl_vforeach(int (*func)(struct block_list*, va_list), int blockcount,
 static int map_vforeachinmap(int (*func)(struct block_list*, va_list), int16 m, int type, va_list args) {
 	int i;
 	int returnCount = 0;
-	int bsize; 
+	int bsize;
 	va_list argscopy;
 	struct block_list *bl;
 	int blockcount = map->bl_list_count;
@@ -5861,7 +5861,7 @@ int do_init(int argc, char *argv[])
 }
 
 /*=====================================
-* Default Functions : map.h 
+* Default Functions : map.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/map.h b/src/map/map.h
index 539b02ed8..73ef4bb41 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -579,9 +579,9 @@ struct map_data {
 	   "Algorithms in Java, Parts 1-4" 3.18, Robert Sedgewick
 	   Map is divided into squares, called blocks (side length = BLOCK_SIZE).
 	   For each block there is a linked list of objects in that block (block_list).
-	   Array provides capability to access immediately the set of objects close 
+	   Array provides capability to access immediately the set of objects close
 	   to a given object.
-	   The linked lists provide the flexibility to store the objects without 
+	   The linked lists provide the flexibility to store the objects without
 	   knowing ahead how many objects fall into each block.
 	*/
 	struct block_list **block; // Grid array of block_lists containing only non-BL_MOB objects
@@ -796,7 +796,7 @@ struct map_cache_map_info {
 
 
 /*=====================================
-* Interface : map.h 
+* Interface : map.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 26bc8c188..80bcfdf05 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -503,7 +503,7 @@ void do_init_mercenary(bool minimal) {
 }
 
 /*=====================================
-* Default Functions : mercenary.h 
+* Default Functions : mercenary.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index b998ac006..22399e289 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -48,7 +48,7 @@ struct mercenary_data {
 };
 
 /*=====================================
-* Interface : mercenary.h 
+* Interface : mercenary.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/mob.c b/src/map/mob.c
index 11ac74621..784bb5a07 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3880,7 +3880,7 @@ bool mob_parse_dbrow(char** str) {
 		mob->db_data[class_] = (struct mob_db*)aMalloc(sizeof(struct mob_db));
 	else
 		//Copy over spawn data
-		memcpy(&db->spawn, mob->db_data[class_]->spawn, sizeof(db->spawn));		
+		memcpy(&db->spawn, mob->db_data[class_]->spawn, sizeof(db->spawn));
 
 	memcpy(mob->db_data[class_], db, sizeof(struct mob_db));
 	return true;
diff --git a/src/map/npc.c b/src/map/npc.c
index cf509e11f..0817313e2 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1154,10 +1154,10 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd)
 
 	// This usually happens when the player clicked on a NPC that has the view id
 	// of a mob, to activate this kind of npc it's needed to be in a 2,2 range
-	// from it. If the OnTouch area of a npc, coincides with the 2,2 range of 
+	// from it. If the OnTouch area of a npc, coincides with the 2,2 range of
 	// another it's expected that the OnTouch event be put first in stack, because
 	// unit_walktoxy_timer is executed before any other function in this case.
-	// So it's best practice to put an 'end;' before OnTouch events in npcs that 
+	// So it's best practice to put an 'end;' before OnTouch events in npcs that
 	// have view ids of mobs to avoid this "issue" [Panikon]
 	if (sd->npc_id != 0) {
 		// The player clicked a npc after entering an OnTouch area
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index f245ffea5..2182e1da2 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -49,7 +49,7 @@ struct pcre_interface libpcre_s;
  *
  *    defpattern 1, "[^:]+: (.*) loves (.*)", "label";
  *
- *  this defines a new pattern in set 1 using perl syntax 
+ *  this defines a new pattern in set 1 using perl syntax
  *    (http://www.troubleshooters.com/codecorn/littperl/perlreg.htm)
  *  and tells it to jump to the supplied label when the pattern
  *  is matched.
@@ -59,7 +59,7 @@ struct pcre_interface libpcre_s;
  *  before the script gets executed.
  *
  *    activatepset 1;
- * 
+ *
  *  This activates a set of patterns.. You can have many pattern
  *  sets defined and many active all at once.  This feature allows
  *  you to set up "conversations" and ever changing expectations of
@@ -95,11 +95,10 @@ void finalize_pcrematch_entry(struct pcrematch_entry* e)
 /**
  * Lookup (and possibly create) a new set of patterns by the set id
  */
-struct pcrematch_set* lookup_pcreset(struct npc_data* nd, int setid) 
-{
+struct pcrematch_set* lookup_pcreset(struct npc_data* nd, int setid) {
 	struct pcrematch_set *pcreset;
 	struct npc_parse *npcParse = nd->chatdb;
-	if (npcParse == NULL) 
+	if (npcParse == NULL)
 		nd->chatdb = npcParse = (struct npc_parse *)aCalloc(sizeof(struct npc_parse), 1);
 	
 	pcreset = npcParse->active;
@@ -109,7 +108,7 @@ struct pcrematch_set* lookup_pcreset(struct npc_data* nd, int setid)
 		break;
 		pcreset = pcreset->next;
 	}
-	if (pcreset == NULL) 
+	if (pcreset == NULL)
 		pcreset = npcParse->inactive;
 	
 	while (pcreset != NULL) {
@@ -140,7 +139,7 @@ void activate_pcreset(struct npc_data* nd, int setid)
 {
 	struct pcrematch_set *pcreset;
 	struct npc_parse *npcParse = nd->chatdb;
-	if (npcParse == NULL) 
+	if (npcParse == NULL)
 		return; // Nothing to activate...
 	pcreset = npcParse->inactive;
 	while (pcreset != NULL) {
@@ -154,7 +153,7 @@ void activate_pcreset(struct npc_data* nd, int setid)
 		pcreset->next->prev = pcreset->prev;
 	if (pcreset->prev != NULL)
 		pcreset->prev->next = pcreset->next;
-	else 
+	else
 		npcParse->inactive = pcreset->next;
 	
 	pcreset->prev = NULL;
@@ -173,7 +172,7 @@ void deactivate_pcreset(struct npc_data* nd, int setid)
 {
 	struct pcrematch_set *pcreset;
 	struct npc_parse *npcParse = nd->chatdb;
-	if (npcParse == NULL) 
+	if (npcParse == NULL)
 		return; // Nothing to deactivate...
 	if (setid == -1) {
 		while(npcParse->active != NULL)
@@ -192,7 +191,7 @@ void deactivate_pcreset(struct npc_data* nd, int setid)
 		pcreset->next->prev = pcreset->prev;
 	if (pcreset->prev != NULL)
 		pcreset->prev->next = pcreset->next;
-	else 
+	else
 		npcParse->active = pcreset->next;
 	
 	pcreset->prev = NULL;
@@ -210,7 +209,7 @@ void delete_pcreset(struct npc_data* nd, int setid)
 	int active = 1;
 	struct pcrematch_set *pcreset;
 	struct npc_parse *npcParse = nd->chatdb;
-	if (npcParse == NULL) 
+	if (npcParse == NULL)
 		return; // Nothing to deactivate...
 	pcreset = npcParse->active;
 	while (pcreset != NULL) {
@@ -227,7 +226,7 @@ void delete_pcreset(struct npc_data* nd, int setid)
 			pcreset = pcreset->next;
 		}
 	}
-	if (pcreset == NULL) 
+	if (pcreset == NULL)
 		return;
 	
 	if (pcreset->next != NULL)
@@ -254,7 +253,7 @@ void delete_pcreset(struct npc_data* nd, int setid)
 }
 
 /**
- * create a new pattern entry 
+ * create a new pattern entry
  */
 struct pcrematch_entry* create_pcrematch_entry(struct pcrematch_set* set)
 {
@@ -300,7 +299,7 @@ void npc_chat_def_pattern(struct npc_data* nd, int setid, const char* pattern, c
 
 /**
  * Delete everything associated with a NPC concerning the pattern
- * matching code 
+ * matching code
  *
  * this could be more efficent but.. how often do you do this?
  */
diff --git a/src/map/packets.h b/src/map/packets.h
index da1f176ff..fe323965c 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -2600,19 +2600,19 @@ packet(0x020d,-1);
 
 // 2014-01-15eRagexe - YomRawr
 #if PACKETVER >= 20140115
-	packet(0x0369,7,clif->pActionRequest,2,6); 
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6); 
-	packet(0x0437,5,clif->pWalkToXY,2); 
-	packet(0x035F,6,clif->pTickSend,2); 
-	packet(0x08A7,5,clif->pChangeDir,2,4); 
-	packet(0x0940,6,clif->pTakeItem,2); 
-	packet(0x0361,6,clif->pDropItem,2,4); 
-	packet(0x088E,8,clif->pMoveToKafra,2,4); 
-	packet(0x0367,8,clif->pMoveFromKafra,2,4); 
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8); 
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); 
-	packet(0x0802,6,clif->pGetCharNameRequest,2); 
-	packet(0x0368,6,clif->pSolveCharName,2); 
+	packet(0x0369,7,clif->pActionRequest,2,6);
+	packet(0x083C,10,clif->pUseSkillToId,2,4,6);
+	packet(0x0437,5,clif->pWalkToXY,2);
+	packet(0x035F,6,clif->pTickSend,2);
+	packet(0x08A7,5,clif->pChangeDir,2,4);
+	packet(0x0940,6,clif->pTakeItem,2);
+	packet(0x0361,6,clif->pDropItem,2,4);
+	packet(0x088E,8,clif->pMoveToKafra,2,4);
+	packet(0x0367,8,clif->pMoveFromKafra,2,4);
+	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0802,6,clif->pGetCharNameRequest,2);
+	packet(0x0368,6,clif->pSolveCharName,2);
 	packet(0x0360,12,clif->pSearchStoreInfoListItemClick,2,6,10);
 	packet(0x0817,2,clif->pSearchStoreInfoNextPage,0);
 	packet(0x0815,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 55006db64..3d49944d1 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -596,7 +596,7 @@ struct packet_status_change {
 #if PACKETVER >= 20120618
 	unsigned int Total;
 #endif
-#if PACKETVER >= 20090121	
+#if PACKETVER >= 20090121
 	unsigned int Left;
 	int val1;
 	int val2;
diff --git a/src/map/party.c b/src/map/party.c
index 7c49e241c..678b2cd54 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -1364,7 +1364,7 @@ void do_init_party(bool minimal) {
 	timer->add_interval(timer->gettick()+battle_config.party_update_interval, party->send_xy_timer, 0, 0, battle_config.party_update_interval);
 }
 /*=====================================
-* Default Functions : party.h 
+* Default Functions : party.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/party.h b/src/map/party.h
index 3bad22b13..1c58301d1 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -71,7 +71,7 @@ struct party_booking_ad_info {
 #endif /* PARTY_RECRUIT */
 
 /*=====================================
-* Interface : party.h 
+* Interface : party.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/path.c b/src/map/path.c
index d02e9ee4a..e90b26db5 100644
--- a/src/map/path.c
+++ b/src/map/path.c
@@ -205,7 +205,7 @@ static int add_path(struct node_heap *heap, struct path_node *tp, int16 x, int16
 		if (g_cost < tp[i].g_cost) { // New path to this node is better than old one
 			// Update costs and parent
 			tp[i].g_cost = g_cost;
-			tp[i].parent = parent; 
+			tp[i].parent = parent;
 			tp[i].f_cost = g_cost + h_cost;
 			if (tp[i].flag == SET_CLOSED) {
 				heap_push_node(heap, &tp[i]); // Put it in open set again
@@ -299,7 +299,7 @@ bool path_search(struct walkpath_data *wpd, int16 m, int16 x0, int16 y0, int16 x
 			return true;
 		}
 
-		return false; // easy path unsuccessful 
+		return false; // easy path unsuccessful
 	}
 	else { // !(flag&1)
 		// A* (A-star) pathfinding
diff --git a/src/map/pc.c b/src/map/pc.c
index 08ff8baf9..ce2b8040e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1156,7 +1156,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 			clif->message(sd->fd, buf);
 		}
 		
-		if (expiration_time != 0) {			
+		if (expiration_time != 0) {
 			sd->expiration_time = expiration_time;
 		}
 
@@ -4448,7 +4448,7 @@ int pc_useitem(struct map_session_data *sd,int n) {
 		}
 	}
 
-	/* on restricted maps the item is consumed but the effect is not used */	
+	/* on restricted maps the item is consumed but the effect is not used */
 	for(i = 0; i < map->list[sd->bl.m].zone->disabled_items_count; i++) {
 		if( map->list[sd->bl.m].zone->disabled_items[i] == nameid ) {
 			clif->msg(sd, ITEM_CANT_USE_AREA); // This item cannot be used within this area
@@ -7264,7 +7264,7 @@ int pc_readparam(struct map_session_data* sd,int type)
 		case SP_DEFELE:		     val = sd->battle_status.def_ele; break;
 #ifndef RENEWAL_CAST
 		case SP_VARCASTRATE:
-#endif	
+#endif
 		case SP_CASTRATE:
 				val = sd->castrate+=val;
 			break;
@@ -10329,7 +10329,7 @@ int pc_global_expiration_timer(int tid, int64 tick, int id, intptr_t data) {
 	
 	return 0;
 }
-void pc_expire_check(struct map_session_data *sd) {	
+void pc_expire_check(struct map_session_data *sd) {
 	/* ongoing timer */
 	if( sd->expiration_tid != INVALID_TIMER )
 		return;
@@ -10630,7 +10630,7 @@ void do_init_pc(bool minimal) {
 	ers_chunk_size(pc->str_reg_ers, 50);
 }
 /*=====================================
-* Default Functions : pc.h 
+* Default Functions : pc.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/pc.h b/src/map/pc.h
index 5d723fcf8..90f227cee 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -725,7 +725,7 @@ struct autotrade_vending {
 };
 
 /*=====================================
-* Interface : pc.h 
+* Interface : pc.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index a917ef409..e577c642f 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -183,7 +183,7 @@ static void read_config(void) {
 				int j, inherit_count = 0, done = 0;
 				
 				if (group_settings->inheritance_done) // group already processed
-					continue; 
+					continue;
 
 				if ((inherit = group_settings->inherit) == NULL ||
 				    (inherit_count = libconfig->setting_length(inherit)) <= 0) { // this group does not inherit from others
diff --git a/src/map/pet.c b/src/map/pet.c
index aa2be4473..6a458eae6 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -99,7 +99,7 @@ int pet_unlocktarget(struct pet_data *pd)
  * Pet Attack Skill [Skotlex]
  *------------------------------------------*/
 int pet_attackskill(struct pet_data *pd, int target_id) {
-	if (!battle_config.pet_status_support || !pd->a_skill || 
+	if (!battle_config.pet_status_support || !pd->a_skill ||
 		(battle_config.pet_equip_required && !pd->pet.equip))
 		return 0;
 
@@ -107,7 +107,7 @@ int pet_attackskill(struct pet_data *pd, int target_id) {
 		return 0;
 	
 	if (rnd()%100 < (pd->a_skill->rate +pd->pet.intimate*pd->a_skill->bonusrate/1000)) {
-		//Skotlex: Use pet's skill 
+		//Skotlex: Use pet's skill
 		int inf;
 		struct block_list *bl;
 
@@ -158,7 +158,7 @@ int pet_target_check(struct map_session_data *sd,struct block_list *bl,int type)
 		if(pd->petDB->defence_attack_rate > 0 && rate <= 0)
 			rate = 1;
 	}
-	if(rnd()%10000 < rate) 
+	if(rnd()%10000 < rate)
 	{
 		if(pd->target_id == 0 || rnd()%10000 < pd->petDB->change_target_rate)
 			pd->target_id = bl->id;
@@ -319,7 +319,7 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *petinfo)
 
 	nullpo_retr(1, sd);
 
-	Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd); 
+	Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd);
 
 	if(sd->status.account_id != petinfo->account_id || sd->status.char_id != petinfo->char_id) {
 		sd->status.pet_id = 0;
@@ -390,7 +390,7 @@ int pet_birth_process(struct map_session_data *sd, struct s_pet *petinfo)
 {
 	nullpo_retr(1, sd);
 
-	Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd); 
+	Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd);
 
 	if(sd->status.pet_id && petinfo->incuvate == 1) {
 		sd->status.pet_id = 0;
@@ -418,7 +418,7 @@ int pet_birth_process(struct map_session_data *sd, struct s_pet *petinfo)
 		clif->send_petdata(NULL, sd->pd, 3, sd->pd->vd.head_bottom);
 		clif->send_petstatus(sd);
 	}
-	Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd); 
+	Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd);
 
 	return 0;
 }
@@ -912,7 +912,7 @@ int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 tick
 		(pd->ud.attacktimer != INVALID_TIMER || pd->ud.walktimer != INVALID_TIMER))
 		return 0; //Target already locked.
 
-	if (target->type != BL_ITEM) 
+	if (target->type != BL_ITEM)
 	{ //enemy targetted
 		if(!battle->check_range(&pd->bl,target,pd->status.rhw.range))
 		{	//Chase
@@ -934,7 +934,7 @@ int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 tick
 				memcpy(&pd->loot->item[pd->loot->count++],&fitem->item_data,sizeof(pd->loot->item[0]));
 				pd->loot->weight += itemdb_weight(fitem->item_data.nameid)*fitem->item_data.amount;
 				map->clearflooritem(target);
-			} 
+			}
 			//Target is unlocked regardless of whether it was picked or not.
 			pet->unlocktarget(pd);
 		}
@@ -1050,7 +1050,7 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd)
 
 /*==========================================
  * pet bonus giving skills [Valaris] / Rewritten by [Skotlex]
- *------------------------------------------*/ 
+ *------------------------------------------*/
 int pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	struct pet_data *pd;
@@ -1091,7 +1091,7 @@ int pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) {
 
 /*==========================================
  * pet recovery skills [Valaris] / Rewritten by [Skotlex]
- *------------------------------------------*/ 
+ *------------------------------------------*/
 int pet_recovery_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	struct pet_data *pd;
@@ -1107,7 +1107,7 @@ int pet_recovery_timer(int tid, int64 tick, int id, intptr_t data) {
 	}
 
 	if(sd->sc.data[pd->recovery->type])
-	{	//Display a heal animation? 
+	{	//Display a heal animation?
 		//Detoxify is chosen for now.
 		clif->skill_nodamage(&pd->bl,&sd->bl,TF_DETOXIFY,1,1);
 		status_change_end(&sd->bl, pd->recovery->type, INVALID_TIMER);
@@ -1155,7 +1155,7 @@ int pet_heal_timer(int tid, int64 tick, int id, intptr_t data) {
 
 /*==========================================
  * pet support skills [Skotlex]
- *------------------------------------------*/ 
+ *------------------------------------------*/
 int pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data *sd=map->id2sd(id);
 	struct pet_data *pd;
@@ -1202,12 +1202,12 @@ int pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) {
  * Pet read db data
  * pet->db.txt
  * pet->db2.txt
- *------------------------------------------*/ 
+ *------------------------------------------*/
 int read_petdb()
 {
 	char* filename[] = {"pet_db.txt","pet_db2.txt"};
 	FILE *fp;
-	int nameid,i,j,k; 
+	int nameid,i,j,k;
 
 	// Remove any previous scripts in case reloaddb was invoked.
 	for( j = 0; j < MAX_PET_DB; j++ )
diff --git a/src/map/skill.c b/src/map/skill.c
index b2e94ec79..94bcd1d1b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2234,7 +2234,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 						status_change_end(bl, SC_ENERGYCOAT, INVALID_TIMER);
 					//Reduction: 6% + 6% every 20%
 					dmg.damage -= dmg.damage * (6 * (1+per)) / 100;
-				}	
+				}
 			}
 		#endif /* MAGIC_REFLECTION_TYPE */
 		}
@@ -2647,7 +2647,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 		//blown-specific handling
 		switch( skill_id ) {
 			case LG_OVERBRAND_BRANDISH:
-				if( skill->blown(dsrc,bl,dmg.blewcount,dir,0) < dmg.blewcount ) 
+				if( skill->blown(dsrc,bl,dmg.blewcount,dir,0) < dmg.blewcount )
 					skill->addtimerskill(src, tick + status_get_amotion(src), bl->id, 0, 0, LG_OVERBRAND_PLUSATK, skill_lv, BF_WEAPON, flag|SD_ANIMATION);
 				break;
 			case SR_KNUCKLEARROW:
@@ -3165,7 +3165,7 @@ int skill_timerskill(int tid, int64 tick, int id, intptr_t data) {
 									BL_CHAR|BL_SKILL, target->id); // Search for a new Target around current one...
 							if( nbl == NULL)
 								skl->x++;
-							else 
+							else
 								skl->x = 0;
 							
 							skill->addtimerskill(src, tick + 651, (nbl?nbl:target)->id, skl->x, 0, WL_CHAINLIGHTNING_ATK, skl->skill_lv, skl->type + 1, skl->flag);
@@ -3177,9 +3177,9 @@ int skill_timerskill(int tid, int64 tick, int id, intptr_t data) {
 				case WL_TETRAVORTEX_WIND:
 				case WL_TETRAVORTEX_GROUND:
 					clif->skill_nodamage(src, target, skl->skill_id, skl->skill_lv, 1);
-					skill->attack(BF_MAGIC, src, src, target, skl->skill_id, skl->skill_lv, tick, skl->flag); 
+					skill->attack(BF_MAGIC, src, src, target, skl->skill_id, skl->skill_lv, tick, skl->flag);
 					skill->toggle_magicpower(src, skl->skill_id); // only the first hit will be amplify
-					if( skl->type == 4 ){ 
+					if( skl->type == 4 ){
 						const enum sc_type scs[] = { SC_BURNING, SC_BLOODING, SC_FROSTMISTY, SC_STUN }; // status inflicts are depend on what summoned element is used.
 						int rate = skl->y, index = skl->x-1;
 						sc_start2(src,target, scs[index], rate, skl->skill_lv, src->id, skill->get_time(WL_TETRAVORTEX,index+1));
@@ -4196,7 +4196,7 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 		case WL_TETRAVORTEX:
 			if( sc ){
 				int i = SC_SUMMON5, x = 0;
-				int types[][2] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}}; 
+				int types[][2] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}};
 				for(; i >= SC_SUMMON1; i--){
 					if( sc->data[i] ){
 						int skillid = WL_TETRAVORTEX_FIRE + (sc->data[i]->val1 - WLS_FIRE) + (sc->data[i]->val1 == WLS_WIND) - (sc->data[i]->val1 == WLS_WATER), sc_index = 0, rate = 0;
@@ -4272,7 +4272,7 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 						if (sd->skillcooldown[i].id == spell_skill_id){
 							cooldown += sd->skillcooldown[i].val;
 							break;
-						}					
+						}
 					}
 					if(cooldown)
 						skill->blockpc_start(sd, spell_skill_id, cooldown);
@@ -4769,10 +4769,10 @@ int skill_castend_id(int tid, int64 tick, int id, intptr_t data) {
 				inf &= ~BCT_NEUTRAL;
 			}
 
-			if( sd && (inf2&INF2_CHORUS_SKILL) && skill->check_pc_partner(sd, ud->skill_id, &ud->skill_lv, 1, 0) < 1 ) { 
-				clif->skill_fail(sd, ud->skill_id, USESKILL_FAIL_NEED_HELPER, 0); 
-				break; 
-			} 
+			if( sd && (inf2&INF2_CHORUS_SKILL) && skill->check_pc_partner(sd, ud->skill_id, &ud->skill_lv, 1, 0) < 1 ) {
+				clif->skill_fail(sd, ud->skill_id, USESKILL_FAIL_NEED_HELPER, 0);
+				break;
+			}
 
 			if( ud->skill_id >= SL_SKE && ud->skill_id <= SL_SKA && target->type == BL_MOB )
 			{
@@ -5036,7 +5036,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 		 **/
 		case AB_RENOVATIO:
 		case AB_HIGHNESSHEAL:
-		case AL_INCAGI:	
+		case AL_INCAGI:
 			if( sd && dstsd && pc_ismadogear(dstsd) ){
 				clif->skill_fail(sd,skill_id,USESKILL_FAIL_TOTARGET,0);
 				return 0;
@@ -5674,7 +5674,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			
 		case KN_AUTOCOUNTER:
 				sc_start(src,bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv));
-				skill->addtimerskill(src, tick + 100, bl->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag);				
+				skill->addtimerskill(src, tick + 100, bl->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag);
 			break;
 
 		case SO_STRIKING:
@@ -10315,7 +10315,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 		case WM_SOUND_OF_DESTRUCTION:
 			r = skill->get_splash(skill_id,skill_lv);
 			map->foreachinarea(skill->area_sub,src->m,x-r,y-r,x+r,y+r,BL_CHAR,src,skill_id,skill_lv,tick,flag|BCT_ENEMY|1,skill->castend_damage_id);
-			break;	
+			break;
 
 		case WM_LULLABY_DEEPSLEEP:
 			r = skill->get_splash(skill_id,skill_lv);
@@ -11669,7 +11669,7 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6
 		case UNT_FIREPILLAR_ACTIVE:
 		case UNT_CLAYMORETRAP:
 			if( sg->unit_id == UNT_FIRINGTRAP || sg->unit_id == UNT_ICEBOUNDTRAP || sg->unit_id == UNT_CLAYMORETRAP )
-				map->foreachinrange(skill->trap_splash,&src->bl, skill->get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag|BL_SKILL|~BCT_SELF, &src->bl,tick);	
+				map->foreachinrange(skill->trap_splash,&src->bl, skill->get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag|BL_SKILL|~BCT_SELF, &src->bl,tick);
 			else
 				map->foreachinrange(skill->trap_splash,&src->bl, skill->get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag, &src->bl,tick);
 			if (sg->unit_id != UNT_FIREPILLAR_ACTIVE)
@@ -13054,7 +13054,7 @@ int skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id
 			{
 				int j, i = 0;
 				for(j = SC_SUMMON1; j <= SC_SUMMON5; j++)
-					if( sc && sc->data[j] )	
+					if( sc && sc->data[j] )
 						i++;
 
 				switch(skill_id){
@@ -14124,9 +14124,9 @@ int skill_vfcastfix(struct block_list *bl, double time, uint16 skill_id, uint16
 		if( sd->bonus.varcastrate < 0 )
 			VARCAST_REDUCTION(sd->bonus.varcastrate);
 		if( sd->bonus.add_varcast != 0 ) // bonus bVariableCast
-			time += sd->bonus.add_varcast; 
+			time += sd->bonus.add_varcast;
 		if( sd->bonus.add_fixcast != 0 ) // bonus bFixedCast
-			fixed += sd->bonus.add_fixcast; 
+			fixed += sd->bonus.add_fixcast;
 		for (i = 0; i < ARRAYLENGTH(sd->skillfixcast) && sd->skillfixcast[i].id; i++)
 			if (sd->skillfixcast[i].id == skill_id){ // bonus2 bSkillFixedCast
 				fixed += sd->skillfixcast[i].val;
@@ -14197,7 +14197,7 @@ int skill_vfcastfix(struct block_list *bl, double time, uint16 skill_id, uint16
 			fixcast_r = max(fixcast_r, sc->data[SC_DANCE_WITH_WUG]->val4);
 		if( sc->data[SC_SECRAMENT] )
 			fixcast_r = max(fixcast_r, sc->data[SC_SECRAMENT]->val2);
-		if( sd && ( skill_lv = pc->checkskill(sd, WL_RADIUS) ) && (skill_id >= WL_WHITEIMPRISON && skill_id < WL_FREEZE_SP) ) 
+		if( sd && ( skill_lv = pc->checkskill(sd, WL_RADIUS) ) && (skill_id >= WL_WHITEIMPRISON && skill_id < WL_FREEZE_SP) )
 			fixcast_r = max(fixcast_r, (status_get_int(bl) + status->get_lv(bl)) / 15 + skill_lv * 5); // [{(Caster?s INT / 15) + (Caster?s Base Level / 15) + (Radius Skill Level x 5)}] %
 		// Fixed cast non percentage bonuses
 		if( sc->data[SC_MANDRAGORA] )
@@ -15323,7 +15323,7 @@ bool skill_check_shadowform(struct block_list *bl, int64 damage, int hit){
 	if( sc && sc->data[SC__SHADOWFORM] && damage ) {
 		src = map->id2bl(sc->data[SC__SHADOWFORM]->val2);
 
-		if( !src || src->m != bl->m ) { 
+		if( !src || src->m != bl->m ) {
 			status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);
 			return false;
 		}
@@ -18515,7 +18515,7 @@ void skill_defaults(void) {
 	skill->unit_onplace = skill_unit_onplace;
 	skill->unit_ondamaged = skill_unit_ondamaged;
 	skill->cast_fix = skill_castfix;
-	skill->cast_fix_sc = skill_castfix_sc;	
+	skill->cast_fix_sc = skill_castfix_sc;
 	skill->vf_cast_fix = skill_vfcastfix;
 	skill->delay_fix = skill_delay_fix;
 	skill->check_condition_castbegin = skill_check_condition_castbegin;
diff --git a/src/map/skill.h b/src/map/skill.h
index b6dbb1fcb..66d6dc39e 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -1597,7 +1597,7 @@ enum {
 	UNT_ZENKAI_WIND,
 	UNT_MAKIBISHI,
 	UNT_VENOMFOG,
-	UNT_ICEMINE, 
+	UNT_ICEMINE,
  	UNT_FLAMECROSS,
  	UNT_HELLBURNING,
  	UNT_MAGMA_ERUPTION,
diff --git a/src/map/sql/CMakeLists.txt b/src/map/sql/CMakeLists.txt
index 11751a1a5..1629b2a8b 100644
--- a/src/map/sql/CMakeLists.txt
+++ b/src/map/sql/CMakeLists.txt
@@ -18,7 +18,7 @@ set( SQL_MAP_HEADERS
 	"${SQL_MAP_SOURCE_DIR}/guild.h"
 	"${SQL_MAP_SOURCE_DIR}/homunculus.h"
 	"${SQL_MAP_SOURCE_DIR}/HPMmap.h"
-	"${SQL_MAP_SOURCE_DIR}/instance.h"	
+	"${SQL_MAP_SOURCE_DIR}/instance.h"
 	"${SQL_MAP_SOURCE_DIR}/intif.h"
 	"${SQL_MAP_SOURCE_DIR}/irc-bot.h"
 	"${SQL_MAP_SOURCE_DIR}/itemdb.h"
diff --git a/src/map/status.c b/src/map/status.c
index eb06138da..316dce8e6 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -180,7 +180,7 @@ void initChangeTables(void) {
 	add_sc( TF_POISON            , SC_POISON          );
 	set_sc( KN_TWOHANDQUICKEN    , SC_TWOHANDQUICKEN  , SI_TWOHANDQUICKEN  , SCB_ASPD );
 	add_sc( KN_AUTOCOUNTER       , SC_AUTOCOUNTER     );
-	set_sc( PR_IMPOSITIO         , SC_IMPOSITIO       , SI_IMPOSITIO       , 
+	set_sc( PR_IMPOSITIO         , SC_IMPOSITIO       , SI_IMPOSITIO       ,
 #ifdef RENEWAL
 		SCB_NONE );
 #else
@@ -204,7 +204,7 @@ void initChangeTables(void) {
 	set_sc( BS_WEAPONPERFECT     , SC_WEAPONPERFECT   , SI_WEAPONPERFECT, SCB_NONE );
 	set_sc( BS_OVERTHRUST        , SC_OVERTHRUST      , SI_OVERTHRUST   , SCB_NONE );
 	set_sc( BS_MAXIMIZE          , SC_MAXIMIZEPOWER   , SI_MAXIMIZE     , SCB_REGEN );
-	add_sc( HT_LANDMINE          , SC_STUN            ); 
+	add_sc( HT_LANDMINE          , SC_STUN            );
 	set_sc( HT_ANKLESNARE        , SC_ANKLESNARE      , SI_ANKLESNARE   , SCB_NONE );
 	add_sc( HT_SANDMAN           , SC_SLEEP           );
 	add_sc( HT_FLASHER           , SC_BLIND           );
@@ -3672,7 +3672,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag) {
 		st->batk = status->calc_batk(bl, sc, st->batk, true);
 	}
 
-	if(flag&SCB_WATK) {		
+	if(flag&SCB_WATK) {
 		st->rhw.atk = status->calc_watk(bl, sc, bst->rhw.atk, true);
 		if (!sd) //Should not affect weapon refine bonus
 			st->rhw.atk2 = status->calc_watk(bl, sc, bst->rhw.atk2, true);
@@ -5016,7 +5016,7 @@ signed short status_calc_def2(struct block_list *bl, struct status_change *sc, i
 #ifdef RENEWAL
 		if( sc && sc->data[SC_ASSUMPTIO] )
 			def2 <<= 1;
-#endif				
+#endif
 		if( sc && sc->data[SC_CAMOUFLAGE] )
 			def2 -= def2 * 5 * (10-sc->data[SC_CAMOUFLAGE]->val4) / 100;
 #ifdef RENEWAL
@@ -5912,7 +5912,7 @@ struct status_data *status_get_base_status(struct block_list *bl)
 		case BL_HOM: return &((TBL_HOM*)bl)->base_status;
 		case BL_MER: return &((TBL_MER*)bl)->base_status;
 		case BL_ELEM: return &((TBL_ELEM*)bl)->base_status;
-		case BL_NPC:  return ((mob->db_checkid(((TBL_NPC*)bl)->class_) == 0) ? &((TBL_NPC*)bl)->status : NULL); 
+		case BL_NPC:  return ((mob->db_checkid(((TBL_NPC*)bl)->class_) == 0) ? &((TBL_NPC*)bl)->status : NULL);
 		default:
 			return NULL;
 	}
@@ -5929,8 +5929,8 @@ defType status_get_def(struct block_list *bl) {
 }
 
 unsigned short status_get_speed(struct block_list *bl) {
-	if(bl->type==BL_NPC)//Only BL with speed data but no status_data [Skotlex] 
-		return ((struct npc_data *)bl)->speed; 
+	if(bl->type==BL_NPC)//Only BL with speed data but no status_data [Skotlex]
+		return ((struct npc_data *)bl)->speed;
 	return status->get_status_data(bl)->speed;
 }
 
@@ -6939,9 +6939,9 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 		case SC_ASSNCROS:
 			if(sc->option&OPTION_MADOGEAR)
 				return 0;//Mado is immune to wind walk, cart boost, etc (others above) [Ind]
-		case SC_INC_AGI:	
+		case SC_INC_AGI:
 			if (sc->data[SC_QUAGMIRE])
-				return 0;		
+				return 0;
 			break;
 		case SC_CLOAKING:
 			//Avoid cloaking with no wall and low skill level. [Skotlex]
@@ -7143,7 +7143,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 			case SC_ROKISWEIL:
 			case SC_FOGWALL:
 			case SC_FROSTMISTY:
-			case SC_BURNING: 
+			case SC_BURNING:
 			case SC_MARSHOFABYSS:
 			case SC_ADORAMUS:
 			case SC_NEEDLE_OF_PARALYZE:
@@ -9401,7 +9401,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 	}
 
 	//On Aegis, when turning on a status change, first goes the option packet, then the sc packet.
-	if(opt_flag) {			
+	if(opt_flag) {
 		clif->changeoption(bl);
 		if( sd && opt_flag&0x4 ) {
 			clif->changelook(bl,LOOK_BASE,vd->class_);
@@ -11958,7 +11958,7 @@ void do_final_status(void) {
 }
 
 /*=====================================
-* Default Functions : status.h 
+* Default Functions : status.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/status.h b/src/map/status.h
index 6bb563b0b..3bdd59041 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -711,766 +711,787 @@ typedef enum sc_type {
 	
 	SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
 } sc_type;
-// Official status change ids, used to display status icons on the client.
+
+/// Official status change ids, used to display status icons in the client.
 enum si_type {
-	SI_BLANK		= -1,
-	SI_PROVOKE		= 0, 
-	SI_ENDURE		= 1, 
-	SI_TWOHANDQUICKEN		= 2,
-	SI_CONCENTRATION		= 3, 
-	SI_HIDING		= 4, 
-	SI_CLOAKING		= 5, 
-	SI_ENCHANTPOISON		= 6, 
-	SI_POISONREACT		= 7, 
-	SI_QUAGMIRE		= 8, 
-	SI_ANGELUS		= 9, 
-	SI_BLESSING		= 10, 
-	SI_CRUCIS		= 11, 
-	SI_INC_AGI		= 12, 
-	SI_DEC_AGI		= 13, 
-	SI_SLOWPOISON		= 14, 
-	SI_IMPOSITIO		= 15, 
-	SI_SUFFRAGIUM		= 16, 
-	SI_ASPERSIO		= 17, 
-	SI_BENEDICTIO		= 18, 
-	SI_KYRIE		= 19, 
-	SI_MAGNIFICAT		= 20, 
-	SI_GLORIA		= 21, 
-	SI_LEXAETERNA		= 22, 
-	SI_ADRENALINE		= 23, 
-	SI_WEAPONPERFECT		= 24, 
-	SI_OVERTHRUST		= 25, 
-	SI_MAXIMIZE		= 26, 
-	SI_RIDING		= 27, 
-	SI_FALCON		= 28, 
-	SI_TRICKDEAD		= 29, 
-	SI_SHOUT		= 30, 
-	SI_ENERGYCOAT		= 31, 
-	SI_BROKENARMOR		= 32, 
-	SI_BROKENWEAPON		= 33, 
-	SI_ILLUSION		= 34, 
-	SI_WEIGHTOVER50		= 35, 
-	SI_WEIGHTOVER90		= 36, 
-	SI_ATTHASTE_POTION1		= 37, 
-	SI_ATTHASTE_POTION2		= 38, 
-	SI_ATTHASTE_POTION3		= 39, 
-	SI_ATTHASTE_INFINITY		= 40, 
-	SI_MOVHASTE_POTION		= 41, 
-	SI_MOVHASTE_INFINITY		= 42,
-//	SI_AUTOCOUNTER = 43,
-//	SI_SPLASHER = 44,
-	SI_ANKLESNARE = 45,
-	SI_POSTDELAY		= 46,
-//	SI_NOACTION = 47,
-//	SI_IMPOSSIBLEPICKUP = 48,
-//	SI_BARRIER = 49,
-	SI_NOEQUIPWEAPON		= 50, 
-	SI_NOEQUIPSHIELD		= 51, 
-	SI_NOEQUIPARMOR		= 52, 
-	SI_NOEQUIPHELM		= 53, 
-	SI_PROTECTWEAPON		= 54, 
-	SI_PROTECTSHIELD		= 55, 
-	SI_PROTECTARMOR		= 56, 
-	SI_PROTECTHELM		= 57, 
-	SI_AUTOGUARD		= 58, 
-	SI_REFLECTSHIELD		= 59, 
-//	SI_DEVOTION = 60,
-	SI_PROVIDENCE		= 61,
-	SI_DEFENDER		= 62,
-//	SI_MAGICROD = 63,
-//	SI_WEAPONPROPERTY = 64,
-	SI_AUTOSPELL		= 65,
-//	SI_SPECIALZONE = 66,
-//	SI_MASK = 67,
-	SI_SPEARQUICKEN		= 68,
-//	SI_BDPLAYING = 69,
-//	SI_WHISTLE = 70,
-//	SI_ASSASSINCROSS = 71,
-//	SI_POEMBRAGI = 72,
-//	SI_APPLEIDUN = 73,
-//	SI_HUMMING = 74,
-//	SI_DONTFORGETME = 75,
-//	SI_FORTUNEKISS = 76,
-//	SI_SERVICEFORYOU = 77,
-//	SI_RICHMANKIM = 78,
-//	SI_ETERNALCHAOS = 79,
-//	SI_DRUMBATTLEFIELD = 80,
-//	SI_RINGNIBELUNGEN = 81,
-//	SI_ROKISWEIL = 82,
-//	SI_INTOABYSS = 83,
-//	SI_SIEGFRIED = 84,
-//	SI_BLADESTOP = 85,
-	SI_EXPLOSIONSPIRITS	= 86,
-	SI_STEELBODY		= 87,
-	SI_EXTREMITYFIST = 88,
-//	SI_COMBOATTACK = 89,
-	SI_PROPERTYFIRE		= 90, 
-	SI_PROPERTYWATER		= 91, 
-	SI_PROPERTYWIND		= 92, 
-	SI_PROPERTYGROUND		= 93, 
-//	SI_MAGICATTACK = 94,
-	SI_STOP			= 95,
-//	SI_WEAPONBRAKER = 96,
-	SI_PROPERTYUNDEAD		= 97, 
-//	SI_POWERUP = 98,
-//	SI_AGIUP = 99,
-//	SI_SIEGEMODE = 100,
-//	SI_INVISIBLE = 101,
-//	SI_STATUSONE = 102,
-	SI_AURABLADE		= 103, 
-	SI_PARRYING		= 104, 
-	SI_LKCONCENTRATION		= 105, 
-	SI_TENSIONRELAX		= 106, 
-	SI_BERSERK		= 107,
-//	SI_SACRIFICE = 108,
-//	SI_GOSPEL = 109,
-	SI_ASSUMPTIO		= 110,
-//	SI_BASILICA = 111,
-	SI_GROUNDMAGIC		= 112,
-	SI_MAGICPOWER		= 113,
-	SI_EDP			= 114,
-	SI_TRUESIGHT		= 115,
-	SI_WINDWALK		= 116,
-	SI_MELTDOWN		= 117,
-	SI_CARTBOOST		= 118,
-//	SI_CHASEWALK = 119,
-	SI_SWORDREJECT		= 120, 
-	SI_MARIONETTE_MASTER		= 121, 
-	SI_MARIONETTE		= 122, 
-	SI_MOON		= 123, 
-	SI_BLOODING		= 124, 
-	SI_JOINTBEAT		= 125,
-//	SI_MINDBREAKER = 126,
-//	SI_MEMORIZE = 127,
-//	SI_FOGWALL = 128,
-//	SI_SPIDERWEB = 129,
-	SI_PROTECTEXP			= 130,
-//	SI_SUB_WEAPONPROPERTY = 131,
-	SI_AUTOBERSERK		= 132,
-	SI_RUN			= 133,
-	SI_TING			= 134,
-	SI_STORMKICK_ON		= 135, 
-	SI_STORMKICK_READY		= 136, 
-	SI_DOWNKICK_ON		= 137, 
-	SI_DOWNKICK_READY		= 138, 
-	SI_TURNKICK_ON		= 139, 
-	SI_TURNKICK_READY		= 140, 
-	SI_COUNTER_ON		= 141, 
-	SI_COUNTER_READY		= 142, 
-	SI_DODGE_ON		= 143, 
-	SI_DODGE_READY		= 144, 
-	SI_STRUP		= 145,
-	SI_PROPERTYDARK		= 146, 
-	SI_ADRENALINE2		= 147, 
-	SI_PROPERTYTELEKINESIS		= 148, 
-	SI_SOULLINK		= 149, 
-	SI_PLUSATTACKPOWER		= 150, 
-	SI_PLUSMAGICPOWER		= 151, 
-	SI_DEVIL1		= 152, 
-	SI_KAITE		= 153,
-//	SI_SWOO = 154,
-//	SI_STAR2 = 155,
-	SI_KAIZEL		= 156,
-	SI_KAAHI		= 157,
-	SI_KAUPE		= 158,
-	SI_SMA_READY			= 159,
-	SI_SKE		= 160,
-	SI_ONEHANDQUICKEN		= 161,
-//	SI_FRIEND = 162,
-//	SI_FRIENDUP = 163,
-//	SI_SG_WARM = 164,
-	SI_SG_SUN_WARM			= 165,
-//	166 | The three show the exact same display: ultra red character (165, 166, 167)
-//	167 | Their names would be SI_SG_SUN_WARM, SI_SG_MOON_WARM, SI_SG_STAR_WARM
-//	SI_EMOTION = 168,
-	SI_SUN_COMFORT		= 169,
-	SI_MOON_COMFORT		= 170,
-	SI_STAR_COMFORT		= 171,
-//	SI_EXPUP = 172,
-//	SI_GDSKILL_BATTLEORDER = 173,
-//	SI_GDSKILL_REGENERATION = 174,
-//	SI_GDSKILL_POSTDELAY = 175,
-//	SI_RESISTHANDICAP = 176,
-//	SI_MAXHPPERCENT = 177,
-//	SI_MAXSPPERCENT = 178,
-//	SI_DEFENCE = 179,
-//	SI_SLOWDOWN = 180,
-	SI_PRESERVE		= 181,
-	SI_INCSTR		= 182,
-//	SI_NOT_EXTREMITYFIST = 183,
-	SI_CLAIRVOYANCE		= 184,
-//	SI_MOVESLOW_POTION = 185,
-	SI_DOUBLECASTING		= 186,
-//	SI_GRAVITATION = 187,
-	SI_OVERTHRUSTMAX	= 188,
-//	SI_LONGING = 189,
-//	SI_HERMODE = 190,
-	SI_TAROTCARD		= 191, // the icon allows no doubt... but what is it really used for ?? [DracoRPG]
-//	SI_HLIF_AVOID = 192,
-//	SI_HFLI_FLEET = 193,
-//	SI_HFLI_SPEED = 194,
-//	SI_HLIF_CHANGE = 195,
-//	SI_HAMI_BLOODLUST = 196,
-	SI_CR_SHRINK		= 197, 
-	SI_WZ_SIGHTBLASTER		= 198, 
-	SI_DC_WINKCHARM		= 199, 
-	SI_RG_CCONFINE_M		= 200, 
-	SI_RG_CCONFINE_S		= 201, 
-//	SI_DISABLEMOVE = 202,
-	SI_GS_MADNESSCANCEL	= 203,	//[blackhole89] 
-	SI_GS_GATLINGFEVER		= 204, 
-	SI_EARTHSCROLL		= 205, 
-	SI_NJ_UTSUSEMI		= 206, 
-	SI_NJ_BUNSINJYUTSU		= 207, 
-	SI_NJ_NEN		= 208, 
-	SI_GS_ADJUSTMENT		= 209, 
-	SI_GS_ACCURACY		= 210, 
-	SI_NJ_SUITON = 211,
-//	SI_PET = 212,
-//	SI_MENTAL = 213,
-//	SI_EXPMEMORY = 214,
-//	SI_PERFORMANCE = 215,
-//	SI_GAIN = 216,
-//	SI_GRIFFON = 217,
-//	SI_DRIFT = 218,
-//	SI_WALLSHIFT = 219,
-//	SI_REINCARNATION = 220,
-//	SI_PATTACK = 221,
-//	SI_PSPEED = 222,
-//	SI_PDEFENSE = 223,
-//	SI_PCRITICAL = 224,
-//	SI_RANKING = 225,
-//	SI_PTRIPLE = 226,
-//	SI_DENERGY = 227,
-//	SI_WAVE1 = 228,
-//	SI_WAVE2 = 229,
-//	SI_WAVE3 = 230,
-//	SI_WAVE4 = 231,
-//	SI_DAURA = 232,
-//	SI_DFREEZER = 233,
-//	SI_DPUNISH = 234,
-//	SI_DBARRIER = 235,
-//	SI_DWARNING = 236,
-//	SI_MOUSEWHEEL = 237,
-//	SI_DGAUGE = 238,
-//	SI_DACCEL = 239,
-//	SI_DBLOCK = 240,
-	SI_FOOD_STR		= 241,
-	SI_FOOD_AGI		= 242,
-	SI_FOOD_VIT		= 243,
-	SI_FOOD_DEX		= 244,
-	SI_FOOD_INT		= 245,
-	SI_FOOD_LUK		= 246,
-	SI_FOOD_BASICAVOIDANCE		= 247, 
-	SI_FOOD_BASICHIT		= 248, 
-	SI_FOOD_CRITICALSUCCESSVALUE		= 249, 
-	SI_CASH_PLUSEXP		= 250, 
-	SI_CASH_DEATHPENALTY		= 251, 
-	SI_CASH_RECEIVEITEM		= 252, 
-	SI_CASH_BOSS_ALARM		= 253, 
-//	SI_DA_ENERGY = 254,
-//	SI_DA_FIRSTSLOT = 255,
-//	SI_DA_HEADDEF = 256,
-//	SI_DA_SPACE = 257,
-//	SI_DA_TRANSFORM = 258,
-//	SI_DA_ITEMREBUILD = 259,
-//	SI_DA_ILLUSION = 260, //All mobs display as Turtle General
-//	SI_DA_DARKPOWER = 261,
-//	SI_DA_EARPLUG = 262,
-//	SI_DA_CONTRACT = 263, //Bio Mob effect on you and SI_TRICKDEAD icon
-//	SI_DA_BLACK = 264, //For short time blurry screen
-//	SI_DA_MAGICCART = 265,
-//	SI_CRYSTAL = 266,
-//	SI_DA_REBUILD = 267,
-//	SI_DA_EDARKNESS = 268,
-//	SI_DA_EGUARDIAN = 269,
-//	SI_DA_TIMEOUT = 270,
-	SI_FOOD_STR_CASH = 271,
-	SI_FOOD_AGI_CASH = 272,
-	SI_FOOD_VIT_CASH = 273,
-	SI_FOOD_DEX_CASH = 274,
-	SI_FOOD_INT_CASH = 275,
-	SI_FOOD_LUK_CASH = 276,
-	SI_MER_FLEE	= 277,
-	SI_MER_ATK	= 278,
-	SI_MER_HP	= 279,
-	SI_MER_SP	= 280,
-	SI_MER_HIT	= 281,
-	SI_SLOWCAST		= 282,
-//	SI_MAGICMIRROR = 283,
-//	SI_STONESKIN = 284,
-//	SI_ANTIMAGIC = 285,
-	SI_CRITICALWOUND	= 286,
-//	SI_NPC_DEFENDER = 287,
-//	SI_NOACTION_WAIT = 288,
-	SI_MOVHASTE_HORSE		= 289, 
-	SI_PROTECT_DEF		= 290, 
-	SI_PROTECT_MDEF		= 291, 
-	SI_HEALPLUS		= 292, 
-	SI_S_LIFEPOTION		= 293, 
-	SI_L_LIFEPOTION		= 294, 
-	SI_CRITICALPERCENT		= 295, 
-	SI_PLUSAVOIDVALUE		= 296, 
-//	SI_ATKER_ASPD = 297,
-//	SI_TARGET_ASPD = 298,
-//	SI_ATKER_MOVESPEED = 299,
-	SI_ATKER_BLOOD = 300,
-	SI_TARGET_BLOOD = 301,
-	SI_ARMOR_PROPERTY = 302,
-//	SI_REUSE_LIMIT_A = 303,
-	SI_HELLPOWER = 304,
-//	SI_STEAMPACK = 305,
-//	SI_REUSE_LIMIT_B = 306,
-//	SI_REUSE_LIMIT_C = 307,
-//	SI_REUSE_LIMIT_D = 308,
-//	SI_REUSE_LIMIT_E = 309,
-//	SI_REUSE_LIMIT_F = 310,
-	SI_INVINCIBLE = 311,
-	SI_CASH_PLUSONLYJOBEXP = 312,
-	SI_PARTYFLEE = 313,
-	SI_ANGEL_PROTECT = 314,
-//	SI_ENDURE_MDEF = 315,
-	SI_ENCHANTBLADE = 316,
-	SI_DEATHBOUND = 317,
-	SI_REFRESH = 318,
-	SI_GIANTGROWTH = 319,
-	SI_STONEHARDSKIN = 320,
-	SI_VITALITYACTIVATION = 321,
-	SI_FIGHTINGSPIRIT = 322,
-	SI_ABUNDANCE = 323,
-	SI_REUSE_MILLENNIUMSHIELD = 324,
-	SI_REUSE_CRUSHSTRIKE = 325,
-	SI_REUSE_REFRESH = 326,
-	SI_REUSE_STORMBLAST = 327,
-	SI_VENOMIMPRESS = 328,
-	SI_EPICLESIS = 329,
-	SI_ORATIO = 330,
-	SI_LAUDAAGNUS = 331,
-	SI_LAUDARAMUS = 332,
-	SI_CLOAKINGEXCEED = 333,
-	SI_HALLUCINATIONWALK = 334,
-	SI_HALLUCINATIONWALK_POSTDELAY = 335,
-	SI_RENOVATIO = 336,
-	SI_WEAPONBLOCKING = 337,
-	SI_WEAPONBLOCKING_POSTDELAY = 338,
-	SI_ROLLINGCUTTER = 339,
-	SI_EXPIATIO = 340,
-	SI_POISONINGWEAPON = 341,
-	SI_TOXIN = 342,
-	SI_PARALYSE = 343,
-	SI_VENOMBLEED = 344,
-	SI_MAGICMUSHROOM = 345,
-	SI_DEATHHURT = 346,
-	SI_PYREXIA = 347,
-	SI_OBLIVIONCURSE = 348,
-	SI_LEECHESEND = 349,
-	SI_DUPLELIGHT = 350,
-	SI_FROSTMISTY = 351,
-	SI_FEARBREEZE = 352,
-	SI_ELECTRICSHOCKER = 353,
-	SI_MARSHOFABYSS = 354,
-	SI_RECOGNIZEDSPELL = 355,
-	SI_STASIS = 356,
-	SI_WUGRIDER = 357,
-	SI_WUGDASH = 358,
-	SI_WUGBITE = 359,
-	SI_CAMOUFLAGE = 360,
-	SI_ACCELERATION = 361,
-	SI_HOVERING = 362,
-	SI_SPHERE_1 = 363,
-	SI_SPHERE_2 = 364,
-	SI_SPHERE_3 = 365,
-	SI_SPHERE_4 = 366,
-	SI_SPHERE_5 = 367,
-	SI_MVPCARD_TAOGUNKA = 368,
-	SI_MVPCARD_MISTRESS = 369,
-	SI_MVPCARD_ORCHERO = 370,
-	SI_MVPCARD_ORCLORD = 371,
-	SI_OVERHEAT_LIMITPOINT = 372,
-	SI_OVERHEAT = 373,
-	SI_SHAPESHIFT = 374,
-	SI_INFRAREDSCAN = 375,
-	SI_MAGNETICFIELD = 376,
-	SI_NEUTRALBARRIER = 377,
-	SI_NEUTRALBARRIER_MASTER = 378,
-	SI_STEALTHFIELD = 379,
-	SI_STEALTHFIELD_MASTER = 380,
-	SI_MANU_ATK = 381, 
-	SI_MANU_DEF = 382, 
-	SI_SPL_ATK = 383, 
-	SI_SPL_DEF = 384, 
-	SI_REPRODUCE = 385,
-	SI_MANU_MATK = 386,
-	SI_SPL_MATK = 387,
-	SI_STR_SCROLL = 388,
-	SI_INT_SCROLL = 389,
-	SI_LG_REFLECTDAMAGE = 390,
-	SI_FORCEOFVANGUARD = 391,
-	SI_BUCHEDENOEL = 392,
-	SI_AUTOSHADOWSPELL = 393,
-	SI_SHADOWFORM = 394,
-	SI_RAID = 395,
-	SI_SHIELDSPELL_DEF = 396,
-	SI_SHIELDSPELL_MDEF = 397,
-	SI_SHIELDSPELL_REF = 398,
-	SI_BODYPAINT = 399,
-	SI_EXEEDBREAK = 400,
-	SI_ADORAMUS = 401,
-	SI_PRESTIGE = 402,
-	SI_INVISIBILITY = 403,
-	SI_DEADLYINFECT = 404,
-	SI_BANDING = 405,
-	SI_EARTHDRIVE = 406,
-	SI_INSPIRATION = 407,
-	SI_ENERVATION = 408,
-	SI_GROOMY = 409,
-	SI_RAISINGDRAGON = 410,
-	SI_IGNORANCE = 411,
-	SI_LAZINESS = 412,
-	SI_LIGHTNINGWALK = 413,
-	SI_ACARAJE = 414,
-	SI_UNLUCKY = 415,
-	SI_CURSEDCIRCLE_ATKER = 416,
-	SI_CURSEDCIRCLE_TARGET = 417,
-	SI_WEAKNESS = 418,
-	SI_CRESCENTELBOW = 419,
-	SI_NOEQUIPACCESSARY = 420,
-	SI_STRIPACCESSARY = 421,
-	SI_MANHOLE = 422,
-	SI_POPECOOKIE = 423,
-	SI_FALLENEMPIRE = 424,
-	SI_GENTLETOUCH_ENERGYGAIN = 425,
-	SI_GENTLETOUCH_CHANGE = 426,
-	SI_GENTLETOUCH_REVITALIZE = 427,
-	SI_BLOODYLUST = 428,
-	SI_SWINGDANCE = 429,
-	SI_SYMPHONYOFLOVERS = 430,
-	SI_PROPERTYWALK = 431,
-	SI_SPELLFIST = 432,
-	SI_NETHERWORLD = 433,
-	SI_SIREN = 434,
-	SI_DEEPSLEEP = 435,
-	SI_SIRCLEOFNATURE = 436,
-	SI_COLD = 437,
-	SI_GLOOMYDAY = 438,
-	SI_SONG_OF_MANA = 439,
-	SI_CLOUDKILL = 440,
-	SI_DANCEWITHWUG = 441,
-	SI_RUSHWINDMILL = 442,
-	SI_ECHOSONG = 443,
-	SI_HARMONIZE = 444,
-	SI_STRIKING = 445,
-	SI_WARMER = 446,
-	SI_MOONLITSERENADE = 447,
-	SI_SATURDAYNIGHTFEVER = 448,
-	SI_SITDOWN_FORCE = 449,
-	SI_ANALYZE = 450,
-	SI_LERADSDEW = 451,
-	SI_MELODYOFSINK = 452,
-	SI_WARCRYOFBEYOND = 453,
-	SI_UNLIMITEDHUMMINGVOICE = 454,
-	SI_SPELLBOOK1 = 455,
-	SI_SPELLBOOK2 = 456,
-	SI_SPELLBOOK3 = 457,
-	SI_FREEZE_SP = 458,
-	SI_GN_TRAINING_SWORD = 459,
-	SI_GN_REMODELING_CART = 460,
-	SI_CARTSBOOST = 461,
-	SI_FIXEDCASTINGTM_REDUCE = 462,
-	SI_THORNTRAP = 463,
-	SI_BLOODSUCKER = 464,
-	SI_SPORE_EXPLOSION = 465,
-	SI_DEMONIC_FIRE = 466,
-	SI_FIRE_EXPANSION_SMOKE_POWDER = 467,
-	SI_FIRE_EXPANSION_TEAR_GAS = 468,
-	SI_BLOCKING_PLAY = 469,
-	SI_MANDRAGORA = 470,
-	SI_ACTIVATE = 471,
-	SI_SECRAMENT = 472,
-	SI_ASSUMPTIO2 = 473,
-	SI_TK_SEVENWIND = 474,
-	SI_LIMIT_ODINS_RECALL = 475,
-	SI_STOMACHACHE = 476,
-	SI_MYSTERIOUS_POWDER = 477,
-	SI_MELON_BOMB = 478,
-	SI_BANANA_BOMB_SITDOWN_POSTDELAY = 479,
-	SI_PROMOTE_HEALTH_RESERCH = 480,
-	SI_ENERGY_DRINK_RESERCH = 481,
-	SI_EXTRACT_WHITE_POTION_Z = 482,
-	SI_VITATA_500 = 483,
-	SI_EXTRACT_SALAMINE_JUICE = 484,
-	SI_BOOST500 = 485,
-	SI_FULL_SWING_K = 486,
-	SI_MANA_PLUS = 487,
-	SI_MUSTLE_M = 488,
-	SI_LIFE_FORCE_F = 489,
-	SI_VACUUM_EXTREME = 490,
-	SI_SAVAGE_STEAK = 491,
-	SI_COCKTAIL_WARG_BLOOD = 492,
-	SI_MINOR_BBQ = 493,
-	SI_SIROMA_ICE_TEA = 494,
-	SI_DROCERA_HERB_STEAMED = 495,
-	SI_PUTTI_TAILS_NOODLES = 496,
-	SI_BANANA_BOMB = 497,
-	SI_SUMMON_AGNI = 498,
-	SI_SPELLBOOK4 = 499,
-	SI_SPELLBOOK5 = 500,
-	SI_SPELLBOOK6 = 501,
-	SI_SPELLBOOK7 = 502,
-	SI_ELEMENTAL_AGGRESSIVE = 503,
-	SI_RETURN_TO_ELDICASTES = 504,
-	SI_BANDING_DEFENCE = 505,
-	SI_SKELSCROLL = 506,
-	SI_DISTRUCTIONSCROLL = 507,
-	SI_ROYALSCROLL = 508,
-	SI_IMMUNITYSCROLL = 509,
-	SI_MYSTICSCROLL = 510,
-	SI_BATTLESCROLL = 511,
-	SI_ARMORSCROLL = 512,
-	SI_FREYJASCROLL = 513,
-	SI_SOULSCROLL = 514,
-	SI_CIRCLE_OF_FIRE = 515,
-	SI_CIRCLE_OF_FIRE_OPTION = 516,
-	SI_FIRE_CLOAK = 517,
-	SI_FIRE_CLOAK_OPTION = 518,
-	SI_WATER_SCREEN = 519,
-	SI_WATER_SCREEN_OPTION = 520,
-	SI_WATER_DROP = 521,
-	SI_WATER_DROP_OPTION = 522,
-	SI_WIND_STEP = 523,
-	SI_WIND_STEP_OPTION = 524,
-	SI_WIND_CURTAIN = 525,
-	SI_WIND_CURTAIN_OPTION = 526,
-	SI_WATER_BARRIER = 527,
-	SI_ZEPHYR = 528,
-	SI_SOLID_SKIN = 529,
-	SI_SOLID_SKIN_OPTION = 530,
-	SI_STONE_SHIELD = 531,
-	SI_STONE_SHIELD_OPTION = 532,
-	SI_POWER_OF_GAIA = 533,
-	//	SI_EL_WAIT = 534,
-	//	SI_EL_PASSIVE = 535,
-	//	SI_EL_DEFENSIVE = 536,
-	//	SI_EL_OFFENSIVE = 537,
-	//	SI_EL_COST = 538,
-	SI_PYROTECHNIC = 539,
-	SI_PYROTECHNIC_OPTION = 540,
-	SI_HEATER = 541,
-	SI_HEATER_OPTION = 542,
-	SI_TROPIC = 543,
-	SI_TROPIC_OPTION = 544,
-	SI_AQUAPLAY = 545,
-	SI_AQUAPLAY_OPTION = 546,
-	SI_COOLER = 547,
-	SI_COOLER_OPTION = 548,
-	SI_CHILLY_AIR = 549,
-	SI_CHILLY_AIR_OPTION = 550,
-	SI_GUST = 551,
-	SI_GUST_OPTION = 552,
-	SI_BLAST = 553,
-	SI_BLAST_OPTION = 554,
-	SI_WILD_STORM = 555,
-	SI_WILD_STORM_OPTION = 556,
-	SI_PETROLOGY = 557,
-	SI_PETROLOGY_OPTION = 558,
-	SI_CURSED_SOIL = 559,
-	SI_CURSED_SOIL_OPTION = 560,
-	SI_UPHEAVAL = 561,
-	SI_UPHEAVAL_OPTION = 562,
-	SI_TIDAL_WEAPON = 563,
-	SI_TIDAL_WEAPON_OPTION = 564,
-	SI_ROCK_CRUSHER = 565,
-	SI_ROCK_CRUSHER_ATK = 566,
-	SI_FIRE_INSIGNIA = 567,
-	SI_WATER_INSIGNIA = 568,
-	SI_WIND_INSIGNIA = 569,
-	SI_EARTH_INSIGNIA = 570,
-	SI_EQUIPED_FLOOR = 571,
-	SI_GUARDIAN_RECALL = 572,
-	SI_MORA_BUFF = 573,
-	SI_REUSE_LIMIT_G = 574,
-	SI_REUSE_LIMIT_H = 575,
-	SI_NEEDLE_OF_PARALYZE = 576,
-	SI_PAIN_KILLER = 577,
-	SI_G_LIFEPOTION = 578,
-	SI_VITALIZE_POTION = 579,
-	SI_LIGHT_OF_REGENE = 580,
-	SI_OVERED_BOOST = 581,
-	SI_SILENT_BREEZE = 582,
-	SI_ODINS_POWER = 583,
-	SI_STYLE_CHANGE = 584,
-	SI_SONIC_CLAW_POSTDELAY = 585,
+	SI_BLANK                                 = -1,
+
+	SI_PROVOKE                               =  0,
+	SI_ENDURE                                =  1,
+	SI_TWOHANDQUICKEN                        =  2,
+	SI_CONCENTRATION                         =  3,
+	SI_HIDING                                =  4,
+	SI_CLOAKING                              =  5,
+	SI_ENCHANTPOISON                         =  6,
+	SI_POISONREACT                           =  7,
+	SI_QUAGMIRE                              =  8,
+	SI_ANGELUS                               =  9,
+	SI_BLESSING                              = 10,
+	SI_CRUCIS                                = 11,
+	SI_INC_AGI                               = 12,
+	SI_DEC_AGI                               = 13,
+	SI_SLOWPOISON                            = 14,
+	SI_IMPOSITIO                             = 15,
+	SI_SUFFRAGIUM                            = 16,
+	SI_ASPERSIO                              = 17,
+	SI_BENEDICTIO                            = 18,
+	SI_KYRIE                                 = 19,
+	SI_MAGNIFICAT                            = 20,
+	SI_GLORIA                                = 21,
+	SI_LEXAETERNA                            = 22,
+	SI_ADRENALINE                            = 23,
+	SI_WEAPONPERFECT                         = 24,
+	SI_OVERTHRUST                            = 25,
+	SI_MAXIMIZE                              = 26,
+	SI_RIDING                                = 27,
+	SI_FALCON                                = 28,
+	SI_TRICKDEAD                             = 29,
+	SI_SHOUT                                 = 30,
+	SI_ENERGYCOAT                            = 31,
+	SI_BROKENARMOR                           = 32,
+	SI_BROKENWEAPON                          = 33,
+	SI_ILLUSION                              = 34,
+	SI_WEIGHTOVER50                          = 35,
+	SI_WEIGHTOVER90                          = 36,
+	SI_ATTHASTE_POTION1                      = 37,
+	SI_ATTHASTE_POTION2                      = 38,
+	SI_ATTHASTE_POTION3                      = 39,
+	SI_ATTHASTE_INFINITY                     = 40,
+	SI_MOVHASTE_POTION                       = 41,
+	SI_MOVHASTE_INFINITY                     = 42,
+	//SI_AUTOCOUNTER                         = 43,
+	//SI_SPLASHER                            = 44,
+	SI_ANKLESNARE                            = 45,
+	SI_POSTDELAY                             = 46,
+	//SI_NOACTION                            = 47,
+	//SI_IMPOSSIBLEPICKUP                    = 48,
+	//SI_BARRIER                             = 49,
+
+	SI_NOEQUIPWEAPON                         = 50,
+	SI_NOEQUIPSHIELD                         = 51,
+	SI_NOEQUIPARMOR                          = 52,
+	SI_NOEQUIPHELM                           = 53,
+	SI_PROTECTWEAPON                         = 54,
+	SI_PROTECTSHIELD                         = 55,
+	SI_PROTECTARMOR                          = 56,
+	SI_PROTECTHELM                           = 57,
+	SI_AUTOGUARD                             = 58,
+	SI_REFLECTSHIELD                         = 59,
+	//SI_DEVOTION                            = 60,
+	SI_PROVIDENCE                            = 61,
+	SI_DEFENDER                              = 62,
+	//SI_MAGICROD                            = 63,
+	//SI_WEAPONPROPERTY                      = 64,
+	SI_AUTOSPELL                             = 65,
+	//SI_SPECIALZONE                         = 66,
+	//SI_MASK                                = 67,
+	SI_SPEARQUICKEN                          = 68,
+	//SI_BDPLAYING                           = 69,
+	//SI_WHISTLE                             = 70,
+	//SI_ASSASSINCROSS                       = 71,
+	//SI_POEMBRAGI                           = 72,
+	//SI_APPLEIDUN                           = 73,
+	//SI_HUMMING                             = 74,
+	//SI_DONTFORGETME                        = 75,
+	//SI_FORTUNEKISS                         = 76,
+	//SI_SERVICEFORYOU                       = 77,
+	//SI_RICHMANKIM                          = 78,
+	//SI_ETERNALCHAOS                        = 79,
+	//SI_DRUMBATTLEFIELD                     = 80,
+	//SI_RINGNIBELUNGEN                      = 81,
+	//SI_ROKISWEIL                           = 82,
+	//SI_INTOABYSS                           = 83,
+	//SI_SIEGFRIED                           = 84,
+	//SI_BLADESTOP                           = 85,
+	SI_EXPLOSIONSPIRITS                      = 86,
+	SI_STEELBODY                             = 87,
+	SI_EXTREMITYFIST                         = 88,
+	//SI_COMBOATTACK                         = 89,
+	SI_PROPERTYFIRE                          = 90,
+	SI_PROPERTYWATER                         = 91,
+	SI_PROPERTYWIND                          = 92,
+	SI_PROPERTYGROUND                        = 93,
+	//SI_MAGICATTACK                         = 94,
+	SI_STOP                                  = 95,
+	//SI_WEAPONBRAKER                        = 96,
+	SI_PROPERTYUNDEAD                        = 97,
+	//SI_POWERUP                             = 98,
+	//SI_AGIUP                               = 99,
+
+	//SI_SIEGEMODE                           = 100,
+	//SI_INVISIBLE                           = 101,
+	//SI_STATUSONE                           = 102,
+	SI_AURABLADE                             = 103,
+	SI_PARRYING                              = 104,
+	SI_LKCONCENTRATION                       = 105,
+	SI_TENSIONRELAX                          = 106,
+	SI_BERSERK                               = 107,
+	//SI_SACRIFICE                           = 108,
+	//SI_GOSPEL                              = 109,
+	SI_ASSUMPTIO                             = 110,
+	//SI_BASILICA                            = 111,
+	SI_GROUNDMAGIC                           = 112,
+	SI_MAGICPOWER                            = 113,
+	SI_EDP                                   = 114,
+	SI_TRUESIGHT                             = 115,
+	SI_WINDWALK                              = 116,
+	SI_MELTDOWN                              = 117,
+	SI_CARTBOOST                             = 118,
+	//SI_CHASEWALK                           = 119,
+	SI_SWORDREJECT                           = 120,
+	SI_MARIONETTE_MASTER                     = 121,
+	SI_MARIONETTE                            = 122,
+	SI_MOON                                  = 123,
+	SI_BLOODING                              = 124,
+	SI_JOINTBEAT                             = 125,
+	//SI_MINDBREAKER                         = 126,
+	//SI_MEMORIZE                            = 127,
+	//SI_FOGWALL                             = 128,
+	//SI_SPIDERWEB                           = 129,
+	SI_PROTECTEXP                            = 130,
+	//SI_SUB_WEAPONPROPERTY                  = 131,
+	SI_AUTOBERSERK                           = 132,
+	SI_RUN                                   = 133,
+	SI_TING                                  = 134,
+	SI_STORMKICK_ON                          = 135,
+	SI_STORMKICK_READY                       = 136,
+	SI_DOWNKICK_ON                           = 137,
+	SI_DOWNKICK_READY                        = 138,
+	SI_TURNKICK_ON                           = 139,
+	SI_TURNKICK_READY                        = 140,
+	SI_COUNTER_ON                            = 141,
+	SI_COUNTER_READY                         = 142,
+	SI_DODGE_ON                              = 143,
+	SI_DODGE_READY                           = 144,
+	SI_STRUP                                 = 145,
+	SI_PROPERTYDARK                          = 146,
+	SI_ADRENALINE2                           = 147,
+	SI_PROPERTYTELEKINESIS                   = 148,
+	SI_SOULLINK                              = 149,
+
+	SI_PLUSATTACKPOWER                       = 150,
+	SI_PLUSMAGICPOWER                        = 151,
+	SI_DEVIL1                                = 152,
+	SI_KAITE                                 = 153,
+	//SI_SWOO                                = 154,
+	//SI_STAR2                               = 155,
+	SI_KAIZEL                                = 156,
+	SI_KAAHI                                 = 157,
+	SI_KAUPE                                 = 158,
+	SI_SMA_READY                             = 159,
+	SI_SKE                                   = 160,
+	SI_ONEHANDQUICKEN                        = 161,
+	//SI_FRIEND                              = 162,
+	//SI_FRIENDUP                            = 163,
+	//SI_SG_WARM                             = 164,
+	SI_SG_SUN_WARM                           = 165,
+	//SI_SG_MOON_WARM                        = 166 | The three show the exact same display: ultra red character (165, 166, 167)
+	//SI_SG_STAR_WARM                        = 167 | Their names would be SI_SG_SUN_WARM, SI_SG_MOON_WARM, SI_SG_STAR_WARM
+	//SI_EMOTION                             = 168,
+	SI_SUN_COMFORT                           = 169,
+	SI_MOON_COMFORT                          = 170,
+	SI_STAR_COMFORT                          = 171,
+	//SI_EXPUP                               = 172,
+	//SI_GDSKILL_BATTLEORDER                 = 173,
+	//SI_GDSKILL_REGENERATION                = 174,
+	//SI_GDSKILL_POSTDELAY                   = 175,
+	//SI_RESISTHANDICAP                      = 176,
+	//SI_MAXHPPERCENT                        = 177,
+	//SI_MAXSPPERCENT                        = 178,
+	//SI_DEFENCE                             = 179,
+	//SI_SLOWDOWN                            = 180,
+	SI_PRESERVE                              = 181,
+	SI_INCSTR                                = 182,
+	//SI_NOT_EXTREMITYFIST                   = 183,
+	SI_CLAIRVOYANCE                          = 184,
+	//SI_MOVESLOW_POTION                     = 185,
+	SI_DOUBLECASTING                         = 186,
+	//SI_GRAVITATION                         = 187,
+	SI_OVERTHRUSTMAX                         = 188,
+	//SI_LONGING                             = 189,
+	//SI_HERMODE                             = 190,
+	SI_TAROTCARD                             = 191, // the icon allows no doubt... but what is it really used for ?? [DracoRPG]
+	//SI_HLIF_AVOID                          = 192,
+	//SI_HFLI_FLEET                          = 193,
+	//SI_HFLI_SPEED                          = 194,
+	//SI_HLIF_CHANGE                         = 195,
+	//SI_HAMI_BLOODLUST                      = 196,
+	SI_CR_SHRINK                             = 197,
+	SI_WZ_SIGHTBLASTER                       = 198,
+	SI_DC_WINKCHARM                          = 199,
+
+	SI_RG_CCONFINE_M                         = 200,
+	SI_RG_CCONFINE_S                         = 201,
+	//SI_DISABLEMOVE                         = 202,
+	SI_GS_MADNESSCANCEL                      = 203, //[blackhole89]
+	SI_GS_GATLINGFEVER                       = 204,
+	SI_EARTHSCROLL                           = 205,
+	SI_NJ_UTSUSEMI                           = 206,
+	SI_NJ_BUNSINJYUTSU                       = 207,
+	SI_NJ_NEN                                = 208,
+	SI_GS_ADJUSTMENT                         = 209,
+	SI_GS_ACCURACY                           = 210,
+	SI_NJ_SUITON                             = 211,
+	//SI_PET                                 = 212,
+	//SI_MENTAL                              = 213,
+	//SI_EXPMEMORY                           = 214,
+	//SI_PERFORMANCE                         = 215,
+	//SI_GAIN                                = 216,
+	//SI_GRIFFON                             = 217,
+	//SI_DRIFT                               = 218,
+	//SI_WALLSHIFT                           = 219,
+	//SI_REINCARNATION                       = 220,
+	//SI_PATTACK                             = 221,
+	//SI_PSPEED                              = 222,
+	//SI_PDEFENSE                            = 223,
+	//SI_PCRITICAL                           = 224,
+	//SI_RANKING                             = 225,
+	//SI_PTRIPLE                             = 226,
+	//SI_DENERGY                             = 227,
+	//SI_WAVE1                               = 228,
+	//SI_WAVE2                               = 229,
+	//SI_WAVE3                               = 230,
+	//SI_WAVE4                               = 231,
+	//SI_DAURA                               = 232,
+	//SI_DFREEZER                            = 233,
+	//SI_DPUNISH                             = 234,
+	//SI_DBARRIER                            = 235,
+	//SI_DWARNING                            = 236,
+	//SI_MOUSEWHEEL                          = 237,
+	//SI_DGAUGE                              = 238,
+	//SI_DACCEL                              = 239,
+	//SI_DBLOCK                              = 240,
+	SI_FOOD_STR                              = 241,
+	SI_FOOD_AGI                              = 242,
+	SI_FOOD_VIT                              = 243,
+	SI_FOOD_DEX                              = 244,
+	SI_FOOD_INT                              = 245,
+	SI_FOOD_LUK                              = 246,
+	SI_FOOD_BASICAVOIDANCE                   = 247,
+	SI_FOOD_BASICHIT                         = 248,
+	SI_FOOD_CRITICALSUCCESSVALUE             = 249,
+
+	SI_CASH_PLUSEXP                          = 250,
+	SI_CASH_DEATHPENALTY                     = 251,
+	SI_CASH_RECEIVEITEM                      = 252,
+	SI_CASH_BOSS_ALARM                       = 253,
+	//SI_DA_ENERGY                           = 254,
+	//SI_DA_FIRSTSLOT                        = 255,
+	//SI_DA_HEADDEF                          = 256,
+	//SI_DA_SPACE                            = 257,
+	//SI_DA_TRANSFORM                        = 258,
+	//SI_DA_ITEMREBUILD                      = 259,
+	//SI_DA_ILLUSION                         = 260, //All mobs display as Turtle General
+	//SI_DA_DARKPOWER                        = 261,
+	//SI_DA_EARPLUG                          = 262,
+	//SI_DA_CONTRACT                         = 263, //Bio Mob effect on you and SI_TRICKDEAD icon
+	//SI_DA_BLACK                            = 264, //For short time blurry screen
+	//SI_DA_MAGICCART                        = 265,
+	//SI_CRYSTAL                             = 266,
+	//SI_DA_REBUILD                          = 267,
+	//SI_DA_EDARKNESS                        = 268,
+	//SI_DA_EGUARDIAN                        = 269,
+	//SI_DA_TIMEOUT                          = 270,
+	SI_FOOD_STR_CASH                         = 271,
+	SI_FOOD_AGI_CASH                         = 272,
+	SI_FOOD_VIT_CASH                         = 273,
+	SI_FOOD_DEX_CASH                         = 274,
+	SI_FOOD_INT_CASH                         = 275,
+	SI_FOOD_LUK_CASH                         = 276,
+	SI_MER_FLEE                              = 277,
+	SI_MER_ATK                               = 278,
+	SI_MER_HP                                = 279,
+	SI_MER_SP                                = 280,
+	SI_MER_HIT                               = 281,
+	SI_SLOWCAST                              = 282,
+	//SI_MAGICMIRROR                         = 283,
+	//SI_STONESKIN                           = 284,
+	//SI_ANTIMAGIC                           = 285,
+	SI_CRITICALWOUND                         = 286,
+	//SI_NPC_DEFENDER                        = 287,
+	//SI_NOACTION_WAIT                       = 288,
+	SI_MOVHASTE_HORSE                        = 289,
+	SI_PROTECT_DEF                           = 290,
+	SI_PROTECT_MDEF                          = 291,
+	SI_HEALPLUS                              = 292,
+	SI_S_LIFEPOTION                          = 293,
+	SI_L_LIFEPOTION                          = 294,
+	SI_CRITICALPERCENT                       = 295,
+	SI_PLUSAVOIDVALUE                        = 296,
+	//SI_ATKER_ASPD                          = 297,
+	//SI_TARGET_ASPD                         = 298,
+	//SI_ATKER_MOVESPEED                     = 299,
+
+	SI_ATKER_BLOOD                           = 300,
+	SI_TARGET_BLOOD                          = 301,
+	SI_ARMOR_PROPERTY                        = 302,
+	//SI_REUSE_LIMIT_A                       = 303,
+	SI_HELLPOWER                             = 304,
+	//SI_STEAMPACK                           = 305,
+	//SI_REUSE_LIMIT_B                       = 306,
+	//SI_REUSE_LIMIT_C                       = 307,
+	//SI_REUSE_LIMIT_D                       = 308,
+	//SI_REUSE_LIMIT_E                       = 309,
+	//SI_REUSE_LIMIT_F                       = 310,
+	SI_INVINCIBLE                            = 311,
+	SI_CASH_PLUSONLYJOBEXP                   = 312,
+	SI_PARTYFLEE                             = 313,
+	SI_ANGEL_PROTECT                         = 314,
+	//SI_ENDURE_MDEF                         = 315,
+	SI_ENCHANTBLADE                          = 316,
+	SI_DEATHBOUND                            = 317,
+	SI_REFRESH                               = 318,
+	SI_GIANTGROWTH                           = 319,
+	SI_STONEHARDSKIN                         = 320,
+	SI_VITALITYACTIVATION                    = 321,
+	SI_FIGHTINGSPIRIT                        = 322,
+	SI_ABUNDANCE                             = 323,
+	SI_REUSE_MILLENNIUMSHIELD                = 324,
+	SI_REUSE_CRUSHSTRIKE                     = 325,
+	SI_REUSE_REFRESH                         = 326,
+	SI_REUSE_STORMBLAST                      = 327,
+	SI_VENOMIMPRESS                          = 328,
+	SI_EPICLESIS                             = 329,
+	SI_ORATIO                                = 330,
+	SI_LAUDAAGNUS                            = 331,
+	SI_LAUDARAMUS                            = 332,
+	SI_CLOAKINGEXCEED                        = 333,
+	SI_HALLUCINATIONWALK                     = 334,
+	SI_HALLUCINATIONWALK_POSTDELAY           = 335,
+	SI_RENOVATIO                             = 336,
+	SI_WEAPONBLOCKING                        = 337,
+	SI_WEAPONBLOCKING_POSTDELAY              = 338,
+	SI_ROLLINGCUTTER                         = 339,
+	SI_EXPIATIO                              = 340,
+	SI_POISONINGWEAPON                       = 341,
+	SI_TOXIN                                 = 342,
+	SI_PARALYSE                              = 343,
+	SI_VENOMBLEED                            = 344,
+	SI_MAGICMUSHROOM                         = 345,
+	SI_DEATHHURT                             = 346,
+	SI_PYREXIA                               = 347,
+	SI_OBLIVIONCURSE                         = 348,
+	SI_LEECHESEND                            = 349,
+
+	SI_DUPLELIGHT                            = 350,
+	SI_FROSTMISTY                            = 351,
+	SI_FEARBREEZE                            = 352,
+	SI_ELECTRICSHOCKER                       = 353,
+	SI_MARSHOFABYSS                          = 354,
+	SI_RECOGNIZEDSPELL                       = 355,
+	SI_STASIS                                = 356,
+	SI_WUGRIDER                              = 357,
+	SI_WUGDASH                               = 358,
+	SI_WUGBITE                               = 359,
+	SI_CAMOUFLAGE                            = 360,
+	SI_ACCELERATION                          = 361,
+	SI_HOVERING                              = 362,
+	SI_SPHERE_1                              = 363,
+	SI_SPHERE_2                              = 364,
+	SI_SPHERE_3                              = 365,
+	SI_SPHERE_4                              = 366,
+	SI_SPHERE_5                              = 367,
+	SI_MVPCARD_TAOGUNKA                      = 368,
+	SI_MVPCARD_MISTRESS                      = 369,
+	SI_MVPCARD_ORCHERO                       = 370,
+	SI_MVPCARD_ORCLORD                       = 371,
+	SI_OVERHEAT_LIMITPOINT                   = 372,
+	SI_OVERHEAT                              = 373,
+	SI_SHAPESHIFT                            = 374,
+	SI_INFRAREDSCAN                          = 375,
+	SI_MAGNETICFIELD                         = 376,
+	SI_NEUTRALBARRIER                        = 377,
+	SI_NEUTRALBARRIER_MASTER                 = 378,
+	SI_STEALTHFIELD                          = 379,
+	SI_STEALTHFIELD_MASTER                   = 380,
+	SI_MANU_ATK                              = 381,
+	SI_MANU_DEF                              = 382,
+	SI_SPL_ATK                               = 383,
+	SI_SPL_DEF                               = 384,
+	SI_REPRODUCE                             = 385,
+	SI_MANU_MATK                             = 386,
+	SI_SPL_MATK                              = 387,
+	SI_STR_SCROLL                            = 388,
+	SI_INT_SCROLL                            = 389,
+	SI_LG_REFLECTDAMAGE                      = 390,
+	SI_FORCEOFVANGUARD                       = 391,
+	SI_BUCHEDENOEL                           = 392,
+	SI_AUTOSHADOWSPELL                       = 393,
+	SI_SHADOWFORM                            = 394,
+	SI_RAID                                  = 395,
+	SI_SHIELDSPELL_DEF                       = 396,
+	SI_SHIELDSPELL_MDEF                      = 397,
+	SI_SHIELDSPELL_REF                       = 398,
+	SI_BODYPAINT                             = 399,
+
+	SI_EXEEDBREAK                            = 400,
+	SI_ADORAMUS                              = 401,
+	SI_PRESTIGE                              = 402,
+	SI_INVISIBILITY                          = 403,
+	SI_DEADLYINFECT                          = 404,
+	SI_BANDING                               = 405,
+	SI_EARTHDRIVE                            = 406,
+	SI_INSPIRATION                           = 407,
+	SI_ENERVATION                            = 408,
+	SI_GROOMY                                = 409,
+	SI_RAISINGDRAGON                         = 410,
+	SI_IGNORANCE                             = 411,
+	SI_LAZINESS                              = 412,
+	SI_LIGHTNINGWALK                         = 413,
+	SI_ACARAJE                               = 414,
+	SI_UNLUCKY                               = 415,
+	SI_CURSEDCIRCLE_ATKER                    = 416,
+	SI_CURSEDCIRCLE_TARGET                   = 417,
+	SI_WEAKNESS                              = 418,
+	SI_CRESCENTELBOW                         = 419,
+	SI_NOEQUIPACCESSARY                      = 420,
+	SI_STRIPACCESSARY                        = 421,
+	SI_MANHOLE                               = 422,
+	SI_POPECOOKIE                            = 423,
+	SI_FALLENEMPIRE                          = 424,
+	SI_GENTLETOUCH_ENERGYGAIN                = 425,
+	SI_GENTLETOUCH_CHANGE                    = 426,
+	SI_GENTLETOUCH_REVITALIZE                = 427,
+	SI_BLOODYLUST                            = 428,
+	SI_SWINGDANCE                            = 429,
+	SI_SYMPHONYOFLOVERS                      = 430,
+	SI_PROPERTYWALK                          = 431,
+	SI_SPELLFIST                             = 432,
+	SI_NETHERWORLD                           = 433,
+	SI_SIREN                                 = 434,
+	SI_DEEPSLEEP                             = 435,
+	SI_SIRCLEOFNATURE                        = 436,
+	SI_COLD                                  = 437,
+	SI_GLOOMYDAY                             = 438,
+	SI_SONG_OF_MANA                          = 439,
+	SI_CLOUDKILL                             = 440,
+	SI_DANCEWITHWUG                          = 441,
+	SI_RUSHWINDMILL                          = 442,
+	SI_ECHOSONG                              = 443,
+	SI_HARMONIZE                             = 444,
+	SI_STRIKING                              = 445,
+	SI_WARMER                                = 446,
+	SI_MOONLITSERENADE                       = 447,
+	SI_SATURDAYNIGHTFEVER                    = 448,
+	SI_SITDOWN_FORCE                         = 449,
+
+	SI_ANALYZE                               = 450,
+	SI_LERADSDEW                             = 451,
+	SI_MELODYOFSINK                          = 452,
+	SI_WARCRYOFBEYOND                        = 453,
+	SI_UNLIMITEDHUMMINGVOICE                 = 454,
+	SI_SPELLBOOK1                            = 455,
+	SI_SPELLBOOK2                            = 456,
+	SI_SPELLBOOK3                            = 457,
+	SI_FREEZE_SP                             = 458,
+	SI_GN_TRAINING_SWORD                     = 459,
+	SI_GN_REMODELING_CART                    = 460,
+	SI_CARTSBOOST                            = 461,
+	SI_FIXEDCASTINGTM_REDUCE                 = 462,
+	SI_THORNTRAP                             = 463,
+	SI_BLOODSUCKER                           = 464,
+	SI_SPORE_EXPLOSION                       = 465,
+	SI_DEMONIC_FIRE                          = 466,
+	SI_FIRE_EXPANSION_SMOKE_POWDER           = 467,
+	SI_FIRE_EXPANSION_TEAR_GAS               = 468,
+	SI_BLOCKING_PLAY                         = 469,
+	SI_MANDRAGORA                            = 470,
+	SI_ACTIVATE                              = 471,
+	SI_SECRAMENT                             = 472,
+	SI_ASSUMPTIO2                            = 473,
+	SI_TK_SEVENWIND                          = 474,
+	SI_LIMIT_ODINS_RECALL                    = 475,
+	SI_STOMACHACHE                           = 476,
+	SI_MYSTERIOUS_POWDER                     = 477,
+	SI_MELON_BOMB                            = 478,
+	SI_BANANA_BOMB_SITDOWN_POSTDELAY         = 479,
+	SI_PROMOTE_HEALTH_RESERCH                = 480,
+	SI_ENERGY_DRINK_RESERCH                  = 481,
+	SI_EXTRACT_WHITE_POTION_Z                = 482,
+	SI_VITATA_500                            = 483,
+	SI_EXTRACT_SALAMINE_JUICE                = 484,
+	SI_BOOST500                              = 485,
+	SI_FULL_SWING_K                          = 486,
+	SI_MANA_PLUS                             = 487,
+	SI_MUSTLE_M                              = 488,
+	SI_LIFE_FORCE_F                          = 489,
+	SI_VACUUM_EXTREME                        = 490,
+	SI_SAVAGE_STEAK                          = 491,
+	SI_COCKTAIL_WARG_BLOOD                   = 492,
+	SI_MINOR_BBQ                             = 493,
+	SI_SIROMA_ICE_TEA                        = 494,
+	SI_DROCERA_HERB_STEAMED                  = 495,
+	SI_PUTTI_TAILS_NOODLES                   = 496,
+	SI_BANANA_BOMB                           = 497,
+	SI_SUMMON_AGNI                           = 498,
+	SI_SPELLBOOK4                            = 499,
+
+	SI_SPELLBOOK5                            = 500,
+	SI_SPELLBOOK6                            = 501,
+	SI_SPELLBOOK7                            = 502,
+	SI_ELEMENTAL_AGGRESSIVE                  = 503,
+	SI_RETURN_TO_ELDICASTES                  = 504,
+	SI_BANDING_DEFENCE                       = 505,
+	SI_SKELSCROLL                            = 506,
+	SI_DISTRUCTIONSCROLL                     = 507,
+	SI_ROYALSCROLL                           = 508,
+	SI_IMMUNITYSCROLL                        = 509,
+	SI_MYSTICSCROLL                          = 510,
+	SI_BATTLESCROLL                          = 511,
+	SI_ARMORSCROLL                           = 512,
+	SI_FREYJASCROLL                          = 513,
+	SI_SOULSCROLL                            = 514,
+	SI_CIRCLE_OF_FIRE                        = 515,
+	SI_CIRCLE_OF_FIRE_OPTION                 = 516,
+	SI_FIRE_CLOAK                            = 517,
+	SI_FIRE_CLOAK_OPTION                     = 518,
+	SI_WATER_SCREEN                          = 519,
+	SI_WATER_SCREEN_OPTION                   = 520,
+	SI_WATER_DROP                            = 521,
+	SI_WATER_DROP_OPTION                     = 522,
+	SI_WIND_STEP                             = 523,
+	SI_WIND_STEP_OPTION                      = 524,
+	SI_WIND_CURTAIN                          = 525,
+	SI_WIND_CURTAIN_OPTION                   = 526,
+	SI_WATER_BARRIER                         = 527,
+	SI_ZEPHYR                                = 528,
+	SI_SOLID_SKIN                            = 529,
+	SI_SOLID_SKIN_OPTION                     = 530,
+	SI_STONE_SHIELD                          = 531,
+	SI_STONE_SHIELD_OPTION                   = 532,
+	SI_POWER_OF_GAIA                         = 533,
+	//SI_EL_WAIT                             = 534,
+	//SI_EL_PASSIVE                          = 535,
+	//SI_EL_DEFENSIVE                        = 536,
+	//SI_EL_OFFENSIVE                        = 537,
+	//SI_EL_COST                             = 538,
+	SI_PYROTECHNIC                           = 539,
+	SI_PYROTECHNIC_OPTION                    = 540,
+	SI_HEATER                                = 541,
+	SI_HEATER_OPTION                         = 542,
+	SI_TROPIC                                = 543,
+	SI_TROPIC_OPTION                         = 544,
+	SI_AQUAPLAY                              = 545,
+	SI_AQUAPLAY_OPTION                       = 546,
+	SI_COOLER                                = 547,
+	SI_COOLER_OPTION                         = 548,
+	SI_CHILLY_AIR                            = 549,
+
+	SI_CHILLY_AIR_OPTION                     = 550,
+	SI_GUST                                  = 551,
+	SI_GUST_OPTION                           = 552,
+	SI_BLAST                                 = 553,
+	SI_BLAST_OPTION                          = 554,
+	SI_WILD_STORM                            = 555,
+	SI_WILD_STORM_OPTION                     = 556,
+	SI_PETROLOGY                             = 557,
+	SI_PETROLOGY_OPTION                      = 558,
+	SI_CURSED_SOIL                           = 559,
+	SI_CURSED_SOIL_OPTION                    = 560,
+	SI_UPHEAVAL                              = 561,
+	SI_UPHEAVAL_OPTION                       = 562,
+	SI_TIDAL_WEAPON                          = 563,
+	SI_TIDAL_WEAPON_OPTION                   = 564,
+	SI_ROCK_CRUSHER                          = 565,
+	SI_ROCK_CRUSHER_ATK                      = 566,
+	SI_FIRE_INSIGNIA                         = 567,
+	SI_WATER_INSIGNIA                        = 568,
+	SI_WIND_INSIGNIA                         = 569,
+	SI_EARTH_INSIGNIA                        = 570,
+	SI_EQUIPED_FLOOR                         = 571,
+	SI_GUARDIAN_RECALL                       = 572,
+	SI_MORA_BUFF                             = 573,
+	SI_REUSE_LIMIT_G                         = 574,
+	SI_REUSE_LIMIT_H                         = 575,
+	SI_NEEDLE_OF_PARALYZE                    = 576,
+	SI_PAIN_KILLER                           = 577,
+	SI_G_LIFEPOTION                          = 578,
+	SI_VITALIZE_POTION                       = 579,
+	SI_LIGHT_OF_REGENE                       = 580,
+	SI_OVERED_BOOST                          = 581,
+	SI_SILENT_BREEZE                         = 582,
+	SI_ODINS_POWER                           = 583,
+	SI_STYLE_CHANGE                          = 584,
+	SI_SONIC_CLAW_POSTDELAY                  = 585,
 	// ID's 586 - 595 Currently Unused
-	SI_SILVERVEIN_RUSH_POSTDELAY = 596,
-	SI_MIDNIGHT_FRENZY_POSTDELAY = 597,
-	SI_GOLDENE_FERSE = 598,
-	SI_ANGRIFFS_MODUS = 599,
-	SI_TINDER_BREAKER = 600,
-	SI_TINDER_BREAKER_POSTDELAY = 601,
-	SI_CBC = 602,
-	SI_CBC_POSTDELAY = 603,
-	SI_EQC = 604,
-	SI_MAGMA_FLOW = 605,
-	SI_GRANITIC_ARMOR = 606,
-	SI_PYROCLASTIC = 607,
-	SI_VOLCANIC_ASH = 608,
-	SI_SPIRITS_SAVEINFO1 = 609,
-	SI_SPIRITS_SAVEINFO2 = 610,
-	SI_MAGIC_CANDY = 611,
-	SI_SEARCH_STORE_INFO = 612,
-	SI_ALL_RIDING = 613,
-	SI_ALL_RIDING_REUSE_LIMIT = 614,
-	SI_MACRO = 615,
-	SI_MACRO_POSTDELAY = 616,
-	SI_BEER_BOTTLE_CAP = 617,
-	SI_OVERLAPEXPUP = 618,
-	SI_PC_IZ_DUN05 = 619,
-	SI_CRUSHSTRIKE = 620,
-	SI_MONSTER_TRANSFORM = 621,
-	SI_SIT = 622,
-	SI_ONAIR = 623,
-	SI_MTF_ASPD = 624,
-	SI_MTF_RANGEATK = 625,
-	SI_MTF_MATK = 626,
-	SI_MTF_MLEATKED = 627,
-	SI_MTF_CRIDAMAGE = 628,
-	SI_REUSE_LIMIT_MTF = 629,
-	SI_MACRO_PERMIT = 630,
-	SI_MACRO_PLAY = 631,
-	SI_SKF_CAST = 632,
-	SI_SKF_ASPD = 633,
-	SI_SKF_ATK = 634,
-	SI_SKF_MATK = 635,
-	SI_REWARD_PLUSONLYJOBEXP = 636,
-	SI_HANDICAPSTATE_NORECOVER = 637,
-	SI_SET_NUM_DEF = 638,
-	SI_SET_NUM_MDEF = 639,
-	SI_SET_PER_DEF = 640,
-	SI_SET_PER_MDEF = 641,
-	SI_PARTYBOOKING_SEARCH_DEALY = 642,
-	SI_PARTYBOOKING_REGISTER_DEALY = 643,
-	SI_PERIOD_TIME_CHECK_DETECT_SKILL = 644,
-	SI_KO_JYUMONJIKIRI = 645,
-	SI_MEIKYOUSISUI = 646,
-	SI_ATTHASTE_CASH = 647,
-	SI_EQUIPPED_DIVINE_ARMOR = 648,
-	SI_EQUIPPED_HOLY_ARMOR = 649,
-	SI_2011RWC = 650,
-	SI_KYOUGAKU = 651,
-	SI_IZAYOI = 652,
-	SI_ZENKAI = 653,
-	SI_KG_KAGEHUMI = 654,
-	SI_KYOMU = 655,
-	SI_KAGEMUSYA = 656,
-	SI_ZANGETSU = 657,
-	SI_PHI_DEMON = 658,
-	SI_GENSOU = 659,
-	SI_AKAITSUKI = 660,
-	SI_TETANY = 661,
-	SI_GM_BATTLE = 662,
-	SI_GM_BATTLE2 = 663,
-	SI_2011RWC_SCROLL = 664,
-	SI_ACTIVE_MONSTER_TRANSFORM = 665,
-	SI_MYSTICPOWDER = 666,
-	SI_ECLAGE_RECALL = 667,
-	SI_ENTRY_QUEUE_APPLY_DELAY = 668,
-	SI_REUSE_LIMIT_ECL = 669,
-	SI_M_LIFEPOTION = 670,
+	SI_SILVERVEIN_RUSH_POSTDELAY             = 596,
+	SI_MIDNIGHT_FRENZY_POSTDELAY             = 597,
+	SI_GOLDENE_FERSE                         = 598,
+	SI_ANGRIFFS_MODUS                        = 599,
+
+	SI_TINDER_BREAKER                        = 600,
+	SI_TINDER_BREAKER_POSTDELAY              = 601,
+	SI_CBC                                   = 602,
+	SI_CBC_POSTDELAY                         = 603,
+	SI_EQC                                   = 604,
+	SI_MAGMA_FLOW                            = 605,
+	SI_GRANITIC_ARMOR                        = 606,
+	SI_PYROCLASTIC                           = 607,
+	SI_VOLCANIC_ASH                          = 608,
+	SI_SPIRITS_SAVEINFO1                     = 609,
+	SI_SPIRITS_SAVEINFO2                     = 610,
+	SI_MAGIC_CANDY                           = 611,
+	SI_SEARCH_STORE_INFO                     = 612,
+	SI_ALL_RIDING                            = 613,
+	SI_ALL_RIDING_REUSE_LIMIT                = 614,
+	SI_MACRO                                 = 615,
+	SI_MACRO_POSTDELAY                       = 616,
+	SI_BEER_BOTTLE_CAP                       = 617,
+	SI_OVERLAPEXPUP                          = 618,
+	SI_PC_IZ_DUN05                           = 619,
+	SI_CRUSHSTRIKE                           = 620,
+	SI_MONSTER_TRANSFORM                     = 621,
+	SI_SIT                                   = 622,
+	SI_ONAIR                                 = 623,
+	SI_MTF_ASPD                              = 624,
+	SI_MTF_RANGEATK                          = 625,
+	SI_MTF_MATK                              = 626,
+	SI_MTF_MLEATKED                          = 627,
+	SI_MTF_CRIDAMAGE                         = 628,
+	SI_REUSE_LIMIT_MTF                       = 629,
+	SI_MACRO_PERMIT                          = 630,
+	SI_MACRO_PLAY                            = 631,
+	SI_SKF_CAST                              = 632,
+	SI_SKF_ASPD                              = 633,
+	SI_SKF_ATK                               = 634,
+	SI_SKF_MATK                              = 635,
+	SI_REWARD_PLUSONLYJOBEXP                 = 636,
+	SI_HANDICAPSTATE_NORECOVER               = 637,
+	SI_SET_NUM_DEF                           = 638,
+	SI_SET_NUM_MDEF                          = 639,
+	SI_SET_PER_DEF                           = 640,
+	SI_SET_PER_MDEF                          = 641,
+	SI_PARTYBOOKING_SEARCH_DEALY             = 642,
+	SI_PARTYBOOKING_REGISTER_DEALY           = 643,
+	SI_PERIOD_TIME_CHECK_DETECT_SKILL        = 644,
+	SI_KO_JYUMONJIKIRI                       = 645,
+	SI_MEIKYOUSISUI                          = 646,
+	SI_ATTHASTE_CASH                         = 647,
+	SI_EQUIPPED_DIVINE_ARMOR                 = 648,
+	SI_EQUIPPED_HOLY_ARMOR                   = 649,
+
+	SI_2011RWC                               = 650,
+	SI_KYOUGAKU                              = 651,
+	SI_IZAYOI                                = 652,
+	SI_ZENKAI                                = 653,
+	SI_KG_KAGEHUMI                           = 654,
+	SI_KYOMU                                 = 655,
+	SI_KAGEMUSYA                             = 656,
+	SI_ZANGETSU                              = 657,
+	SI_PHI_DEMON                             = 658,
+	SI_GENSOU                                = 659,
+	SI_AKAITSUKI                             = 660,
+	SI_TETANY                                = 661,
+	SI_GM_BATTLE                             = 662,
+	SI_GM_BATTLE2                            = 663,
+	SI_2011RWC_SCROLL                        = 664,
+	SI_ACTIVE_MONSTER_TRANSFORM              = 665,
+	SI_MYSTICPOWDER                          = 666,
+	SI_ECLAGE_RECALL                         = 667,
+	SI_ENTRY_QUEUE_APPLY_DELAY               = 668,
+	SI_REUSE_LIMIT_ECL                       = 669,
+	SI_M_LIFEPOTION                          = 670,
 	SI_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT = 671,
-	SI_UNKNOWN_NAME = 672,
-	SI_ON_PUSH_CART = 673,
-	SI_HAT_EFFECT = 674,
-	SI_FLOWER_LEAF = 675,
-	SI_RAY_OF_PROTECTION = 676,
-	SI_GLASTHEIM_ATK = 677,
-	SI_GLASTHEIM_DEF = 678,
-	SI_GLASTHEIM_HEAL = 679,
-	SI_GLASTHEIM_HIDDEN = 680,
-	SI_GLASTHEIM_STATE = 681,
-	SI_GLASTHEIM_ITEMDEF = 682,
-	SI_GLASTHEIM_HPSP = 683,
-	SI_HOMUN_SKILL_POSTDELAY = 684,
-	SI_ALMIGHTY = 685,
-	SI_GVG_GIANT = 686,
-	SI_GVG_GOLEM = 687,
-	SI_GVG_STUN = 688,
-	SI_GVG_STONE = 689,
-	SI_GVG_FREEZ = 690,
-	SI_GVG_SLEEP = 691,
-	SI_GVG_CURSE = 692,
-	SI_GVG_SILENCE = 693,
-	SI_GVG_BLIND = 694,
-	SI_CLIENT_ONLY_EQUIP_ARROW = 695,
-	SI_CLAN_INFO = 696,
-	SI_JP_EVENT01 = 697,
-	SI_JP_EVENT02 = 698,
-	SI_JP_EVENT03 = 699,
-	SI_JP_EVENT04 = 700,
-	SI_TELEPORT_FIXEDCASTINGDELAY = 701,
-	SI_GEFFEN_MAGIC1 = 702,
-	SI_GEFFEN_MAGIC2 = 703,
-	SI_GEFFEN_MAGIC3 = 704,
-	SI_QUEST_BUFF1 = 705,
-	SI_QUEST_BUFF2 = 706,
-	SI_QUEST_BUFF3 = 707,
-	SI_REUSE_LIMIT_RECALL = 708,
-	SI_SAVEPOSITION = 709,
-	SI_HANDICAPSTATE_ICEEXPLO = 710,
-	SI_FENRIR_CARD = 711,
-	SI_REUSE_LIMIT_ASPD_POTION = 712,
-	SI_MAXPAIN = 713,
-	SI_PC_STOP = 714,
-	SI_FRIGG_SONG = 715,
-	SI_OFFERTORIUM = 716,
-	SI_TELEKINESIS_INTENSE = 717,
-	SI_MOONSTAR = 718,
-	SI_STRANGELIGHTS = 719,
-	SI_FULL_THROTTLE = 720,
-	SI_REBOUND = 721,
-	SI_UNLIMIT = 722,
-	SI_KINGS_GRACE = 723,
-	SI_ITEM_ATKMAX = 724,
-	SI_ITEM_ATKMIN = 725,
-	SI_ITEM_MATKMAX = 726,
-	SI_ITEM_MATKMIN = 727,
-	SI_SUPER_STAR = 728,
-	SI_HIGH_RANKER = 729,
-	SI_DARKCROW = 730,
-	SI_2013_VALENTINE1 = 731,
-	SI_2013_VALENTINE2 = 732,
-	SI_2013_VALENTINE3 = 733,
-	SI_ILLUSIONDOPING = 734,
-	//SI_ = 735,
-	SI_CHILL = 736,
-    SI_BURNT = 737,
-	SI_FLASHCOMBO = 740,
-	SI_B_TRAP = 752,
-	SI_E_CHAIN = 753,
-	SI_E_QD_SHOT_READY = 754,
-	SI_C_MARKER = 755,
-	SI_H_MINE = 756,
-	SI_H_MINE_SPLASH = 757,
-	SI_P_ALTER = 758,
-	SI_HEAT_BARREL = 759,
-	SI_ANTI_M_BLAST = 760,
-	SI_SLUGSHOT = 761,
-	SI_SWORDCLAN = 762,
-	SI_ARCWANDCLAN = 763,
-	SI_GOLDENMACECLAN = 764,
-	SI_CROSSBOWCLAN = 765,
-	SI_PACKING_ENVELOPE1 = 766,
-	SI_PACKING_ENVELOPE2 = 767,
-	SI_PACKING_ENVELOPE3 = 768,
-	SI_PACKING_ENVELOPE4 = 769,
-	SI_PACKING_ENVELOPE5 = 770,
-	SI_PACKING_ENVELOPE6 = 771,
-	SI_PACKING_ENVELOPE7 = 772,
-	SI_PACKING_ENVELOPE8 = 773,
-	SI_PACKING_ENVELOPE9 = 774,
-	SI_PACKING_ENVELOPE10 = 775,
-	SI_GLASTHEIM_TRANS = 776,
-	SI_HEAT_BARREL_AFTER = 778,
-	SI_DECORATION_OF_MUSIC = 779,
+	SI_UNKNOWN_NAME                          = 672,
+	SI_ON_PUSH_CART                          = 673,
+	SI_HAT_EFFECT                            = 674,
+	SI_FLOWER_LEAF                           = 675,
+	SI_RAY_OF_PROTECTION                     = 676,
+	SI_GLASTHEIM_ATK                         = 677,
+	SI_GLASTHEIM_DEF                         = 678,
+	SI_GLASTHEIM_HEAL                        = 679,
+	SI_GLASTHEIM_HIDDEN                      = 680,
+	SI_GLASTHEIM_STATE                       = 681,
+	SI_GLASTHEIM_ITEMDEF                     = 682,
+	SI_GLASTHEIM_HPSP                        = 683,
+	SI_HOMUN_SKILL_POSTDELAY                 = 684,
+	SI_ALMIGHTY                              = 685,
+	SI_GVG_GIANT                             = 686,
+	SI_GVG_GOLEM                             = 687,
+	SI_GVG_STUN                              = 688,
+	SI_GVG_STONE                             = 689,
+	SI_GVG_FREEZ                             = 690,
+	SI_GVG_SLEEP                             = 691,
+	SI_GVG_CURSE                             = 692,
+	SI_GVG_SILENCE                           = 693,
+	SI_GVG_BLIND                             = 694,
+	SI_CLIENT_ONLY_EQUIP_ARROW               = 695,
+	SI_CLAN_INFO                             = 696,
+	SI_JP_EVENT01                            = 697,
+	SI_JP_EVENT02                            = 698,
+	SI_JP_EVENT03                            = 699,
+
+	SI_JP_EVENT04                            = 700,
+	SI_TELEPORT_FIXEDCASTINGDELAY            = 701,
+	SI_GEFFEN_MAGIC1                         = 702,
+	SI_GEFFEN_MAGIC2                         = 703,
+	SI_GEFFEN_MAGIC3                         = 704,
+	SI_QUEST_BUFF1                           = 705,
+	SI_QUEST_BUFF2                           = 706,
+	SI_QUEST_BUFF3                           = 707,
+	SI_REUSE_LIMIT_RECALL                    = 708,
+	SI_SAVEPOSITION                          = 709,
+	SI_HANDICAPSTATE_ICEEXPLO                = 710,
+	SI_FENRIR_CARD                           = 711,
+	SI_REUSE_LIMIT_ASPD_POTION               = 712,
+	SI_MAXPAIN                               = 713,
+	SI_PC_STOP                               = 714,
+	SI_FRIGG_SONG                            = 715,
+	SI_OFFERTORIUM                           = 716,
+	SI_TELEKINESIS_INTENSE                   = 717,
+	SI_MOONSTAR                              = 718,
+	SI_STRANGELIGHTS                         = 719,
+	SI_FULL_THROTTLE                         = 720,
+	SI_REBOUND                               = 721,
+	SI_UNLIMIT                               = 722,
+	SI_KINGS_GRACE                           = 723,
+	SI_ITEM_ATKMAX                           = 724,
+	SI_ITEM_ATKMIN                           = 725,
+	SI_ITEM_MATKMAX                          = 726,
+	SI_ITEM_MATKMIN                          = 727,
+	SI_SUPER_STAR                            = 728,
+	SI_HIGH_RANKER                           = 729,
+	SI_DARKCROW                              = 730,
+	SI_2013_VALENTINE1                       = 731,
+	SI_2013_VALENTINE2                       = 732,
+	SI_2013_VALENTINE3                       = 733,
+	SI_ILLUSIONDOPING                        = 734,
+	//SI_                                    = 735,
+	SI_CHILL                                 = 736,
+	SI_BURNT                                 = 737,
+	//...
+	SI_FLASHCOMBO                            = 740,
+
+	//...
+	SI_B_TRAP                                = 752,
+	SI_E_CHAIN                               = 753,
+	SI_E_QD_SHOT_READY                       = 754,
+	SI_C_MARKER                              = 755,
+	SI_H_MINE                                = 756,
+	SI_H_MINE_SPLASH                         = 757,
+	SI_P_ALTER                               = 758,
+	SI_HEAT_BARREL                           = 759,
+	SI_ANTI_M_BLAST                          = 760,
+	SI_SLUGSHOT                              = 761,
+	SI_SWORDCLAN                             = 762,
+	SI_ARCWANDCLAN                           = 763,
+	SI_GOLDENMACECLAN                        = 764,
+	SI_CROSSBOWCLAN                          = 765,
+	SI_PACKING_ENVELOPE1                     = 766,
+	SI_PACKING_ENVELOPE2                     = 767,
+	SI_PACKING_ENVELOPE3                     = 768,
+	SI_PACKING_ENVELOPE4                     = 769,
+	SI_PACKING_ENVELOPE5                     = 770,
+	SI_PACKING_ENVELOPE6                     = 771,
+	SI_PACKING_ENVELOPE7                     = 772,
+	SI_PACKING_ENVELOPE8                     = 773,
+	SI_PACKING_ENVELOPE9                     = 774,
+	SI_PACKING_ENVELOPE10                    = 775,
+	SI_GLASTHEIM_TRANS                       = 776,
+	//...
+	SI_HEAT_BARREL_AFTER                     = 778,
+	SI_DECORATION_OF_MUSIC                   = 779,
+
 	SI_MAX,
 };
 // JOINTBEAT stackable ailments
@@ -1698,7 +1719,7 @@ struct status_data {
 		speed,
 		amotion, adelay, dmotion,
 		mode;
-	short 
+	short
 		hit, flee, cri, flee2,
 		def2, mdef2,
 #ifdef RENEWAL_ASPD
@@ -1867,7 +1888,7 @@ struct s_refine_info {
 };
 
 /*=====================================
-* Interface : status.h 
+* Interface : status.h
 * Generated by HerculesInterfaceMaker
 * created by Susu
 *-------------------------------------*/
diff --git a/src/map/unit.c b/src/map/unit.c
index 0ad770e80..e22d6f697 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1180,8 +1180,8 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 
 		if( (skill->get_inf2(skill_id)&INF2_ENSEMBLE_SKILL) && skill->check_pc_partner(sd, skill_id, &skill_lv, 1, 0) < 1 ) {
 			clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
-			return 0; 
-        }
+			return 0;
+		}
 		
 		switch(skill_id){
 			case SA_CASTCANCEL:
@@ -1371,7 +1371,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 	// in official this is triggered even if no cast time.
 	clif->skillcasting(src, src->id, target_id, 0,0, skill_id, skill->get_ele(skill_id, skill_lv), casttime);
 	if( casttime > 0 || temp )
-	{		
+	{
 		if (sd && target->type == BL_MOB)
 		{
 			TBL_MOB *md = (TBL_MOB*)target;
@@ -1555,7 +1555,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, ui
 	if( casttime > 0 ) {
 		ud->skilltimer = timer->add( tick+casttime, skill->castend_pos, src->id, 0 );
 		if( (sd && pc->checkskill(sd,SA_FREECAST) > 0) || skill_id == LG_EXEEDBREAK)
-			status_calc_bl(&sd->bl, SCB_SPEED);	
+			status_calc_bl(&sd->bl, SCB_SPEED);
 	} else {
 		ud->skilltimer = INVALID_TIMER;
 		skill->castend_pos(ud->skilltimer,tick,src->id,0);
diff --git a/src/map/vending.c b/src/map/vending.c
index c8ac814db..7e9393bf2 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -60,7 +60,7 @@ void vending_vendinglistreq(struct map_session_data* sd, unsigned int id) {
 		// GM is not allowed to trade
 		clif->message(sd->fd, msg_txt(246));
 		return;
-	} 
+	}
 
 	sd->vended_id = vsd->vender_id;  // register vending uid
 
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index 46d654e0d..b8f21407e 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -198,7 +198,7 @@ HPExport void server_preinit (void) {
 	libconfig = GET_SYMBOL("libconfig");
 
 	
-	addArg("--db2sql",false,db2sql_arg,NULL);	
+	addArg("--db2sql",false,db2sql_arg,NULL);
 }
 HPExport void plugin_init (void) {
 	addCPCommand("server:tools:db2sql",db2sql);
diff --git a/src/plugins/dbghelpplug.c b/src/plugins/dbghelpplug.c
index 32b30d69a..0f1690f4b 100644
--- a/src/plugins/dbghelpplug.c
+++ b/src/plugins/dbghelpplug.c
@@ -17,7 +17,7 @@ HPExport struct hplugin_info pinfo = {
 #ifdef _WIN32
 
 /////////////////////////////////////////////////////////////////////
-// Include files 
+// Include files
 //
 #include <assert.h>
 
@@ -32,13 +32,12 @@ HPExport struct hplugin_info pinfo = {
 #include <time.h>
 
 /////////////////////////////////////////////////////////////////////
-// Types from Cvconst.h (DIA SDK) 
+// Types from Cvconst.h (DIA SDK)
 //
 
 #ifdef _NO_CVCONST_H
 
-typedef enum _BasicType
-{ 
+typedef enum _BasicType {
    btNoType   = 0,
    btVoid     = 1,
    btChar     = 2,
@@ -66,7 +65,7 @@ typedef enum _UdtKind
     UdtUnion
 } UdtKind;
 /*
-typedef enum _SymTag { 
+typedef enum _SymTag {
    SymTagNull             = 0,
    SymTagExe              = 1,
    SymTagCompiland        = 2,
@@ -235,7 +234,7 @@ SYMGETMODULEBASE SymGetModuleBase_ = NULL;
 /////////////////////////////////////////////////////////////////////
 // Code
 
-/// Writes the minidump to file. The callback function will at the 
+/// Writes the minidump to file. The callback function will at the
 /// same time write the list of modules to the log file.
 ///
 /// @param file Filename of the minidump
@@ -324,7 +323,7 @@ Dhp__PrintModuleInfoCallback(
 	return TRUE;
 }
 
-/// Prints details about the current process, platform and exception 
+/// Prints details about the current process, platform and exception
 /// information to the log file.
 ///
 /// @param exception Exception info
@@ -418,7 +417,7 @@ Dhp__PrintProcessInfo(
 		{
 			fprintf(log_file,
 				"eip=%08x esp=%08x ebp=%08x iopl=%1x %s %s %s %s %s %s %s %s %s %s\n",
-				context->Eip, context->Esp, context->Ebp, 
+				context->Eip, context->Esp, context->Ebp,
 				(context->EFlags >> 12) & 3,	//  IOPL level value
 				context->EFlags & 0x00100000 ? "vip" : "   ",	//  VIP (virtual interrupt pending)
 				context->EFlags & 0x00080000 ? "vif" : "   ",	//  VIF (virtual interrupt flag)
@@ -487,7 +486,7 @@ Dhp__PrintTypeName(
 	switch( symtag )
 	{
 	case SymTagEnum:
-		{			
+		{
 			WCHAR* pwszTypeName;
 
 			if( SymGetTypeInfo_(hProcess, modBase, typeIndex, TI_GET_SYMNAME, &pwszTypeName) )
@@ -1007,7 +1006,7 @@ Dhp__PrintDataValue(
 
 			fprintf(log_file, "0x%p", *(void**)pVariable);
 			if( SymGetTypeInfo_(hProcess, modBase, typeIndex, TI_GET_TYPE, &childTypeIndex) &&
-				SymGetTypeInfo_(hProcess, modBase, childTypeIndex, TI_GET_SYMTAG, &childSymtag) && 
+				SymGetTypeInfo_(hProcess, modBase, childTypeIndex, TI_GET_SYMTAG, &childSymtag) &&
 				childSymtag != SymTagPointerType )
 			{
 				DWORD childBasetype;
@@ -1277,9 +1276,9 @@ Dhp__PrintSymbolInfo(
 	assert( pSymInfo != NULL );
 	assert( pInterData != NULL );
 
-	switch( pSymInfo->Tag ) 
+	switch( pSymInfo->Tag )
 	{
-	case SymTagData: Dhp__PrintDataInfo( pSymInfo, pInterData ); break; 
+	case SymTagData: Dhp__PrintDataInfo( pSymInfo, pInterData ); break;
 	default: /*fprintf(pInterData->log_file, "<unsupported symtag %d>", pSymInfo->Tag);*/ break;
 	}
 }
diff --git a/src/test/test_spinlock.c b/src/test/test_spinlock.c
index 878ee8bab..0c0e3e2ae 100644
--- a/src/test/test_spinlock.c
+++ b/src/test/test_spinlock.c
@@ -8,13 +8,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-// 
-// Simple test for the spinlock implementation to see if it works properly..  
+//
+// Simple test for the spinlock implementation to see if it works properly..
 //
 
 
 
-#define THRC 32 //thread Count 
+#define THRC 32 //thread Count
 #define PERINC 100000
 #define LOOPS 47
 
@@ -66,7 +66,7 @@ int do_init(int argc, char **argv){
 		
 		
 		while(1){
-			if(InterlockedCompareExchange(&done_threads, THRC, THRC) == THRC) 
+			if(InterlockedCompareExchange(&done_threads, THRC, THRC) == THRC)
 				break;
 			
 			rathread_yield();
@@ -86,7 +86,7 @@ int do_init(int argc, char **argv){
 	
 
 	if(ok != LOOPS){
-		ShowFatalError("Test failed.\n");		
+		ShowFatalError("Test failed.\n");
 		exit(1);
 	}else{
 		ShowStatus("Test passed.\n");
@@ -103,11 +103,12 @@ void do_abort(){
 
 
 void set_server_type(){
-	SERVER_TYPE = ATHENA_SERVER_NONE;
+	SERVER_TYPE = SERVER_TYPE_UNKNOWN;
 }//end: set_server_type()
 
 
-void do_final(){
+int do_final(){
+	return EXIT_SUCCESS;
 }//end: do_final()