From 28f9091d1d8819808f145dbbb08cf95af8139d29 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 5 Jan 2011 17:23:33 +0100 Subject: 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 --- npc/027-2_Caretakers_House/_import.txt | 15 ++++++++------- npc/027-2_Caretakers_House/_warps.txt | 21 --------------------- 2 files changed, 8 insertions(+), 28 deletions(-) (limited to 'npc/027-2_Caretakers_House') diff --git a/npc/027-2_Caretakers_House/_import.txt b/npc/027-2_Caretakers_House/_import.txt index e288d6cb..f548a434 100644 --- a/npc/027-2_Caretakers_House/_import.txt +++ b/npc/027-2_Caretakers_House/_import.txt @@ -1,7 +1,8 @@ -map: 027-2.gat -npc: npc/027-2_Caretakers_House/_mobs.txt -npc: npc/027-2_Caretakers_House/_warps.txt -npc: npc/027-2_Caretakers_House/caretaker.txt -npc: npc/027-2_Caretakers_House/alacrius.txt -npc: npc/027-2_Caretakers_House/gy_inn_shops.txt -npc: npc/027-2_Caretakers_House/testnpcs.txt \ No newline at end of file +map: 027-2.gat +npc: npc/027-2_Caretakers_House/_mobs.txt +npc: npc/027-2_Caretakers_House/_warps.txt +npc: npc/027-2_Caretakers_House/alacrius.txt +npc: npc/027-2_Caretakers_House/alacrius2.txt +npc: npc/027-2_Caretakers_House/caretaker.txt +npc: npc/027-2_Caretakers_House/gy_inn_shops.txt +npc: npc/027-2_Caretakers_House/testnpcs.txt diff --git a/npc/027-2_Caretakers_House/_warps.txt b/npc/027-2_Caretakers_House/_warps.txt index 160e4dae..8b7af158 100644 --- a/npc/027-2_Caretakers_House/_warps.txt +++ b/npc/027-2_Caretakers_House/_warps.txt @@ -1,24 +1,3 @@ // 027-2 Caretaker's House warps -<<<<<<< HEAD -027-2.gat,25,32 warp toGraveyard -1,-1,027-1.gat,88,85 - - - -// 027-2 Graveyard Inn 1rst floor Warps - -027-2.gat,127,35,0 warp ToInnSecondFloorL -1,-1,027-2.gat,75,92 -027-2.gat,128,35,0 warp ToInnSecondFloorR -1,-1,027-2.gat,76,92 -027-2.gat,106,46,0 warp GYInnExit 1,-1,debugroom.gat,30,27 - -027-2.gat,111,37,0 warp ToReaper 1,-1,027-4.gat,40,38 - - - -// 027-2 Graveyard Inn 2nd floor Warps - -027-2.gat,75,93,0 warp ToInnFirstFloorL -1,-1,027-2.gat,127,36 -027-2.gat,76,93,0 warp ToInnFirstFloorR -1,-1,027-2.gat,128,36 -======= 027-2.gat,26,33 warp toGraveyard -1,-1,027-1.gat,88,85 ->>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b -- cgit v1.2.3-70-g09d2