summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/004-1_Beach/_warps.txt2
-rw-r--r--npc/004-2_Beach_House/_import.txt3
-rw-r--r--npc/004-2_Beach_House/_mobs.txt7
-rw-r--r--npc/004-2_Beach_House/_warps.txt10
-rw-r--r--npc/020-1/_import.txt8
-rw-r--r--npc/020-1_Nivalis/_import.txt8
-rw-r--r--npc/020-1_Nivalis/_mobs.txt (renamed from npc/020-1/_mobs.txt)2
-rw-r--r--npc/020-1_Nivalis/_warps.txt (renamed from npc/020-1/_warps.txt)2
-rw-r--r--npc/020-1_Nivalis/amrak.txt (renamed from npc/020-1/amrak.txt)0
-rw-r--r--npc/020-1_Nivalis/monsters.txt (renamed from npc/020-1/monsters.txt)0
-rw-r--r--npc/020-1_Nivalis/sexchanger.txt (renamed from npc/020-1/sexchanger.txt)0
-rw-r--r--npc/020-1_Nivalis/soul-menhir.txt (renamed from npc/020-1/soul-menhir.txt)0
-rw-r--r--npc/020-1_Nivalis/startrek.txt (renamed from npc/020-1/startrek.txt)0
-rw-r--r--npc/020-2/_import.txt5
-rw-r--r--npc/020-2_Nivalis/_import.txt5
-rw-r--r--npc/020-2_Nivalis/_mobs.txt (renamed from npc/020-2/_mobs.txt)2
-rw-r--r--npc/020-2_Nivalis/_warps.txt (renamed from npc/020-2/_warps.txt)2
-rw-r--r--npc/020-2_Nivalis/furquest.txt (renamed from npc/020-2/furquest.txt)0
-rw-r--r--npc/020-2_Nivalis/shops.txt (renamed from npc/020-2/shops.txt)0
-rw-r--r--npc/021-1_Tulimshar/_warps.txt3
-rw-r--r--npc/_import.txt8
21 files changed, 45 insertions, 22 deletions
diff --git a/npc/004-1_Beach/_warps.txt b/npc/004-1_Beach/_warps.txt
index b6ccc7d0..97af769d 100644
--- a/npc/004-1_Beach/_warps.txt
+++ b/npc/004-1_Beach/_warps.txt
@@ -2,3 +2,5 @@
004-1.gat,84,113 warp ToSandstorm 1,-1,002-1.gat,29,15
004-1.gat,37,111 warp ToBeach 1,-1,003-1.gat,141,21
+004-1.gat,80,31 warp ToHouse -1,-1,004-2.gat,21,28
+004-1.gat,86,27 warp To2ndFloor -1,-1,004-2.gat,57,65
diff --git a/npc/004-2_Beach_House/_import.txt b/npc/004-2_Beach_House/_import.txt
new file mode 100644
index 00000000..32725dc8
--- /dev/null
+++ b/npc/004-2_Beach_House/_import.txt
@@ -0,0 +1,3 @@
+map: 004-2.gat
+npc: npc/004-2_Beach_House/_mobs.txt
+npc: npc/004-2_Beach_House/_warps.txt
diff --git a/npc/004-2_Beach_House/_mobs.txt b/npc/004-2_Beach_House/_mobs.txt
new file mode 100644
index 00000000..fada1e0d
--- /dev/null
+++ b/npc/004-2_Beach_House/_mobs.txt
@@ -0,0 +1,7 @@
+// 004-2 Beach House mobs
+
+
+
+004-2.gat,0,0,0 script Mob004-2 -1,{
+ end;
+}
diff --git a/npc/004-2_Beach_House/_warps.txt b/npc/004-2_Beach_House/_warps.txt
new file mode 100644
index 00000000..8a1e4047
--- /dev/null
+++ b/npc/004-2_Beach_House/_warps.txt
@@ -0,0 +1,10 @@
+// 004-2 Beach House warps
+
+004-2.gat,39,20 warp ToRoom 0,-1,004-2.gat,75,29
+004-2.gat,75,30 warp ToRoom 0,-1,004-2.gat,38,21
+004-2.gat,21,29 warp ToOutside -1,-1,004-1.gat,80,32
+004-2.gat,62,28 warp ToBasement -1,-1,004-2.gat,21,62
+004-2.gat,20,62 warp To1stFloor -1,-1,004-2.gat,63,28
+004-2.gat,68,66 warp To1stFloor 0,-1,004-2.gat,35,21
+004-2.gat,36,20 warp To2ndFloor 0,-1,004-2.gat,68,65
+004-2.gat,57,66 warp ToOutside -1,-1,004-1.gat,86,28
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
deleted file mode 100644
index 2565ac9d..00000000
--- a/npc/020-1/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-map: 020-1.gat
-npc: npc/020-1/_mobs.txt
-npc: npc/020-1/_warps.txt
-npc: npc/020-1/amrak.txt
-npc: npc/020-1/monsters.txt
-npc: npc/020-1/sexchanger.txt
-npc: npc/020-1/soul-menhir.txt
-npc: npc/020-1/startrek.txt
diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt
new file mode 100644
index 00000000..440060d8
--- /dev/null
+++ b/npc/020-1_Nivalis/_import.txt
@@ -0,0 +1,8 @@
+map: 020-1.gat
+npc: npc/020-1_Nivalis/_mobs.txt
+npc: npc/020-1_Nivalis/_warps.txt
+npc: npc/020-1_Nivalis/amrak.txt
+npc: npc/020-1_Nivalis/monsters.txt
+npc: npc/020-1_Nivalis/sexchanger.txt
+npc: npc/020-1_Nivalis/soul-menhir.txt
+npc: npc/020-1_Nivalis/startrek.txt
diff --git a/npc/020-1/_mobs.txt b/npc/020-1_Nivalis/_mobs.txt
index fa94c232..64a7e46c 100644
--- a/npc/020-1/_mobs.txt
+++ b/npc/020-1_Nivalis/_mobs.txt
@@ -1,4 +1,4 @@
-// 020-1 mobs
+// 020-1 Nivalis mobs
diff --git a/npc/020-1/_warps.txt b/npc/020-1_Nivalis/_warps.txt
index 36e0449a..c9578dfc 100644
--- a/npc/020-1/_warps.txt
+++ b/npc/020-1_Nivalis/_warps.txt
@@ -1,4 +1,4 @@
-// 020-1 warps
+// 020-1 Nivalis warps
020-1.gat,76,38 warp ToIceCave 1,-1,020-3.gat,31,28
020-1.gat,47,48 warp ToClothesShop -1,-1,020-2.gat,25,33
diff --git a/npc/020-1/amrak.txt b/npc/020-1_Nivalis/amrak.txt
index 19979ca0..19979ca0 100644
--- a/npc/020-1/amrak.txt
+++ b/npc/020-1_Nivalis/amrak.txt
diff --git a/npc/020-1/monsters.txt b/npc/020-1_Nivalis/monsters.txt
index fc33da8c..fc33da8c 100644
--- a/npc/020-1/monsters.txt
+++ b/npc/020-1_Nivalis/monsters.txt
diff --git a/npc/020-1/sexchanger.txt b/npc/020-1_Nivalis/sexchanger.txt
index 168f47a3..168f47a3 100644
--- a/npc/020-1/sexchanger.txt
+++ b/npc/020-1_Nivalis/sexchanger.txt
diff --git a/npc/020-1/soul-menhir.txt b/npc/020-1_Nivalis/soul-menhir.txt
index 3d0bc82a..3d0bc82a 100644
--- a/npc/020-1/soul-menhir.txt
+++ b/npc/020-1_Nivalis/soul-menhir.txt
diff --git a/npc/020-1/startrek.txt b/npc/020-1_Nivalis/startrek.txt
index 5c8847ad..5c8847ad 100644
--- a/npc/020-1/startrek.txt
+++ b/npc/020-1_Nivalis/startrek.txt
diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt
deleted file mode 100644
index f71241f7..00000000
--- a/npc/020-2/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-map: 020-2.gat
-npc: npc/020-2/_mobs.txt
-npc: npc/020-2/_warps.txt
-npc: npc/020-2/furquest.txt
-npc: npc/020-2/shops.txt
diff --git a/npc/020-2_Nivalis/_import.txt b/npc/020-2_Nivalis/_import.txt
new file mode 100644
index 00000000..159d1e61
--- /dev/null
+++ b/npc/020-2_Nivalis/_import.txt
@@ -0,0 +1,5 @@
+map: 020-2.gat
+npc: npc/020-2_Nivalis/_mobs.txt
+npc: npc/020-2_Nivalis/_warps.txt
+npc: npc/020-2_Nivalis/furquest.txt
+npc: npc/020-2_Nivalis/shops.txt
diff --git a/npc/020-2/_mobs.txt b/npc/020-2_Nivalis/_mobs.txt
index 4289bb7e..1b1c6e2b 100644
--- a/npc/020-2/_mobs.txt
+++ b/npc/020-2_Nivalis/_mobs.txt
@@ -1,4 +1,4 @@
-// 020-2 mobs
+// 020-2 Nivalis mobs
diff --git a/npc/020-2/_warps.txt b/npc/020-2_Nivalis/_warps.txt
index 2306316d..47f71d27 100644
--- a/npc/020-2/_warps.txt
+++ b/npc/020-2_Nivalis/_warps.txt
@@ -1,4 +1,4 @@
-// 020-2 warps
+// 020-2 Nivalis warps
020-2.gat,25,35 warp ToOutside -1,-1,020-1.gat,47,50
020-2.gat,64,25 warp ToOutside -1,-1,020-1.gat,55,90
diff --git a/npc/020-2/furquest.txt b/npc/020-2_Nivalis/furquest.txt
index 4d67f8c4..4d67f8c4 100644
--- a/npc/020-2/furquest.txt
+++ b/npc/020-2_Nivalis/furquest.txt
diff --git a/npc/020-2/shops.txt b/npc/020-2_Nivalis/shops.txt
index f3d9dedc..f3d9dedc 100644
--- a/npc/020-2/shops.txt
+++ b/npc/020-2_Nivalis/shops.txt
diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt
index 3c771539..7e907749 100644
--- a/npc/021-1_Tulimshar/_warps.txt
+++ b/npc/021-1_Tulimshar/_warps.txt
@@ -1,5 +1,2 @@
// 021-1 Tulimshar warps
-021-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17
-021-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34
-021-1.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72
diff --git a/npc/_import.txt b/npc/_import.txt
index df218035..74464305 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -6,6 +6,7 @@ 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/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
@@ -34,7 +35,10 @@ 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-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_Beach_Cliffs/_import.txt