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/009-2_Hurnscald/_warps.txt | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'npc/009-2_Hurnscald/_warps.txt') diff --git a/npc/009-2_Hurnscald/_warps.txt b/npc/009-2_Hurnscald/_warps.txt index 17c8d7ea..29121d3e 100644 --- a/npc/009-2_Hurnscald/_warps.txt +++ b/npc/009-2_Hurnscald/_warps.txt @@ -1,21 +1,20 @@ -// 009-2 Hurnscald warps - -009-2.gat,75,23 warp To1stFloor 0,-1,009-2.gat,73,46 -009-2.gat,95,30 warp ToOutdoor -1,-1,009-1.gat,59,34 -009-2.gat,130,26 warp ToOutdoor -1,-1,009-1.gat,71,31 -009-2.gat,144,26 warp To2ndFloor 0,-1,009-2.gat,143,44 -009-2.gat,144,42 warp To3rdFloor 0,-1,009-2.gat,143,24 -009-2.gat,155,47 warp To1stFloor 0,-1,009-2.gat,154,63 -009-2.gat,114,46 warp To1stFloor 0,-1,009-2.gat,113,69 -009-2.gat,50,55 warp ToOutdoor -1,-1,009-1.gat,35,31 -009-2.gat,74,53 warp ToCellar -1,-1,009-2.gat,143,81 -009-2.gat,74,45 warp To2ndFloor 0,-1,009-2.gat,74,23 -009-2.gat,114,78 warp ToOutdoor 0,-1,009-1.gat,72,45 -009-2.gat,114,68 warp To2ndFloor 0,-1,009-2.gat,113,46 -009-2.gat,149,67 warp ToOutdoor -1,-1,009-1.gat,80,32 -009-2.gat,143,79 warp To1stFloor -1,-1,009-2.gat,74,52 -009-2.gat,155,62 warp To2ndFloor 0,-1,009-2.gat,154,46 -009-2.gat,181,67 warp ToOutdoor -1,-1,009-1.gat,90,47 -009-2.gat,182,67 warp ToOutdoor -1,-1,009-1.gat,91,47 -009-2.gat,147,89 warp ToCaveBeneathHurnscald -1,-1,009-3.gat,173,22 -009-2.gat,27,106 warp ToOutdoor -1,-1,009-1.gat,58,47 +// 009-2 Hurnscald warps + +009-2.gat,75,23 warp To1stFloor 0,-1,009-2.gat,73,46 +009-2.gat,95,30 warp ToOutdoor -1,-1,009-1.gat,59,34 +009-2.gat,130,26 warp ToOutdoor -1,-1,009-1.gat,71,31 +009-2.gat,144,26 warp To2ndFloor 0,-1,009-2.gat,143,44 +009-2.gat,144,42 warp To3rdFloor 0,-1,009-2.gat,143,24 +009-2.gat,155,47 warp To1stFloor 0,-1,009-2.gat,154,63 +009-2.gat,114,46 warp To1stFloor 0,-1,009-2.gat,113,69 +009-2.gat,50,55 warp ToOutdoor -1,-1,009-1.gat,35,31 +009-2.gat,74,53 warp ToCellar -1,-1,009-2.gat,143,81 +009-2.gat,74,45 warp To2ndFloor 0,-1,009-2.gat,74,23 +009-2.gat,114,78 warp ToOutdoor -1,-1,009-1.gat,72,45 +009-2.gat,114,68 warp To2ndFloor 0,-1,009-2.gat,113,46 +009-2.gat,149,67 warp ToOutdoor -1,-1,009-1.gat,80,32 +009-2.gat,143,79 warp To1stFloor -1,-1,009-2.gat,74,52 +009-2.gat,155,62 warp To2ndFloor 0,-1,009-2.gat,154,46 +009-2.gat,182,67 warp ToOutdoor 0,-1,009-1.gat,91,47 +009-2.gat,147,89 warp ToCaveBeneathHurnscald -1,-1,009-3.gat,173,22 +009-2.gat,27,106 warp ToOutdoor -1,-1,009-1.gat,58,47 -- cgit v1.2.3-60-g2f50