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-1_Hurnscald/_warps.txt | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'npc/009-1_Hurnscald') diff --git a/npc/009-1_Hurnscald/_warps.txt b/npc/009-1_Hurnscald/_warps.txt index 4d69f6fa..a41c63a4 100644 --- a/npc/009-1_Hurnscald/_warps.txt +++ b/npc/009-1_Hurnscald/_warps.txt @@ -1,14 +1,13 @@ -// 009-1 Hurnscald warps - -009-1.gat,49,55 warp HurnscaldSouthGate 2,-1,008-1.gat,78,82 -009-1.gat,97,36 warp HurnscaldEastGate -1,0,008-1.gat,129,60 -009-1.gat,35,30 warp ToInn -1,-1,009-2.gat,50,55 -009-1.gat,58,46 warp ToGeneralStore -1,-1,009-2.gat,27,105 -009-1.gat,59,33 warp ToArcherShop -1,-1,009-2.gat,95,29 -009-1.gat,71,30 warp ToPotionShop -1,-1,009-2.gat,130,25 -009-1.gat,80,31 warp ToHospital -1,-1,009-2.gat,149,66 -009-1.gat,72,44 warp ToMayor -1,-1,009-2.gat,114,77 -009-1.gat,90,46 warp ToBlacksmithL -1,-1,009-2.gat,181,66 -009-1.gat,91,46 warp ToBlacksmithR -1,-1,009-2.gat,182,66 -009-1.gat,24,36 warp HurnscaldWestGate -1,1,008-1.gat,53,61 -009-1.gat,49,24 warp HurnscaldNorthGate 2,-1,008-1.gat,78,48 +// 009-1 Hurnscald warps + +009-1.gat,49,55 warp HurnscaldSouthGate 2,-1,008-1.gat,78,82 +009-1.gat,97,36 warp HurnscaldEastGate -1,0,008-1.gat,129,60 +009-1.gat,35,30 warp ToInn -1,-1,009-2.gat,50,55 +009-1.gat,58,46 warp ToGeneralStore -1,-1,009-2.gat,27,105 +009-1.gat,59,33 warp ToArcherShop -1,-1,009-2.gat,95,29 +009-1.gat,71,30 warp ToPotionShop -1,-1,009-2.gat,130,25 +009-1.gat,80,31 warp ToHospital -1,-1,009-2.gat,149,66 +009-1.gat,72,44 warp ToMayor -1,-1,009-2.gat,113,77 +009-1.gat,91,46 warp ToBlacksmith -1,-1,009-2.gat,181,66 +009-1.gat,24,36 warp HurnscaldWestGate -1,1,008-1.gat,53,61 +009-1.gat,49,24 warp HurnscaldNorthGate 2,-1,008-1.gat,78,48 -- cgit v1.2.3-60-g2f50