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

3 files changed, 17 insertions, 15 deletions

diff --git a/npc/027-3_Crypt/_import.txt b/npc/027-3_Crypt/_import.txt
index 627fe137..82841eaa 100755
--- a/npc/027-3_Crypt/_import.txt
+++ b/npc/027-3_Crypt/_import.txt
@@ -1,7 +1,7 @@
-map: 027-3.gat

-npc: npc/027-3_Crypt/_mobs.txt

-npc: npc/027-3_Crypt/_warps.txt

-npc: npc/027-3_Crypt/mapflags.txt

-npc: npc/027-3_Crypt/entrance.txt

-npc: npc/027-3_Crypt/caskets.txt

-npc: npc/027-3_Crypt/test.txt

+map: 027-3.gat
+npc: npc/027-3_Crypt/_mobs.txt
+npc: npc/027-3_Crypt/_warps.txt
+npc: npc/027-3_Crypt/caskets.txt
+npc: npc/027-3_Crypt/entrance.txt
+npc: npc/027-3_Crypt/mapflags.txt
+npc: npc/027-3_Crypt/test.txt
diff --git a/npc/027-3_Crypt/_mobs.txt b/npc/027-3_Crypt/_mobs.txt
index 2e423ee7..8aa8bd4a 100755
--- a/npc/027-3_Crypt/_mobs.txt
+++ b/npc/027-3_Crypt/_mobs.txt
@@ -1,3 +1,7 @@
-// 027-3 Crypt mobs

-

-//027-3.gat,40,38,0,0	monster	TheLost	1063,1,8000,2000,0

+// 027-3 Crypt mobs
+
+
+
+027-3.gat,0,0,0	script	Mob027-3	-1,{
+	end;
+}
diff --git a/npc/027-3_Crypt/_warps.txt b/npc/027-3_Crypt/_warps.txt
index 295215ca..5bbff7ae 100755
--- a/npc/027-3_Crypt/_warps.txt
+++ b/npc/027-3_Crypt/_warps.txt
@@ -1,5 +1,3 @@
-// 027-3 Crypt warps

-

-027-3.gat,126,44,0	warp	ToReaperL	-1,-1,027-4.gat,36,21

-027-3.gat,127,44,0	warp	ToReaperM	-1,-1,027-4.gat,37,21

-027-3.gat,128,44,0	warp	ToReaperR	-1,-1,027-4.gat,38,21
\ No newline at end of file
+// 027-3 Crypt warps
+
+027-3.gat,127,44	warp	toCryptLevel2	1,-1,027-4.gat,37,21