summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1_Tulimshar/_import.txt2
-rw-r--r--npc/009-1_Hurnscald/_warps.txt5
-rw-r--r--npc/009-2_Hurnscald/_warps.txt3
-rw-r--r--npc/011-3_Hermits_cave/_warps.txt2
-rw-r--r--npc/011-4_Lake_cave/_warps.txt2
-rw-r--r--npc/014-1_Woodland/_import.txt1
-rwxr-xr-xnpc/014-1_Woodland/_import.txt.bak5
-rw-r--r--npc/019-1_Snow_field/_import.txt3
-rw-r--r--npc/027-1_Graveyard/_warps.txt2
-rw-r--r--npc/027-3/_import.txt3
-rw-r--r--npc/027-3/_mobs.txt7
-rw-r--r--npc/027-3/_warps.txt4
-rwxr-xr-xnpc/027-3_Crypt/_import.txt13
-rwxr-xr-xnpc/027-3_Crypt/_mobs.txt10
-rwxr-xr-xnpc/027-3_Crypt/_warps.txt8
-rwxr-xr-xnpc/027-3_Crypt/entrance.txt12
-rwxr-xr-xnpc/027-3_Crypt/test.txt8
-rw-r--r--npc/_import.txt3
18 files changed, 37 insertions, 56 deletions
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
index ced4347d..6778edf3 100644
--- a/npc/001-1_Tulimshar/_import.txt
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -21,6 +21,6 @@ npc: npc/001-1_Tulimshar/rewards_master.txt
npc: npc/001-1_Tulimshar/sandra.txt
npc: npc/001-1_Tulimshar/sarah.txt
npc: npc/001-1_Tulimshar/soul-menhir.txt
-npc: npc/001-1_Tulimshar/tester.txt
+//npc: npc/001-1_Tulimshar/tester.txt
npc: npc/001-1_Tulimshar/trader.txt
npc: npc/001-1_Tulimshar/vincent.txt
diff --git a/npc/009-1_Hurnscald/_warps.txt b/npc/009-1_Hurnscald/_warps.txt
index a41c63a4..56d96f78 100644
--- a/npc/009-1_Hurnscald/_warps.txt
+++ b/npc/009-1_Hurnscald/_warps.txt
@@ -7,7 +7,8 @@
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,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
diff --git a/npc/009-2_Hurnscald/_warps.txt b/npc/009-2_Hurnscald/_warps.txt
index 29121d3e..0ce44a8f 100644
--- a/npc/009-2_Hurnscald/_warps.txt
+++ b/npc/009-2_Hurnscald/_warps.txt
@@ -15,6 +15,7 @@
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,181,67 warp ToOutdoorL -1,-1,009-1.gat,90,47
+009-2.gat,182,67 warp ToOutdoorR -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
diff --git a/npc/011-3_Hermits_cave/_warps.txt b/npc/011-3_Hermits_cave/_warps.txt
index be9b6a83..3083a857 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,11
+011-3.gat,31,21 warp ToLakeCave -1,-1,011-4.gat,72,10
diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4_Lake_cave/_warps.txt
index 7f1c1b2a..cf5a43c0 100644
--- a/npc/011-4_Lake_cave/_warps.txt
+++ b/npc/011-4_Lake_cave/_warps.txt
@@ -1,6 +1,6 @@
// 011-4 Lake cave warps
-011-4.gat,73,8 warp ToHermitsCave 0,-1,011-3.gat,31,24
+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.gat,39,35 warp warp -1,-1,011-6.gat,47,183
011-4.gat,16,57 warp warp -1,-1,011-6.gat,24,204
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
index 3c67f38f..b84a9892 100644
--- a/npc/014-1_Woodland/_import.txt
+++ b/npc/014-1_Woodland/_import.txt
@@ -1,5 +1,4 @@
map: 014-1.gat
npc: npc/014-1_Woodland/_mobs.txt
npc: npc/014-1_Woodland/_warps.txt
-npc: npc/014-1_Woodland/taro.txt
npc: npc/014-1_Woodland/wedding-officiator.txt
diff --git a/npc/014-1_Woodland/_import.txt.bak b/npc/014-1_Woodland/_import.txt.bak
new file mode 100755
index 00000000..3c67f38f
--- /dev/null
+++ b/npc/014-1_Woodland/_import.txt.bak
@@ -0,0 +1,5 @@
+map: 014-1.gat
+npc: npc/014-1_Woodland/_mobs.txt
+npc: npc/014-1_Woodland/_warps.txt
+npc: npc/014-1_Woodland/taro.txt
+npc: npc/014-1_Woodland/wedding-officiator.txt
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
index e389a836..5bfc5617 100644
--- a/npc/019-1_Snow_field/_import.txt
+++ b/npc/019-1_Snow_field/_import.txt
@@ -3,5 +3,4 @@ npc: npc/019-1_Snow_field/_mobs.txt
npc: npc/019-1_Snow_field/_warps.txt
npc: npc/019-1_Snow_field/monsters.txt
npc: npc/019-1_Snow_field/santa_helper.txt
-npc: npc/019-1_Snow_field/snowman.txt
-npc: npc/019-1_Snow_field/taro.txt
+npc: npc/019-1_Snow_field/snowman.txt \ No newline at end of file
diff --git a/npc/027-1_Graveyard/_warps.txt b/npc/027-1_Graveyard/_warps.txt
index 5667ad16..dd21ff77 100644
--- a/npc/027-1_Graveyard/_warps.txt
+++ b/npc/027-1_Graveyard/_warps.txt
@@ -2,4 +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
+//027-1.gat,28,67 warp toCrypt -1,-1,027-3.gat,40,70
diff --git a/npc/027-3/_import.txt b/npc/027-3/_import.txt
deleted file mode 100644
index 0d6c8819..00000000
--- a/npc/027-3/_import.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-map: 027-3.gat
-npc: npc/027-3/_mobs.txt
-npc: npc/027-3/_warps.txt
diff --git a/npc/027-3/_mobs.txt b/npc/027-3/_mobs.txt
deleted file mode 100644
index dcf52c02..00000000
--- a/npc/027-3/_mobs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// 027-3 mobs
-
-
-
-027-3.gat,0,0,0 script Mob027-3 -1,{
- end;
-}
diff --git a/npc/027-3/_warps.txt b/npc/027-3/_warps.txt
deleted file mode 100644
index 650f6e5a..00000000
--- a/npc/027-3/_warps.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// 027-3 warps
-
-027-3.gat,127,44 warp toCryptLevel2 1,-1,027-4.gat,37,21
-027-3.gat,41,75 warp toGraveyard 2,-1,027-1.gat,28,69
diff --git a/npc/027-3_Crypt/_import.txt b/npc/027-3_Crypt/_import.txt
index 82841eaa..9bf223cb 100755
--- a/npc/027-3_Crypt/_import.txt
+++ b/npc/027-3_Crypt/_import.txt
@@ -1,7 +1,6 @@
-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
+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
diff --git a/npc/027-3_Crypt/_mobs.txt b/npc/027-3_Crypt/_mobs.txt
index 8aa8bd4a..2e423ee7 100755
--- a/npc/027-3_Crypt/_mobs.txt
+++ b/npc/027-3_Crypt/_mobs.txt
@@ -1,7 +1,3 @@
-// 027-3 Crypt mobs
-
-
-
-027-3.gat,0,0,0 script Mob027-3 -1,{
- end;
-}
+// 027-3 Crypt mobs
+
+//027-3.gat,40,38,0,0 monster TheLost 1063,1,8000,2000,0
diff --git a/npc/027-3_Crypt/_warps.txt b/npc/027-3_Crypt/_warps.txt
index 5bbff7ae..295215ca 100755
--- a/npc/027-3_Crypt/_warps.txt
+++ b/npc/027-3_Crypt/_warps.txt
@@ -1,3 +1,5 @@
-// 027-3 Crypt warps
-
-027-3.gat,127,44 warp toCryptLevel2 1,-1,027-4.gat,37,21
+// 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
diff --git a/npc/027-3_Crypt/entrance.txt b/npc/027-3_Crypt/entrance.txt
index f8da11b8..0ba3def5 100755
--- a/npc/027-3_Crypt/entrance.txt
+++ b/npc/027-3_Crypt/entrance.txt
@@ -1,8 +1,8 @@
// Effects for opening and closing the gate. Also set it so no new player can't be warped in once the gate is opened.
027-3.gat,40,57,0 script #gatecontrol 127, 2, 1{
- mes "Once you pass this point I cannot warp anyone else to help.";
- mes "Are you sure you are ready to go?";
+ mes "Once you pass this point I cannot warp anyone else to help. "
+ + "Are you sure you are ready to go?";
menu
"Let's go",L_BEGIN,
"No thank you",-;
@@ -33,9 +33,9 @@ OnTimer2000:
// Effects for the exit.
027-3.gat,40,78,0 script #cryptexit2 127, 3, 3{
- mes "Unfortunately, once I bring you to this pocket";
- mes "in time you cannot leave through its normal exit.";
- mes "The only way to get out is to defeat the reaper";
- mes "or die...";
+ mes "Unfortunately, once I bring you to this time pocket"
+ + "you cannot leave through its normal exit."
+ + "The only way to get out is to defeat the reaper"
+ + "or die...";
close;
} \ No newline at end of file
diff --git a/npc/027-3_Crypt/test.txt b/npc/027-3_Crypt/test.txt
deleted file mode 100755
index 0f353a8d..00000000
--- a/npc/027-3_Crypt/test.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-027-3.gat,40,25,0 script zombifier 200,1,1{
- npctalk "If you die in the crypt, you are turned into a zombie";
- end;
-OnPCDieEvent:
- npctalk "The corpse of " + strcharinfo(0) + " has risen";
- monster "027-3.gat",41,25,"Corpse",1036,1,"Reaper::OnAvenged";
- end;
-}
diff --git a/npc/_import.txt b/npc/_import.txt
index 94929c05..361591c4 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -58,7 +58,7 @@ 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_Inner_Chamber/_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
@@ -70,4 +70,5 @@ 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
+import: npc/debugroom/_import.txt
import: npc/debugroom_Woodland_mining_camp/_import.txt
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 06:04:04 +0000