From e2b7d162b4d155a7393331db71cc31713499a312 Mon Sep 17 00:00:00 2001 From: Fate Date: Fri, 21 Nov 2008 22:51:17 -0700 Subject: Re-built imports to exclude obsolete ones --- npc/001-1_Tulimshar/_import.txt | 28 ++++++------ npc/001-2_Tulimshar/_import.txt | 8 ++-- npc/002-1_Sandstorm/_import.txt | 6 +-- npc/002-3_Desert_mines/_import.txt | 3 +- npc/002-4_Desert_mines/_import.txt | 3 +- npc/005-1_Snake_desert/_import.txt | 2 +- npc/006-1_Desert_mountains/_import.txt | 2 +- npc/008-1_Hurnscald_outskirts/_import.txt | 2 +- npc/009-1_Hurnscald/_import.txt | 8 ++-- npc/009-2_Hurnscald/_import.txt | 18 ++++---- npc/010-2_Dimond's_Cove/_import.txt | 4 +- npc/011-1_Woodland/_import.txt | 4 +- npc/011-3_Hermit's_cave/_import.txt | 2 +- npc/012-1_Woodland_Hills/_import.txt | 2 +- npc/018-1_Woodland_mining_camp/_import.txt | 2 +- npc/018-2_Woodland_minning_camp/_import.txt | 8 ++-- npc/019-1_Snow_field/_import.txt | 4 +- npc/020-1/_import.txt | 6 +-- npc/020-2/_import.txt | 2 +- npc/_import.txt | 66 ++++++++++++++--------------- 20 files changed, 89 insertions(+), 91 deletions(-) diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt index 7c475922..5aad5934 100644 --- a/npc/001-1_Tulimshar/_import.txt +++ b/npc/001-1_Tulimshar/_import.txt @@ -1,22 +1,22 @@ map: 001-1.gat +npc: npc/001-1_Tulimshar/merchant.txt +npc: npc/001-1_Tulimshar/bleacher.txt +npc: npc/001-1_Tulimshar/elanore.txt +npc: npc/001-1_Tulimshar/constable.txt npc: npc/001-1_Tulimshar/workers.txt -npc: npc/001-1_Tulimshar/vincent.txt -npc: npc/001-1_Tulimshar/soul-menhir.txt -npc: npc/001-1_Tulimshar/sandra.txt -npc: npc/001-1_Tulimshar/rules.txt npc: npc/001-1_Tulimshar/rewards_master.txt -npc: npc/001-1_Tulimshar/monsters.txt -npc: npc/001-1_Tulimshar/monster_guide.txt -npc: npc/001-1_Tulimshar/merchant.txt -npc: npc/001-1_Tulimshar/man.txt +npc: npc/001-1_Tulimshar/soul-menhir.txt npc: npc/001-1_Tulimshar/guide.txt +npc: npc/001-1_Tulimshar/monsters.txt npc: npc/001-1_Tulimshar/guards.txt -npc: npc/001-1_Tulimshar/elanore.txt -npc: npc/001-1_Tulimshar/constable.txt -npc: npc/001-1_Tulimshar/children.txt -npc: npc/001-1_Tulimshar/bleacher.txt -npc: npc/001-1_Tulimshar/bard.txt npc: npc/001-1_Tulimshar/barber.txt -npc: npc/001-1_Tulimshar/banker.txt +npc: npc/001-1_Tulimshar/bard.txt npc: npc/001-1_Tulimshar/_warps.txt npc: npc/001-1_Tulimshar/_mobs.txt +npc: npc/001-1_Tulimshar/man.txt +npc: npc/001-1_Tulimshar/vincent.txt +npc: npc/001-1_Tulimshar/monster_guide.txt +npc: npc/001-1_Tulimshar/sandra.txt +npc: npc/001-1_Tulimshar/rules.txt +npc: npc/001-1_Tulimshar/banker.txt +npc: npc/001-1_Tulimshar/children.txt diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt index 15ecfe64..8e4299a0 100644 --- a/npc/001-2_Tulimshar/_import.txt +++ b/npc/001-2_Tulimshar/_import.txt @@ -1,8 +1,8 @@ map: 001-2.gat -npc: npc/001-2_Tulimshar/troupe_leader.txt npc: npc/001-2_Tulimshar/shops.txt -npc: npc/001-2_Tulimshar/phaet.txt -npc: npc/001-2_Tulimshar/omar.txt -npc: npc/001-2_Tulimshar/casino.txt npc: npc/001-2_Tulimshar/_warps.txt npc: npc/001-2_Tulimshar/_mobs.txt +npc: npc/001-2_Tulimshar/casino.txt +npc: npc/001-2_Tulimshar/phaet.txt +npc: npc/001-2_Tulimshar/omar.txt +npc: npc/001-2_Tulimshar/troupe_leader.txt diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt index 4697808e..081efc41 100644 --- a/npc/002-1_Sandstorm/_import.txt +++ b/npc/002-1_Sandstorm/_import.txt @@ -1,8 +1,8 @@ map: 002-1.gat -npc: npc/002-1_Sandstorm/rogue.txt -npc: npc/002-1_Sandstorm/nomads.txt -npc: npc/002-1_Sandstorm/monsters.txt npc: npc/002-1_Sandstorm/merchant.txt npc: npc/002-1_Sandstorm/dark_mage.txt +npc: npc/002-1_Sandstorm/nomads.txt +npc: npc/002-1_Sandstorm/rogue.txt +npc: npc/002-1_Sandstorm/monsters.txt npc: npc/002-1_Sandstorm/_warps.txt npc: npc/002-1_Sandstorm/_mobs.txt diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt index 8cb14224..0a67b2bb 100644 --- a/npc/002-3_Desert_mines/_import.txt +++ b/npc/002-3_Desert_mines/_import.txt @@ -1,5 +1,4 @@ map: 002-3.gat -npc: npc/002-3_Desert_mines/monsters.txt -npc: npc/002-3_Desert_mines/miners.txt npc: npc/002-3_Desert_mines/_warps.txt npc: npc/002-3_Desert_mines/_mobs.txt +npc: npc/002-3_Desert_mines/miners.txt diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt index 5d87397b..2fe848bb 100644 --- a/npc/002-4_Desert_mines/_import.txt +++ b/npc/002-4_Desert_mines/_import.txt @@ -1,6 +1,5 @@ map: 002-4.gat -npc: npc/002-4_Desert_mines/miners.txt npc: npc/002-4_Desert_mines/monsters.txt -npc: npc/002-4_Desert_mines/chest.txt npc: npc/002-4_Desert_mines/_warps.txt npc: npc/002-4_Desert_mines/_mobs.txt +npc: npc/002-4_Desert_mines/chest.txt diff --git a/npc/005-1_Snake_desert/_import.txt b/npc/005-1_Snake_desert/_import.txt index 88bd9e5d..1e044ebb 100644 --- a/npc/005-1_Snake_desert/_import.txt +++ b/npc/005-1_Snake_desert/_import.txt @@ -1,5 +1,5 @@ map: 005-1.gat -npc: npc/005-1_Snake_desert/npcs.txt npc: npc/005-1_Snake_desert/monsters.txt +npc: npc/005-1_Snake_desert/npcs.txt npc: npc/005-1_Snake_desert/_warps.txt npc: npc/005-1_Snake_desert/_mobs.txt diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt index 607997ed..f9b8cbc5 100644 --- a/npc/006-1_Desert_mountains/_import.txt +++ b/npc/006-1_Desert_mountains/_import.txt @@ -1,6 +1,6 @@ map: 006-1.gat npc: npc/006-1_Desert_mountains/pachua.txt npc: npc/006-1_Desert_mountains/monsters.txt -npc: npc/006-1_Desert_mountains/mika.txt npc: npc/006-1_Desert_mountains/_warps.txt npc: npc/006-1_Desert_mountains/_mobs.txt +npc: npc/006-1_Desert_mountains/mika.txt diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt index a734d9f3..4b580a56 100644 --- a/npc/008-1_Hurnscald_outskirts/_import.txt +++ b/npc/008-1_Hurnscald_outskirts/_import.txt @@ -1,6 +1,6 @@ map: 008-1.gat -npc: npc/008-1_Hurnscald_outskirts/monsters.txt npc: npc/008-1_Hurnscald_outskirts/hinnak.txt +npc: npc/008-1_Hurnscald_outskirts/monsters.txt npc: npc/008-1_Hurnscald_outskirts/george.txt npc: npc/008-1_Hurnscald_outskirts/_warps.txt npc: npc/008-1_Hurnscald_outskirts/_mobs.txt diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt index 94bf97b6..30460185 100644 --- a/npc/009-1_Hurnscald/_import.txt +++ b/npc/009-1_Hurnscald/_import.txt @@ -1,9 +1,9 @@ map: 009-1.gat npc: npc/009-1_Hurnscald/soul-menhir.txt -npc: npc/009-1_Hurnscald/sabine.txt -npc: npc/009-1_Hurnscald/old_woman.txt -npc: npc/009-1_Hurnscald/old_man.txt -npc: npc/009-1_Hurnscald/milly.txt npc: npc/009-1_Hurnscald/jack.txt +npc: npc/009-1_Hurnscald/old_man.txt npc: npc/009-1_Hurnscald/_warps.txt npc: npc/009-1_Hurnscald/_mobs.txt +npc: npc/009-1_Hurnscald/sabine.txt +npc: npc/009-1_Hurnscald/milly.txt +npc: npc/009-1_Hurnscald/old_woman.txt diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt index 84ddc0a2..09ac6fb5 100644 --- a/npc/009-2_Hurnscald/_import.txt +++ b/npc/009-2_Hurnscald/_import.txt @@ -1,15 +1,15 @@ map: 009-2.gat +npc: npc/009-2_Hurnscald/nicholas.txt +npc: npc/009-2_Hurnscald/alan.txt +npc: npc/009-2_Hurnscald/doctor.txt npc: npc/009-2_Hurnscald/waitress.txt npc: npc/009-2_Hurnscald/shops.txt -npc: npc/009-2_Hurnscald/selim.txt -npc: npc/009-2_Hurnscald/richard.txt -npc: npc/009-2_Hurnscald/nurse.txt -npc: npc/009-2_Hurnscald/nicholas.txt -npc: npc/009-2_Hurnscald/misc.txt npc: npc/009-2_Hurnscald/kfahr.txt -npc: npc/009-2_Hurnscald/inspector.txt -npc: npc/009-2_Hurnscald/drunks.txt -npc: npc/009-2_Hurnscald/doctor.txt -npc: npc/009-2_Hurnscald/alan.txt npc: npc/009-2_Hurnscald/_warps.txt npc: npc/009-2_Hurnscald/_mobs.txt +npc: npc/009-2_Hurnscald/misc.txt +npc: npc/009-2_Hurnscald/drunks.txt +npc: npc/009-2_Hurnscald/nurse.txt +npc: npc/009-2_Hurnscald/richard.txt +npc: npc/009-2_Hurnscald/selim.txt +npc: npc/009-2_Hurnscald/inspector.txt diff --git a/npc/010-2_Dimond's_Cove/_import.txt b/npc/010-2_Dimond's_Cove/_import.txt index 0ffbdeed..d6dce5d1 100644 --- a/npc/010-2_Dimond's_Cove/_import.txt +++ b/npc/010-2_Dimond's_Cove/_import.txt @@ -1,7 +1,7 @@ map: 010-2.gat -npc: npc/010-2_Dimond's_Cove/workers.txt npc: npc/010-2_Dimond's_Cove/loratay.txt +npc: npc/010-2_Dimond's_Cove/workers.txt npc: npc/010-2_Dimond's_Cove/doug.txt -npc: npc/010-2_Dimond's_Cove/dimonds.txt npc: npc/010-2_Dimond's_Cove/_warps.txt npc: npc/010-2_Dimond's_Cove/_mobs.txt +npc: npc/010-2_Dimond's_Cove/dimonds.txt diff --git a/npc/011-1_Woodland/_import.txt b/npc/011-1_Woodland/_import.txt index 2afbca54..94c4f6c9 100644 --- a/npc/011-1_Woodland/_import.txt +++ b/npc/011-1_Woodland/_import.txt @@ -1,6 +1,6 @@ map: 011-1.gat -npc: npc/011-1_Woodland/oscar.txt -npc: npc/011-1_Woodland/monsters.txt npc: npc/011-1_Woodland/alchemist.txt +npc: npc/011-1_Woodland/monsters.txt npc: npc/011-1_Woodland/_warps.txt +npc: npc/011-1_Woodland/oscar.txt npc: npc/011-1_Woodland/_mobs.txt diff --git a/npc/011-3_Hermit's_cave/_import.txt b/npc/011-3_Hermit's_cave/_import.txt index 08b2f921..f97408df 100644 --- a/npc/011-3_Hermit's_cave/_import.txt +++ b/npc/011-3_Hermit's_cave/_import.txt @@ -1,5 +1,5 @@ map: 011-3.gat -npc: npc/011-3_Hermit's_cave/monsters.txt npc: npc/011-3_Hermit's_cave/hermit.txt +npc: npc/011-3_Hermit's_cave/monsters.txt npc: npc/011-3_Hermit's_cave/_warps.txt npc: npc/011-3_Hermit's_cave/_mobs.txt diff --git a/npc/012-1_Woodland_Hills/_import.txt b/npc/012-1_Woodland_Hills/_import.txt index 178bca3f..0b283c90 100644 --- a/npc/012-1_Woodland_Hills/_import.txt +++ b/npc/012-1_Woodland_Hills/_import.txt @@ -1,5 +1,5 @@ map: 012-1.gat -npc: npc/012-1_Woodland_Hills/shops.txt npc: npc/012-1_Woodland_Hills/monsters.txt +npc: npc/012-1_Woodland_Hills/shops.txt npc: npc/012-1_Woodland_Hills/_warps.txt npc: npc/012-1_Woodland_Hills/_mobs.txt diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt index c8cd0a44..38e14457 100644 --- a/npc/018-1_Woodland_mining_camp/_import.txt +++ b/npc/018-1_Woodland_mining_camp/_import.txt @@ -1,5 +1,5 @@ map: 018-1.gat npc: npc/018-1_Woodland_mining_camp/monsters.txt -npc: npc/018-1_Woodland_mining_camp/miners.txt npc: npc/018-1_Woodland_mining_camp/_warps.txt npc: npc/018-1_Woodland_mining_camp/_mobs.txt +npc: npc/018-1_Woodland_mining_camp/miners.txt diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt index 0f2ce698..247fe1d3 100644 --- a/npc/018-2_Woodland_minning_camp/_import.txt +++ b/npc/018-2_Woodland_minning_camp/_import.txt @@ -1,9 +1,9 @@ map: 018-2.gat -npc: npc/018-2_Woodland_minning_camp/receptionist.txt -npc: npc/018-2_Woodland_minning_camp/monsters.txt -npc: npc/018-2_Woodland_minning_camp/miners.txt -npc: npc/018-2_Woodland_minning_camp/caul.txt npc: npc/018-2_Woodland_minning_camp/books.txt npc: npc/018-2_Woodland_minning_camp/angus.txt +npc: npc/018-2_Woodland_minning_camp/monsters.txt npc: npc/018-2_Woodland_minning_camp/_warps.txt npc: npc/018-2_Woodland_minning_camp/_mobs.txt +npc: npc/018-2_Woodland_minning_camp/receptionist.txt +npc: npc/018-2_Woodland_minning_camp/miners.txt +npc: npc/018-2_Woodland_minning_camp/caul.txt diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt index 3db5780c..0b6958a8 100644 --- a/npc/019-1_Snow_field/_import.txt +++ b/npc/019-1_Snow_field/_import.txt @@ -1,7 +1,7 @@ map: 019-1.gat -npc: npc/019-1_Snow_field/taro.txt npc: npc/019-1_Snow_field/snowman.txt -npc: npc/019-1_Snow_field/santa.txt +npc: npc/019-1_Snow_field/taro.txt npc: npc/019-1_Snow_field/monsters.txt +npc: npc/019-1_Snow_field/santa.txt npc: npc/019-1_Snow_field/_warps.txt npc: npc/019-1_Snow_field/_mobs.txt diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt index bae7c91f..c6c4d3b5 100644 --- a/npc/020-1/_import.txt +++ b/npc/020-1/_import.txt @@ -1,8 +1,8 @@ map: 020-1.gat -npc: npc/020-1/startrek.txt -npc: npc/020-1/soul-menhir.txt +npc: npc/020-1/amrak.txt npc: npc/020-1/sexchanger.txt +npc: npc/020-1/soul-menhir.txt npc: npc/020-1/monsters.txt -npc: npc/020-1/amrak.txt npc: npc/020-1/_warps.txt npc: npc/020-1/_mobs.txt +npc: npc/020-1/startrek.txt diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt index 2190955a..b49bb059 100644 --- a/npc/020-2/_import.txt +++ b/npc/020-2/_import.txt @@ -1,5 +1,5 @@ map: 020-2.gat -npc: npc/020-2/shops.txt npc: npc/020-2/furquest.txt +npc: npc/020-2/shops.txt npc: npc/020-2/_warps.txt npc: npc/020-2/_mobs.txt diff --git a/npc/_import.txt b/npc/_import.txt index 7a74dfed..bb22ec47 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,41 +1,41 @@ -import: npc/001-1_Tulimshar/_import.txt -import: npc/001-2_Tulimshar/_import.txt -import: npc/001-3_Tulimshar_arena/_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/004-1_Beach/_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/020-3_Ice_cave/_import.txt +import: npc/018-1_Woodland_mining_camp/_import.txt +import: npc/012-3_Cave/_import.txt +import: npc/010-2_Dimond's_Cove/_import.txt +import: npc/009-3_Cave_beneath_Hurnscald/_import.txt +import: npc/020-2/_import.txt +import: npc/018-3_Cave/_import.txt +import: npc/008-1_Hurnscald_outskirts/_import.txt import: npc/006-3_Desert_mountain_caves/_import.txt +import: npc/019-1_Snow_field/_import.txt +import: npc/001-3_Tulimshar_arena/_import.txt +import: npc/020-1/_import.txt +import: npc/002-2/_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/013-1_Woodland_hills/_import.txt +import: npc/016-1_Woodland/_import.txt import: npc/010-1_Woodland/_import.txt -import: npc/010-2_Dimond's_Cove/_import.txt -import: npc/011-1_Woodland/_import.txt -import: npc/011-3_Hermit's_cave/_import.txt +import: npc/014-1_Woodland/_import.txt +import: npc/004-1_Beach/_import.txt +import: npc/005-1_Snake_desert/_import.txt +import: npc/002-1_Sandstorm/_import.txt +import: npc/018-2_Woodland_minning_camp/_import.txt import: npc/011-4_Lake_cave/_import.txt -import: npc/012-1_Woodland_Hills/_import.txt -import: npc/012-3_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/003-1_Beach/_import.txt import: npc/015-1_Woodland/_import.txt -import: npc/016-1_Woodland/_import.txt +import: npc/005-3_Snake_pit/_import.txt +import: npc/014-3_Cave/_import.txt +import: npc/011-3_Hermit's_cave/_import.txt import: npc/017-1_Woodland_hills/_import.txt -import: npc/018-1_Woodland_mining_camp/_import.txt -import: npc/018-2_Woodland_minning_camp/_import.txt -import: npc/018-3_Cave/_import.txt -import: npc/019-1_Snow_field/_import.txt -import: npc/020-1/_import.txt -import: npc/020-2/_import.txt -import: npc/020-3_Ice_cave/_import.txt +import: npc/001-2_Tulimshar/_import.txt +import: npc/009-2_Hurnscald/_import.txt +import: npc/012-1_Woodland_Hills/_import.txt +import: npc/001-1_Tulimshar/_import.txt +import: npc/002-4_Desert_mines/_import.txt +import: npc/013-3_Cave/_import.txt +import: npc/009-1_Hurnscald/_import.txt +import: npc/006-1_Desert_mountains/_import.txt import: npc/020-4_Ice_cave/_import.txt -import: npc/021-1_Tulimshar/_import.txt +import: npc/002-3_Desert_mines/_import.txt +import: npc/011-1_Woodland/_import.txt -- cgit v1.2.3-60-g2f50