3 files changed, 11 insertions, 88 deletions
diff --git a/world/map/npc/027-1/crypt.txt b/world/map/npc/027-1/crypt.txt
new file mode 100644
index 00000000..37b1cecf
--- /dev/null
+++ b/world/map/npc/027-1/crypt.txt
@@ -0,0 +1,11 @@
+027-1.gat,28,67,0|script|#CryptEntrance|45,0,0
+{
+    if (BaseLevel < 60)
+        goto L_Weak;
+    warp "027-2.gat", 112, 110;
+    end;
+
+L_Weak:
+    message strcharinfo(0), "Come back when you're a bit more experienced.";
+    end;
+}
diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt
index 35980b2f..b32b862c 100644
--- a/world/map/npc/027-1/golbenez.txt
+++ b/world/map/npc/027-1/golbenez.txt
@@ -36,21 +36,4 @@ L_Weak:
     next;
     mes "\"Come back when you're a bit more experienced.\"";
     close;
-
-// Golbenez resets the graveyard monsters when no players are present
-// He's such an evil guy!
-OnInit:
-    if (debug >= 2) end;
-    initnpctimer;
-    end;
-
-OnTimer10000:
-    if (getareausers("027-1.gat", 0, 0, 149, 119, 1) == 0)
-        killmonsterall "027-1.gat";
-
-    setnpctimer 0;
-    end;
 }
-
-
-
diff --git a/world/map/npc/027-1/monsters.txt b/world/map/npc/027-1/monsters.txt
deleted file mode 100644
index b4dedad4..00000000
--- a/world/map/npc/027-1/monsters.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-// 027-1 Graveyard zombies and fallens
-// they need to be in an extra file because of the crying child quest
-
-027-1.gat,71,41,31,22|monster|Zombie|1036,2,300000,120000,specialMob027-1::On1036
-027-1.gat,37,41,33,22|monster|Zombie|1036,2,200000,10000,specialMob027-1::On1036
-027-1.gat,37,65,33,22|monster|Zombie|1036,3,140000,30000,specialMob027-1::On1036
-027-1.gat,37,65,33,22|monster|Fallen|1045,3,120000,30000,specialMob027-1::On1045
-
-027-1.gat,0,0,0|script|specialMob027-1|-1,
-{
-    end;
-
-On1036:
-    set @mobID, 1036;
-    callsub L_MOBCOUNT_ZOMBIES;
-    callfunc "MobPoints";
-    end;
-
-On1045:
-    set @mobID, 1045;
-    callsub L_MOBCOUNT_FALLENS;
-    callfunc "MobPoints";
-    end;
-
-L_MOBCOUNT_ZOMBIES:
-
-    set @Graveyard_Inn_MASK, NIBBLE_2_MASK;
-    set @Graveyard_Inn_SHIFT, NIBBLE_2_SHIFT;
-
-    set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
-
-    if (@state != 1)
-        goto L_Return;
-    set @ring, @ring + 1;
-    if (@ring < 10)
-        goto L_Return;
-    if (rand(8) != 0)
-        goto L_Return;
-    message strcharinfo(0), "You found a ring hidden in the zombie's rotten rags. Maybe this is what Aldred was looking for...";
-    set @state, 2;
-    callsub S_Update_Mask;
-    return;
-
-L_MOBCOUNT_FALLENS:
-
-    set @Graveyard_Inn_MASK, NIBBLE_2_MASK;
-    set @Graveyard_Inn_SHIFT, NIBBLE_2_SHIFT;
-
-    set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
-
-    if (@state != 1)
-        goto L_Return;
-    set @ring, @ring + 1;
-    if (@ring < 10)
-        goto L_Return;
-    if (rand(8) != 0)
-        goto L_Return;
-    message strcharinfo(0), "You found a ring inside the fallen's broken helmet. Maybe this is what Aldred was looking for...";
-    set @state, 2;
-    callsub S_Update_Mask;
-    return;
-
-L_Return:
-    return;
-
-S_Update_Mask:
-    set QUEST_Graveyard_Inn,
-        (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
-            | (@state << @Graveyard_Inn_SHIFT);
-    return;
-}