summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/027-2.wlkbin19504 -> 19504 bytes
-rw-r--r--npc/027-2_Caretakers_House/_warps.txt2
-rwxr-xr-xnpc/027-2_Caretakers_House/alacrius.txt2
-rwxr-xr-xnpc/027-2_Caretakers_House/alacrius2.txt4
-rwxr-xr-xnpc/027-2_Caretakers_House/gy_inn_shops.txt6
-rwxr-xr-xnpc/027-2_Caretakers_House/testnpcs.txt16
6 files changed, 16 insertions, 14 deletions
diff --git a/data/027-2.wlk b/data/027-2.wlk
index 84952070..68b70d08 100644
--- a/data/027-2.wlk
+++ b/data/027-2.wlk
Binary files differ
diff --git a/npc/027-2_Caretakers_House/_warps.txt b/npc/027-2_Caretakers_House/_warps.txt
index 8b7af158..ebb1f99e 100644
--- a/npc/027-2_Caretakers_House/_warps.txt
+++ b/npc/027-2_Caretakers_House/_warps.txt
@@ -1,3 +1,5 @@
// 027-2 Caretaker's House warps
027-2.gat,26,33 warp toGraveyard -1,-1,027-1.gat,88,85
+027-2.gat,128,35 warp To2ndFloor 0,-1,027-2.gat,75,93
+027-2.gat,76,95 warp To1stFloor 0,-1,027-2.gat,127,37
diff --git a/npc/027-2_Caretakers_House/alacrius.txt b/npc/027-2_Caretakers_House/alacrius.txt
index eee471ad..825c114b 100755
--- a/npc/027-2_Caretakers_House/alacrius.txt
+++ b/npc/027-2_Caretakers_House/alacrius.txt
@@ -1,6 +1,6 @@
// Starts the reaper quest
-027-2.gat,104,39,0 script Alacrius 313,{
+027-2.gat,107,29,0 script Alacrius 313,{
// if started, go to started
// if fail go to failed
// if complete go to complete
diff --git a/npc/027-2_Caretakers_House/alacrius2.txt b/npc/027-2_Caretakers_House/alacrius2.txt
index 70cf0c42..51614868 100755
--- a/npc/027-2_Caretakers_House/alacrius2.txt
+++ b/npc/027-2_Caretakers_House/alacrius2.txt
@@ -1,6 +1,6 @@
// Starts the reaper quest
-027-2.gat,104,39,0 script Alacrius 313,{
+027-2.gat,107,29,0 script Alacrius 313,{
if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_Enjoy;
@@ -110,4 +110,4 @@ L_NOHERO:
OnInit:
initnpctimer;
stopnpctimer;
-} \ No newline at end of file
+}
diff --git a/npc/027-2_Caretakers_House/gy_inn_shops.txt b/npc/027-2_Caretakers_House/gy_inn_shops.txt
index b7e3aa5f..af6b2d39 100755
--- a/npc/027-2_Caretakers_House/gy_inn_shops.txt
+++ b/npc/027-2_Caretakers_House/gy_inn_shops.txt
@@ -7,10 +7,10 @@
// banker: function
-027-2.gat,75,26,0 shop Chef Skeleton 300,519:100
+027-2.gat,75,22,0 shop Chef 300,519:100
027-2.gat,90,36,0 shop Barmaid 301,519:100,533:150,534:90,562:500,676:200
-027-2.gat,33,77,0 shop Shopkeeper 302,586:1000,524:1600,544:10000,632:10000,528:1000,735:1
-027-2.gat,103,28,0 shop Magic Undead Shop 304,501
+027-2.gat,93,22,0 shop Shopkeeper 302,586:1000,524:1600,544:10000,632:10000,528:1000,735:1
+027-2.gat,56,99,0 shop Magic Undead Shop 304,501:50
027-2.gat,106,22,0 shop Chief Barman 309,539:175,567:500,568:500
// Inn
diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2_Caretakers_House/testnpcs.txt
index bd787711..a64e80b9 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2_Caretakers_House/testnpcs.txt
@@ -25,7 +25,7 @@
end;
}
-027-2.gat,74,21,0 script Chef's helper 306,{
+027-2.gat,75,29,0 script Archibald 306,{
end;
}
@@ -58,7 +58,7 @@ L_3:
end;
}
-027-2.gat,68,77,0 script SwordGuy 311,{
+027-2.gat,70,77,0 script Cerhan 311,{
end;
}
@@ -68,19 +68,19 @@ L_3:
close;
}
-027-2.gat,107,29,0 script Golbenez 307,{
+027-2.gat,39,91,0 script Golbenez 307,{
end;
}
-027-2.gat,39,91,0 script Crying Child 314,{
+027-2.gat,50,92,0 script Crying Child 314,{
end;
}
-027-2.gat,91,22,0 script Innkeeper's Ghost 315,{
+027-2.gat,104,39,0 script Innkeeper's Ghost 315,{
end;
}
-027-2.gat,58,90,0 script Evil Guard 316,{
+027-2.gat,100,43,0 script Evil Guard 316,{
end;
}
@@ -88,10 +88,10 @@ L_3:
end;
}
-027-2.gat,29,99,0 script Headless Lover 318,{
+027-2.gat,24,77,0 script Headless Man 318,{
end;
}
-027-2.gat,86,30,0 script Lantern Man 319,{
+027-2.gat,22,84,0 script Lantern Man 319,{
end;
}