repair the repo.

- removing the <<<<====>>>> unsolved merge conflicts
- reset some files, which are using CRLF(windows style) line ending to LF only (unix style)
- adding some comments to the csv files to not edit them manually but to use nice programs

1 files changed, 42 insertions, 77 deletions

diff --git a/db/skill_db.txt b/db/skill_db.txt
index b94fefb8..93a6e567 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -1,81 +1,46 @@
-<<<<<<< HEAD
-//id,	range,	hit,	inf,	pl,	nk,	maxrse,	max,	list_num,	castcancel,	cast_defence_rate,	inf2,	maxcount,	skill_type,	blow_count,	pool,	stat,	name

-1,	0,	0,	0,	0,	0,	0,	1,	0,		no,		0,			0,	0,		none,		0,		no,	none,	Emote	//NV_EMOTE

-2,	0,	0,	0,	0,	0,	0,	1,	0,		no,		0,			0,	0,		none,		0,		no,	none,	Trade	//NV_TRADE

-3,	0,	0,	0,	0,	0,	0,	2,	0,		no,		0,			0,	0,		none,		0,		no,	none,	Party	//NV_PARTY

-4,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0,		no,	none,	X0	//SM_SWORD

-6,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X1	//SM_RECOVERY

-11,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X2	//MG_SRECOVERY

-38,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X3	//MC_INCCARRY

-39,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X4	//MC_DISCOUNT

-40,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X5	//MC_OVERCHARGE

-50,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0,		no,	none,	X6	//TF_DOUBLE

-51,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0,		no,	none,	X7	//TF_MISS

-54,	1,	6,	4,	0,	0,	0,	100,	1,		no,		0,			1,	0,		none,		0,		no,	none,	X8	//TF_POISON

-144,	0,	6,	4,	0,	1,	0,	1,	1,		no,		0,			1,	0,		none,		0,		no,	none,	X9	//NV_FIRSTAID

-146,	0,	0,	0,	0,	0,	0,	1,	0,		no,		0,			1,	0,		none,		0,		no,	none,	X10	//SM_MOVINGRECOVERY

-148,	0,	0,	0,	0,	0,	0,	1,	0,		no,		0,			1,	0,		weapon,		0,		no,	none,	X11	//SM_AUTOBERSERK

-152,	0,	6,	4,	0,	1,	0,	1,	1,		no,		0,			1,	0,		weapon,		5,		no,	none,	X12	//TF_BACKSLIDING

-178,	1,	6,	4,	0,	0,	0,	100,	1,		no,		0,			1,	0,		none,		0,		no,	none,	X13	//NPC_POISON

-190,	1,	6,	4,	0,	0,	0,	100,	1,		no,		0,			1,	0,		none,		0,		no,	none,	X14	//NPC_POISONATTACK

-198,	0,	0,	4,	0,	1,	0,	10,	1,		no,		0,			2,	0,		magic,		0,		no,	none,	X15	//NPC_SUMMONSLAVE

-199,	0,	0,	4,	0,	1,	0,	10,	1,		no,		0,			2,	0,		none,		0,		no,	none,	X16	//NPC_EMOTION

-339	0,	0,	0,	0,	0,	0,	3,	0,		no,		0,			0,	0,		none,		0,		no,	none,	Skill_Pool		//TMW_SKILLPOOL

-340,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Magic			//TMW_MAGIC

-341,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Life_Magic		//TMW_MAGIC_LIFE

-342,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	War_Magic		//TMW_MAGIC_WAR

-343,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Transmutation_Magic	//TMW_MAGIC_TRANSMUTE

-344,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Nature_Magic		//TMW_MAGIC_NATURE

-345,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Astral_Magic		//TMW_MAGIC_ASTRAL

-350,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		weapon,		0,		passive,agi,	Brawling		//TMW_BRAWLING

-351,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		weapon,		0,		passive,luk,	Lucky_Counter		//TMW_LUCKY_COUNTER

-352,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		none,		0,		passive,agi,	Speed			//TMW_SPEED

-353,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		none,		0,		passive,vit,	Poison_Resistance	//TMW_POISON_RESISTANCE

-354,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		magic,		0,		passive,int,	Astral_Soul		//TMW_ASTRAL_SOUL

-45,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		weapon,		0,		passive,dex,	Mallard's_Eye		//AC_OWL

-28,	0,	6,	4,	0,	1,	0,	2,	1,		yes,		0,			0,	0,		magic,		0,		no,	none,	Teleport //AL_TELEPORT

-30,	9,	6,	16,	0,	1,	0,	10,	1,		yes,		0,			0,	0,		magic,		0,		no,	none,	Heal    //AL_HEAL

-// maxrse describes the max. level that the skill can be raised to through the `raise skill' option.  Further raising has to happen via quests.

-// maxrse < max.

-// `pool' can be `no', `active', or `passive'.

-// `stat' can be `none', `str', `dex', `agi', `vit', `int', `luk'.

-=======
-//id,	range,	hit,	inf,	pl,	nk,	maxrse,	max,	list_num,	castcancel,	cast_defence_rate,	inf2,	maxcount,	skill_type,	blow_count,	pool,	stat,	name
-1,	0,	0,	0,	0,	0,	0,	1,	0,		no,		0,			0,	0,		none,		0,		no,	none,	Emote	//NV_EMOTE
-2,	0,	0,	0,	0,	0,	0,	1,	0,		no,		0,			0,	0,		none,		0,		no,	none,	Trade	//NV_TRADE
-3,	0,	0,	0,	0,	0,	0,	2,	0,		no,		0,			0,	0,		none,		0,		no,	none,	Party	//NV_PARTY
-4,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0,		no,	none,	X0	//SM_SWORD
-6,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X1	//SM_RECOVERY
-11,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X2	//MG_SRECOVERY
-38,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X3	//MC_INCCARRY
-39,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X4	//MC_DISCOUNT
-40,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0,		no,	none,	X5	//MC_OVERCHARGE
-50,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0,		no,	none,	X6	//TF_DOUBLE
-51,	0,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0,		no,	none,	X7	//TF_MISS
-54,	1,	6,	4,	0,	0,	0,	100,	1,		no,		0,			1,	0,		none,		0,		no,	none,	X8	//TF_POISON
-144,	0,	6,	4,	0,	1,	0,	1,	1,		no,		0,			1,	0,		none,		0,		no,	none,	X9	//NV_FIRSTAID
-146,	0,	0,	0,	0,	0,	0,	1,	0,		no,		0,			1,	0,		none,		0,		no,	none,	X10	//SM_MOVINGRECOVERY
-148,	0,	0,	0,	0,	0,	0,	1,	0,		no,		0,			1,	0,		weapon,		0,		no,	none,	X11	//SM_AUTOBERSERK
-152,	0,	6,	4,	0,	1,	0,	1,	1,		no,		0,			1,	0,		weapon,		5,		no,	none,	X12	//TF_BACKSLIDING
-178,	1,	6,	4,	0,	0,	0,	100,	1,		no,		0,			1,	0,		none,		0,		no,	none,	X13	//NPC_POISON
-190,	1,	6,	4,	0,	0,	0,	100,	1,		no,		0,			1,	0,		none,		0,		no,	none,	X14	//NPC_POISONATTACK
-198,	0,	0,	4,	0,	1,	0,	10,	1,		no,		0,			2,	0,		magic,		0,		no,	none,	X15	//NPC_SUMMONSLAVE
-199,	0,	0,	4,	0,	1,	0,	10,	1,		no,		0,			2,	0,		none,		0,		no,	none,	X16	//NPC_EMOTION
-339	0,	0,	0,	0,	0,	0,	3,	0,		no,		0,			0,	0,		none,		0,		no,	none,	Skill_Pool		//SKILL_POOL
-340,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Magic			//TMW_MAGIC
-341,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Life_Magic		//TMW_MAGIC_LIFE
-342,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	War_Magic		//TMW_MAGIC_WAR
-343,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Transmutation_Magic	//TMW_MAGIC_TRANSMUTE
-344,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Nature_Magic		//TMW_MAGIC_NATURE
-345,	0,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0,		no,	none,	Astral_Magic		//TMW_MAGIC_ASTRAL
-350,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		weapon,		0,		passive,agi,	Brawling		//TMW_BRAWLING
-351,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		weapon,		0,		passive,luk,	Lucky_Counter		//TMW_LUCKY_COUNTER
-352,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		none,		0,		passive,agi,	Speed			//TMW_SPEED
-353,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		none,		0,		passive,vit,	Poison_Resistance	//TMW_POISON_RESISTANCE
-354,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		magic,		0,		passive,int,	Astral_Soul		//TMW_ASTRAL_SOUL
-45,	0,	0,	0,	0,	0,	9,	10,	0,		no,		0,			0,	0,		weapon,		0,		passive,dex,	Mallard's_Eye		//AC_OWL
+//# This file can be imported to OpenOffice or similar as a "comma separated list (.csv)"
+//# So please use only(!) commas to separate different fields.
+//# and DO NOT use any kind of whitespace to make it miss-formated.
+//# Just use a serious csv editor!
+//id,range,hit,inf,pl,nk,maxrse,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,pool,stat,name
+1,0,0,0,0,0,0,1,0,no,0,0,0,none,0,no,none,Emote//NV_EMOTE
+2,0,0,0,0,0,0,1,0,no,0,0,0,none,0,no,none,Trade//NV_TRADE
+3,0,0,0,0,0,0,2,0,no,0,0,0,none,0,no,none,Party//NV_PARTY
+4,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,no,none,X0//SM_SWORD
+6,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X1//SM_RECOVERY
+11,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X2//MG_SRECOVERY
+38,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X3//MC_INCCARRY
+39,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X4//MC_DISCOUNT
+40,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X5//MC_OVERCHARGE
+50,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,no,none,X6//TF_DOUBLE
+51,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,no,none,X7//TF_MISS
+54,1,6,4,0,0,0,100,1,no,0,1,0,none,0,no,none,X8//TF_POISON
+144,0,6,4,0,1,0,1,1,no,0,1,0,none,0,no,none,X9//NV_FIRSTAID
+146,0,0,0,0,0,0,1,0,no,0,1,0,none,0,no,none,X10//SM_MOVINGRECOVERY
+148,0,0,0,0,0,0,1,0,no,0,1,0,weapon,0,no,none,X11//SM_AUTOBERSERK
+152,0,6,4,0,1,0,1,1,no,0,1,0,weapon,5,no,none,X12//TF_BACKSLIDING
+178,1,6,4,0,0,0,100,1,no,0,1,0,none,0,no,none,X13//NPC_POISON
+190,1,6,4,0,0,0,100,1,no,0,1,0,none,0,no,none,X14//NPC_POISONATTACK
+198,0,0,4,0,1,0,10,1,no,0,2,0,magic,0,no,none,X15//NPC_SUMMONSLAVE
+199,0,0,4,0,1,0,10,1,no,0,2,0,none,0,no,none,X16//NPC_EMOTION
+3390,0,0,0,0,0,3,0,no,0,0,0,none,0,no,none,Skill_Pool//SKILL_POOL
+340,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Magic//TMW_MAGIC
+341,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Life_Magic//TMW_MAGIC_LIFE
+342,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,War_Magic//TMW_MAGIC_WAR
+343,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Transmutation_Magic//TMW_MAGIC_TRANSMUTE
+344,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Nature_Magic//TMW_MAGIC_NATURE
+345,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Astral_Magic//TMW_MAGIC_ASTRAL
+350,0,0,0,0,0,9,10,0,no,0,0,0,weapon,0,passive,agi,Brawling//TMW_BRAWLING
+351,0,0,0,0,0,9,10,0,no,0,0,0,weapon,0,passive,luk,Lucky_Counter//TMW_LUCKY_COUNTER
+352,0,0,0,0,0,9,10,0,no,0,0,0,none,0,passive,agi,Speed//TMW_SPEED
+353,0,0,0,0,0,9,10,0,no,0,0,0,none,0,passive,vit,Poison_Resistance//TMW_POISON_RESISTANCE
+354,0,0,0,0,0,9,10,0,no,0,0,0,magic,0,passive,int,Astral_Soul//TMW_ASTRAL_SOUL
+45,0,0,0,0,0,9,10,0,no,0,0,0,weapon,0,passive,dex,Mallard's_Eye//AC_OWL
+28,0,6,4,0,1,0,2,1,yes,0,0,0,magic,0,no,none,Teleport //AL_TELEPORT
+30,9,6,16,0,1,0,10,1,yes,0,0,0,magic,0,no,none,Heal    //AL_HEAL
 // maxrse describes the max. level that the skill can be raised to through the `raise skill' option.  Further raising has to happen via quests.
 // maxrse < max.
 // `pool' can be `no', `active', or `passive'.
 // `stat' can be `none', `str', `dex', `agi', `vit', `int', `luk'.
->>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b
+
+// SEE COMMENT ABOVE!