From 3f175b590d284ef413be0be25c7f74392523414b Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Thu, 21 Apr 2016 15:37:05 -0500
Subject: Deadmere - Undead Town

---
 world/map/npc/027-1/_import.txt  |  2 --
 world/map/npc/027-1/_mobs.txt    |  1 -
 world/map/npc/027-1/_warps.txt   |  2 +-
 world/map/npc/027-1/crypt.txt    |  2 +-
 world/map/npc/027-1/golbenez.txt | 39 ---------------------------------------
 world/map/npc/027-1/mapflags.txt |  3 ++-
 world/map/npc/027-1/traveler.txt | 11 -----------
 7 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 world/map/npc/027-1/golbenez.txt
 delete mode 100644 world/map/npc/027-1/traveler.txt

(limited to 'world/map/npc/027-1')

diff --git a/world/map/npc/027-1/_import.txt b/world/map/npc/027-1/_import.txt
index 66d24392..7a50aaf6 100644
--- a/world/map/npc/027-1/_import.txt
+++ b/world/map/npc/027-1/_import.txt
@@ -5,7 +5,5 @@ npc: npc/027-1/_mobs.txt
 npc: npc/027-1/_nodes.txt
 npc: npc/027-1/_warps.txt
 npc: npc/027-1/crypt.txt
-npc: npc/027-1/golbenez.txt
 npc: npc/027-1/graves.txt
 npc: npc/027-1/mapflags.txt
-npc: npc/027-1/traveler.txt
diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index 51ce6174..4b422ea6 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -17,4 +17,3 @@
 027-1,104,64,31,20|monster|Skeleton|1043,2,60000ms,8000ms
 027-1,104,64,31,21|monster|LadySkeleton|1044,2,60000ms,8000ms
 027-1,70,40,100,20|monster|VampireBat|1066,15,100000ms,30000ms
-027-1,99,90,34,16|monster|GrassSnake|1034,3,100000ms,50000ms
diff --git a/world/map/npc/027-1/_warps.txt b/world/map/npc/027-1/_warps.txt
index 583d6890..9922f47f 100644
--- a/world/map/npc/027-1/_warps.txt
+++ b/world/map/npc/027-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Graveyard warps
 
-027-1,88,84|warp|-1,-1,027-2,26,33
+027-1,88,84|warp|-1,-1,027-2,46,33
 027-1,63,106|warp|-1,-1,026-1,63,17
diff --git a/world/map/npc/027-1/crypt.txt b/world/map/npc/027-1/crypt.txt
index c6f6a63f..2a67ff24 100644
--- a/world/map/npc/027-1/crypt.txt
+++ b/world/map/npc/027-1/crypt.txt
@@ -2,7 +2,7 @@
 {
     if (BaseLevel < 60)
         goto L_Weak;
-    warp "027-2", 112, 110;
+    warp "027-2", 36, 110;
     end;
 
 L_Weak:
diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt
deleted file mode 100644
index cfa09fdb..00000000
--- a/world/map/npc/027-1/golbenez.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-027-1,68,89,0|script|#Golbenez#_M|204
-{
-    set @fee, 666;
-
-    mes "[Golbenez]";
-    mes "\"Welcome mortal. I finished the creation of the place of leisure.\"";
-    next;
-    if (BaseLevel < 60)
-        goto L_Weak;
-    mes "\"I will bring you there for a small fee of " + @fee + "GP.\"";
-    menu
-        "What? You already got so much money!",L_SoMuchSwag,
-        "Ok, bring me there.",L_Warp;
-
-L_SoMuchSwag:
-    mes "[Golbenez]";
-    mes "\"Come back when you've changed your mind. It's a wonderful place.\"";
-    close;
-
-L_Warp:
-    if (Zeny < @fee)
-        goto L_No_Money;
-    set Zeny, Zeny - @fee;
-    warp "027-2", 105, 44;
-    close;
-
-L_No_Money:
-    mes "[Golbenez]";
-    mes "\"Don't try to betray me, pitiful human.\"";
-    next;
-    mes "\"Come back when you can pay my service.\"";
-    close;
-
-L_Weak:
-    mes "\"It is astonishing how WEAK you humans can be.\"";
-    next;
-    mes "\"Come back when you're a bit more experienced.\"";
-    close;
-}
diff --git a/world/map/npc/027-1/mapflags.txt b/world/map/npc/027-1/mapflags.txt
index ed13545d..790b44a9 100644
--- a/world/map/npc/027-1/mapflags.txt
+++ b/world/map/npc/027-1/mapflags.txt
@@ -1 +1,2 @@
-027-1|mapflag|resave|025-1,33,50
+027-1|mapflag|resave|026-1,28,35
+027-1|mapflag|outside
diff --git a/world/map/npc/027-1/traveler.txt b/world/map/npc/027-1/traveler.txt
deleted file mode 100644
index 0c8bb753..00000000
--- a/world/map/npc/027-1/traveler.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// This is a teleportation (warp) NPC. Its purpose is to offer expensive, fast trips throughout the world.
-// Author: Wombat, wushin
-// cost depending on level and adapted to new scripting guidelines: Jenalya
-
-027-1,83,84,0|script|Styx the Traveler|103
-{
-    set @npcname$, "Styx";
-    set @NpcTravelBit, $@graveyard_bit;
-    callfunc "Traveler";
-    end;
-}
-- 
cgit v1.2.3-60-g2f50