Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 22 insertions, 0 deletions

diff --git a/world/map/npc/002-4/underground_palace_barrier.txt b/world/map/npc/002-4/underground_palace_barrier.txt
new file mode 100644
index 00000000..240dbbae
--- /dev/null
+++ b/world/map/npc/002-4/underground_palace_barrier.txt
@@ -0,0 +1,22 @@
+//underground palace barrier
+
+002-4.gat,68,98,0|script|#UGP_Barrier|45,0,0,
+{
+    // This NPC previously used the variable TMW_Quest
+    callfunc "ClearVarTMW_Quest";
+
+    set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
+
+    if (@state >= 25) goto L_Underground_Palace_Barrier_Open;
+
+    message strcharinfo(0), "Some force seems to block your entrance.";
+    goto L_End;
+
+L_Underground_Palace_Barrier_Open:
+    warp "002-5.gat",37,96;
+    goto L_End;
+
+L_End:
+    set @state, 0;
+    end;
+}