Merge branch 'master' of https://github.com/HerculesWS/Hercules

Solved minor conflicts that were caused by the unit interface

Signed-off-by: shennetsind <ind@henn.et>

27 files changed, 27 insertions, 27 deletions

diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index 1e2985f66..42b085cd6 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -1428,4 +1428,4 @@ Sets the intimacy level of your homunculus, with 1000 being "Loyal".
 
 Sets the hunger level of your homunculus, with 100 being "Stuffed".
 
----------------------------------------
\ No newline at end of file
+---------------------------------------
diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt
index 7545016b5..b9dc9080f 100644
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -412,4 +412,4 @@ bonus bVariableCast,x;			Increases variable cast time of all skills by x millise
 bonus2 bSkillFixedCast,s,x;		Increases fixed cast time of skill s by x milliseconds. (supports skill names.)
 bonus2 bSkillVariableCast,s,x;		Increases variable cast time of skill s by x milliseconds. (supports skill names.)
 bonus2 bVariableCastrate,s,x;		Increases variable cast time of skill s by x%. (supports skill names.)
-bonus2 bFixedCastrate,s,x;		Increases fixed cast time of skill s by x%. (supports skill names.)
\ No newline at end of file
+bonus2 bFixedCastrate,s,x;		Increases fixed cast time of skill s by x%. (supports skill names.)
diff --git a/doc/md5_hashcheck.txt b/doc/md5_hashcheck.txt
index a2dbf42fa..779785638 100644
--- a/doc/md5_hashcheck.txt
+++ b/doc/md5_hashcheck.txt
@@ -35,4 +35,4 @@ To enable MD5 hash checks, set 'client_hash_check' to 'on'.
 The 'client_hash' group_id can be any of the groups in conf\groups.conf,
 and is particularly useful if you wanted to allow GMs a different client
 than normal players; for example, a GM client could be hexed differently
-with dual-clienting enabled and chat flood disabled.
\ No newline at end of file
+with dual-clienting enabled and chat flood disabled.
diff --git a/doc/permissions.txt b/doc/permissions.txt
index 6cfb98897..9760f716c 100644
--- a/doc/permissions.txt
+++ b/doc/permissions.txt
@@ -31,4 +31,4 @@ show_bossmobs : Ability to see boss mobs with @showmobs.
 disable_pvm : Ability to disable Player vs. Monster.
 disable_pvp : Ability to disable Player vs. Player.
 disable_commands_when_dead : Ability to disable @command usage when dead.
-hchsys_admin : Hercules Chat System Admin (Ability to modify channel settings regardless of ownership and join password-protected channels without requiring a password.)
\ No newline at end of file
+hchsys_admin : Hercules Chat System Admin (Ability to modify channel settings regardless of ownership and join password-protected channels without requiring a password.)
diff --git a/doc/sample/bank_test.txt b/doc/sample/bank_test.txt
index e63ef7e12..8b29abd93 100644
--- a/doc/sample/bank_test.txt
+++ b/doc/sample/bank_test.txt
@@ -64,4 +64,4 @@ B_EXIT2:
 	mes "Good bye!";
 	cutin "kafra_06",255;
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/basejob_baseclass_upper.txt b/doc/sample/basejob_baseclass_upper.txt
index 04f7d310f..8e2501e09 100644
--- a/doc/sample/basejob_baseclass_upper.txt
+++ b/doc/sample/basejob_baseclass_upper.txt
@@ -15,4 +15,4 @@ prontera,155,177,1	script	Tell Me	725,{
 	mes "BaseJob: " + BaseJob;
 	mes "Upper: " + Upper;
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/checkoption.txt b/doc/sample/checkoption.txt
index eb768b9b2..8f0f96d9f 100644
--- a/doc/sample/checkoption.txt
+++ b/doc/sample/checkoption.txt
@@ -14,4 +14,4 @@ prontera,156,89,6	script	test_checkoption	117,{
 	if(checkoption(@value) == 1) mes "True!";
 	else if(checkoption(@value) == 0) mes "False!";
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/delitem2.txt b/doc/sample/delitem2.txt
index f38d59c27..9e74d76e7 100644
--- a/doc/sample/delitem2.txt
+++ b/doc/sample/delitem2.txt
@@ -36,4 +36,4 @@ prontera,160,182,5	script	Delitem2	51,{
 	delitem2 @nameid,@amount,@iden,@ref,@attr,@c1,@c2,@c3,@c4;
 	mes "And here is the moment when your item should disappear! :P";
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/getequipcardid.txt b/doc/sample/getequipcardid.txt
index 0447bf533..6b435f41f 100644
--- a/doc/sample/getequipcardid.txt
+++ b/doc/sample/getequipcardid.txt
@@ -22,4 +22,4 @@ prontera,155,177,4	script	Check My Hat	810,{
 	mes "Nothing?";
 	emotion e_hmm;
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/getequipid.txt b/doc/sample/getequipid.txt
index 654c58f3b..6a2ef342f 100644
--- a/doc/sample/getequipid.txt
+++ b/doc/sample/getequipid.txt
@@ -13,4 +13,4 @@ prontera,161,181,6	script	GetEquipID Sample	105,{
 	for(set .@i,1; .@i<11; set .@i,.@i+1)
 		mes "GetEquipID(" + .@i + ") : " + getequipid(1);
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/getiteminfo.txt b/doc/sample/getiteminfo.txt
index 15b81b749..632999f3b 100644
--- a/doc/sample/getiteminfo.txt
+++ b/doc/sample/getiteminfo.txt
@@ -20,4 +20,4 @@ prontera,156,179,6	script	test_getiteminfo	117,{
 	for(set .@id,0; .@id<14; set .@id,.@id+1)
 		mes " getiteminfo("+.@value+","+.@id+") = "+getiteminfo(.@value,.@id);
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/getmonsterinfo.txt b/doc/sample/getmonsterinfo.txt
index 079d9e7e9..471af9e5c 100644
--- a/doc/sample/getmonsterinfo.txt
+++ b/doc/sample/getmonsterinfo.txt
@@ -20,4 +20,4 @@ prontera,156,179,6	script	test_getmonsterinfo	117,{
 	for(set .@id,0; .@id<23; set .@id,.@id+1)
 		mes " getmonsterinfo("+.@value+","+@id+") = "+getmonsterinfo(.@value,@id);
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/gstorage_test.txt b/doc/sample/gstorage_test.txt
index 559f7f76e..b8f9fe2c4 100644
--- a/doc/sample/gstorage_test.txt
+++ b/doc/sample/gstorage_test.txt
@@ -41,4 +41,4 @@ GS_EXIT3:
 GS_EXIT4:
 	cutin "kafra_06",255;
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_dynamic_shop.txt b/doc/sample/npc_dynamic_shop.txt
index b6ed48808..c3bc78293 100644
--- a/doc/sample/npc_dynamic_shop.txt
+++ b/doc/sample/npc_dynamic_shop.txt
@@ -92,4 +92,4 @@ OnInit:
 	set $@rpotsleft, 10;
 	set $@opotsleft, 10;
 	end;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_extend_shop.txt b/doc/sample/npc_extend_shop.txt
index ccc2ce5bb..1ca4ed7b8 100644
--- a/doc/sample/npc_extend_shop.txt
+++ b/doc/sample/npc_extend_shop.txt
@@ -27,4 +27,4 @@ prontera,146,229,5	shop	Armor Card Merchant	80,4003:100000,4008:100000,4011:1000
 prontera,144,227,5	shop	Shield Card Merchant	80,4013:100000,4032:100000,4058:100000,4059:100000,4066:100000,4074:100000,4083:100000,4120:100000,4124:100000,4136:100000,4138:100000,4045:100000,4067:100000,4075:100000,4090:100000
 prontera,142,225,5	shop	Robe Card Merchant	80,4056:100000,4071:100000,4081:100000,4095:100000,4108:100000,4109:100000,4113:100000,4116:100000,4133:100000,4015:100000,4088:100000,4102:100000,4129:100000
 prontera,140,223,5	shop	Shoes Card Merchant	80,4009:100000,4038:100000,4050:100000,4070:100000,4097:100000,4100:100000,4107:100000
-prontera,138,221,5	shop	Accessory Card Merchant	80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500
\ No newline at end of file
+prontera,138,221,5	shop	Accessory Card Merchant	80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500
diff --git a/doc/sample/npc_live_dialogues.txt b/doc/sample/npc_live_dialogues.txt
index 22422d9af..8778f6c50 100644
--- a/doc/sample/npc_live_dialogues.txt
+++ b/doc/sample/npc_live_dialogues.txt
@@ -51,4 +51,4 @@ M_BYE:
 	// Add some random goodbye from Global_Functions.txt
 	mes callfunc("F_Bye");
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_shop_test.txt b/doc/sample/npc_shop_test.txt
index fa58f3f52..5e492b257 100644
--- a/doc/sample/npc_shop_test.txt
+++ b/doc/sample/npc_shop_test.txt
@@ -37,4 +37,4 @@ prontera,218,211,4	shop	Pet Groomer	125,537:2500,643:3000,10013:1500,10014:2000
 izlude,164,138,4	shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
 morocc,269,167,4	shop	Pet Groomer	125,537:2500,643:3000,10013:1500,10014:2000
 geffen,193,152,4	shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
-payon,142,104,4		shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
\ No newline at end of file
+payon,142,104,4		shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
diff --git a/doc/sample/npc_test_array.txt b/doc/sample/npc_test_array.txt
index b6185adbc..36b54a3fe 100644
--- a/doc/sample/npc_test_array.txt
+++ b/doc/sample/npc_test_array.txt
@@ -40,4 +40,4 @@ prontera,164,190,1	script	Array Test	112,{
 	mes "hoge[2]=> " + @hoge[2];
 	mes "hoge[3]=> " + @hoge[3];
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_test_chat.txt b/doc/sample/npc_test_chat.txt
index 24176b802..ca81840ea 100644
--- a/doc/sample/npc_test_chat.txt
+++ b/doc/sample/npc_test_chat.txt
@@ -34,4 +34,4 @@ OnChatEvent:
 	disablewaitingroomevent;
 	warpwaitingpc "prontera",160,180;
 	end;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_test_duplicate.txt b/doc/sample/npc_test_duplicate.txt
index 237e7e57d..d052e1cee 100644
--- a/doc/sample/npc_test_duplicate.txt
+++ b/doc/sample/npc_test_duplicate.txt
@@ -29,4 +29,4 @@ OnTouch:
 
 prontera,150,175,4	duplicate(Test Script)	Test1	909
 prontera,155,175,4	duplicate(Test Script)	Test2	909,2,2
-prontera,160,175,4	duplicate(Test Script)	Test3	909,3,3
\ No newline at end of file
+prontera,160,175,4	duplicate(Test Script)	Test3	909,3,3
diff --git a/doc/sample/npc_test_npctimer.txt b/doc/sample/npc_test_npctimer.txt
index f3c2d8bee..7dc625785 100644
--- a/doc/sample/npc_test_npctimer.txt
+++ b/doc/sample/npc_test_npctimer.txt
@@ -39,4 +39,4 @@ OnTimer5000:
 OnTimer10000:
 	npctalk "After 10 seconds...";
 	end;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_test_npctimer2.txt b/doc/sample/npc_test_npctimer2.txt
index 6c5d139f0..1bb856b13 100644
--- a/doc/sample/npc_test_npctimer2.txt
+++ b/doc/sample/npc_test_npctimer2.txt
@@ -20,4 +20,4 @@ OnTimer5000:
 	mes "Ah, your level is " + readparam(11) + "!";
 	detachnpctimer;
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_test_quest.txt b/doc/sample/npc_test_quest.txt
index 39f838e23..821c83739 100644
--- a/doc/sample/npc_test_quest.txt
+++ b/doc/sample/npc_test_quest.txt
@@ -45,4 +45,4 @@ prontera,90,95,1	script	Jelly	123,{
 		mes "Thanks again for doing that for me!";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_test_setmapflag.txt b/doc/sample/npc_test_setmapflag.txt
index 010a6f85d..681fbc43a 100644
--- a/doc/sample/npc_test_setmapflag.txt
+++ b/doc/sample/npc_test_setmapflag.txt
@@ -29,4 +29,4 @@ prontera,165,145,0	script	EXPflagtest	123,{
 		removemapflag "prontera",MF_PVP;
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/doc/sample/npc_test_time.txt b/doc/sample/npc_test_time.txt
index f9c40b910..ffa6a5ca2 100644
--- a/doc/sample/npc_test_time.txt
+++ b/doc/sample/npc_test_time.txt
@@ -22,4 +22,4 @@ prontera,157,181,6	script	Time Sample	105,{
 	mes " GetTime(7) : " + gettime(7) + " (Year)";
 	mes " GetTimeStr : " + gettimestr("%Y-%m/%d %H:%M:%S",19);
 	close;
-}
\ No newline at end of file
+}
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 75c731d53..29a1478fa 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -1,4 +1,4 @@
-//===== Hercules Documentation ===============================
+//===== Hercules Documentation ===============================
 //= Hercules Script Commands
 //===== By: ==================================================
 //= Hercules Dev Team
diff --git a/doc/whisper_sys.txt b/doc/whisper_sys.txt
index 3c870b543..39e2a54f2 100644
--- a/doc/whisper_sys.txt
+++ b/doc/whisper_sys.txt
@@ -49,4 +49,4 @@ OnWhisperGlobal:
 		// Script for an MVP summoning event.
 	}
 	end;
-}
\ No newline at end of file
+}