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/001-1_Tulimshar/_warps.txt | 14 ++--- npc/009-1_Hurnscald/_warps.txt | 27 +++++----- npc/009-2_Hurnscald/_warps.txt | 41 +++++++-------- npc/011-3_Hermits_cave/_warps.txt | 6 +-- npc/011-4_Lake_cave/_warps.txt | 7 --- npc/027-1_Graveyard/_warps.txt | 1 + npc/027-2_Caretakers_House/_import.txt | 15 +++--- npc/027-2_Caretakers_House/_warps.txt | 21 -------- npc/027-3_Crypt/_import.txt | 14 ++--- npc/027-3_Crypt/_mobs.txt | 10 ++-- npc/027-3_Crypt/_warps.txt | 8 ++- npc/027-4_Inner_Chamber/_import.txt | 3 ++ npc/027-4_Inner_Chamber/_mobs.txt | 7 +++ npc/027-4_Inner_Chamber/_warps.txt | 3 ++ npc/_import.txt | 72 ++------------------------ npc/debugroom_Woodland_mining_camp/_import.txt | 3 ++ npc/debugroom_Woodland_mining_camp/_mobs.txt | 7 +++ npc/debugroom_Woodland_mining_camp/_warps.txt | 2 + 18 files changed, 97 insertions(+), 164 deletions(-) create mode 100644 npc/027-4_Inner_Chamber/_import.txt create mode 100644 npc/027-4_Inner_Chamber/_mobs.txt create mode 100644 npc/027-4_Inner_Chamber/_warps.txt create mode 100644 npc/debugroom_Woodland_mining_camp/_import.txt create mode 100644 npc/debugroom_Woodland_mining_camp/_mobs.txt create mode 100644 npc/debugroom_Woodland_mining_camp/_warps.txt (limited to 'npc') diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt index 4e293337..e3778fff 100644 --- a/npc/001-1_Tulimshar/_warps.txt +++ b/npc/001-1_Tulimshar/_warps.txt @@ -1,7 +1,7 @@ -// 001-1 Tulimshar warps - -001-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17 -001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145 -001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146 -001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 -001-1.gat,75,41 warp ToHouse -1,-1,001-4.gat,26,33 +// 001-1 Tulimshar warps + +001-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17 +001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145 +001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146 +001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 +001-1.gat,75,41 warp ToHouse -1,-1,001-4.gat,26,33 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 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 diff --git a/npc/011-3_Hermits_cave/_warps.txt b/npc/011-3_Hermits_cave/_warps.txt index b2efd78b..be9b6a83 100644 --- a/npc/011-3_Hermits_cave/_warps.txt +++ b/npc/011-3_Hermits_cave/_warps.txt @@ -1,3 +1,3 @@ -// 011-3 Hermit's cave warps - -011-3.gat,31,21 warp ToLakeCave -1,-1,011-4.gat,72,10 +// 011-3 Hermit's cave warps + +011-3.gat,31,21 warp ToLakeCave -1,-1,011-4.gat,72,11 diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4_Lake_cave/_warps.txt index a6df0623..7f1c1b2a 100644 --- a/npc/011-4_Lake_cave/_warps.txt +++ b/npc/011-4_Lake_cave/_warps.txt @@ -1,9 +1,3 @@ -<<<<<<< HEAD -// 011-4 Lake cave warps - -011-4.gat,73,8 warp ToHermitsCave 0,-1,011-3.gat,31,23 -011-4.gat,129,86 warp ToCaveBeneathHurnscald -1,-1,009-3.gat,21,55 -======= // 011-4 Lake cave warps 011-4.gat,73,8 warp ToHermitsCave 0,-1,011-3.gat,31,24 @@ -17,4 +11,3 @@ 011-4.gat,62,86 warp warp -1,-1,011-6.gat,68,233 011-4.gat,32,5 warp warp 0,-1,011-6.gat,186,180 011-4.gat,45,118 warp warp -1,-1,011-6.gat,266,180 ->>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b diff --git a/npc/027-1_Graveyard/_warps.txt b/npc/027-1_Graveyard/_warps.txt index dbd01d2f..5667ad16 100644 --- a/npc/027-1_Graveyard/_warps.txt +++ b/npc/027-1_Graveyard/_warps.txt @@ -2,3 +2,4 @@ 027-1.gat,88,84 warp toCaretaker's -1,-1,027-2.gat,26,32 027-1.gat,63,106 warp toSwamp -1,-1,026-1.gat,63,17 +027-1.gat,28,67 warp toCrypt -1,-1,027-3.gat,40,70 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 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 diff --git a/npc/027-4_Inner_Chamber/_import.txt b/npc/027-4_Inner_Chamber/_import.txt new file mode 100644 index 00000000..460e6396 --- /dev/null +++ b/npc/027-4_Inner_Chamber/_import.txt @@ -0,0 +1,3 @@ +map: 027-4.gat +npc: npc/027-4_Inner_Chamber/_mobs.txt +npc: npc/027-4_Inner_Chamber/_warps.txt diff --git a/npc/027-4_Inner_Chamber/_mobs.txt b/npc/027-4_Inner_Chamber/_mobs.txt new file mode 100644 index 00000000..e2c36ab5 --- /dev/null +++ b/npc/027-4_Inner_Chamber/_mobs.txt @@ -0,0 +1,7 @@ +// 027-4 Inner Chamber mobs + + + +027-4.gat,0,0,0 script Mob027-4 -1,{ + end; +} diff --git a/npc/027-4_Inner_Chamber/_warps.txt b/npc/027-4_Inner_Chamber/_warps.txt new file mode 100644 index 00000000..b6adf1f4 --- /dev/null +++ b/npc/027-4_Inner_Chamber/_warps.txt @@ -0,0 +1,3 @@ +// 027-4 Inner Chamber warps + +027-4.gat,37,19 warp toCryptLevel1 1,-1,027-3.gat,127,42 diff --git a/npc/_import.txt b/npc/_import.txt index be7341a3..94929c05 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,70 +1,3 @@ -<<<<<<< HEAD -import: npc/001-1_Tulimshar/_import.txt -import: npc/001-2_Tulimshar/_import.txt -import: npc/001-3_Tulimshar_arena/_import.txt -import: npc/001-4_Omars_house/_import.txt -import: npc/002-1_Sandstorm/_import.txt -import: npc/002-3_Desert_mines/_import.txt -import: npc/002-4_Desert_mines/_import.txt -import: npc/003-1_Beach/_import.txt -import: npc/003-2_Beach_House/_import.txt -import: npc/004-1_Beach/_import.txt -import: npc/004-2_Beach_House/_import.txt -import: npc/005-1_Snake_desert/_import.txt -import: npc/005-3_Snake_pit/_import.txt -import: npc/006-1_Desert_mountains/_import.txt -import: npc/006-3_Desert_mountain_caves/_import.txt -import: npc/007-1_Woodland/_import.txt -import: npc/008-1_Hurnscald_outskirts/_import.txt -import: npc/009-1_Hurnscald/_import.txt -import: npc/009-2_Hurnscald/_import.txt -import: npc/009-3_Cave_beneath_Hurnscald/_import.txt -import: npc/010-1_Woodland/_import.txt -import: npc/010-2_Dimonds_Cove/_import.txt -import: npc/011-1_Woodland/_import.txt -import: npc/011-3_Hermits_cave/_import.txt -import: npc/011-4_Lake_cave/_import.txt -import: npc/011-5/_import.txt -import: npc/012-1_Woodland_Hills/_import.txt -import: npc/012-3_Cave/_import.txt -import: npc/012-4_Cave/_import.txt -import: npc/013-1_Woodland_hills/_import.txt -import: npc/013-2_Magic_house/_import.txt -import: npc/013-3_Cave/_import.txt -import: npc/014-1_Woodland/_import.txt -import: npc/014-3_Cave/_import.txt -import: npc/015-1_Woodland/_import.txt -import: npc/015-3_Cave/_import.txt -import: npc/016-1_Woodland/_import.txt -import: npc/017-1_Woodland_hills/_import.txt -import: npc/017-2_Theater/_import.txt -import: npc/017-9_Backstage/_import.txt -import: npc/018-1_Woodland_mining_camp/_import.txt -import: npc/018-2_Woodland_mining_camp/_import.txt -import: npc/018-3_Cave/_import.txt -import: npc/019-1_Snow_field/_import.txt -import: npc/020-1_Nivalis/_import.txt -import: npc/020-2_Nivalis/_import.txt -import: npc/020-3_Ice_cave/_import.txt -import: npc/020-4_Ice_cave/_import.txt -import: npc/021-1_Tulimshar/_import.txt -import: npc/021-2_Tulimshar/_import.txt -import: npc/022-1_Tulimshar/_import.txt -import: npc/024-1_Tulimshar_Canyon/_import.txt -import: npc/024-2_Tulimshar_Magic_School/_import.txt -import: npc/025-1_Woodland_Swamp/_import.txt -import: npc/026-1_Swamp/_import.txt -import: npc/027-1_Graveyard/_import.txt -import: npc/027-2_Caretakers_House/_import.txt -import: npc/027-3_Crypt/_import.txt -import: npc/027-4_Reaper/_import.txt -import: npc/028-1/_import.txt -import: npc/028-3/_import.txt -import: npc/029-1_Candor/_import.txt -import: npc/029-3_Fight_Cave/_import.txt -import: npc/botcheck/_import.txt -import: npc/debugroom/_import.txt -======= import: npc/001-1_Tulimshar/_import.txt import: npc/001-2_Tulimshar/_import.txt import: npc/001-3_Tulimshar_arena/_import.txt @@ -124,7 +57,8 @@ import: npc/025-1_Woodland_Swamp/_import.txt import: npc/026-1_Swamp/_import.txt import: npc/027-1_Graveyard/_import.txt import: npc/027-2_Caretakers_House/_import.txt -import: npc/027-3/_import.txt +import: npc/027-3_Crypt/_import.txt +import: npc/027-4_Inner_Chamber/_import.txt import: npc/028-1/_import.txt import: npc/028-3/_import.txt import: npc/029-1_Candor/_import.txt @@ -136,4 +70,4 @@ import: npc/031-3_Cave/_import.txt import: npc/032-1_Outback/_import.txt import: npc/032-3_Cave/_import.txt import: npc/botcheck/_import.txt ->>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b +import: npc/debugroom_Woodland_mining_camp/_import.txt diff --git a/npc/debugroom_Woodland_mining_camp/_import.txt b/npc/debugroom_Woodland_mining_camp/_import.txt new file mode 100644 index 00000000..1a0603ae --- /dev/null +++ b/npc/debugroom_Woodland_mining_camp/_import.txt @@ -0,0 +1,3 @@ +map: debugroom.gat +npc: npc/debugroom_Woodland_mining_camp/_mobs.txt +npc: npc/debugroom_Woodland_mining_camp/_warps.txt diff --git a/npc/debugroom_Woodland_mining_camp/_mobs.txt b/npc/debugroom_Woodland_mining_camp/_mobs.txt new file mode 100644 index 00000000..f9413155 --- /dev/null +++ b/npc/debugroom_Woodland_mining_camp/_mobs.txt @@ -0,0 +1,7 @@ +// debugroom Woodland mining camp mobs + + + +debugroom.gat,0,0,0 script Mobdebugroom -1,{ + end; +} diff --git a/npc/debugroom_Woodland_mining_camp/_warps.txt b/npc/debugroom_Woodland_mining_camp/_warps.txt new file mode 100644 index 00000000..6980cf8e --- /dev/null +++ b/npc/debugroom_Woodland_mining_camp/_warps.txt @@ -0,0 +1,2 @@ +// debugroom Woodland mining camp warps + -- cgit v1.2.3-70-g09d2