From dc80bf7fe83eab48428aa4f63d869a9b72bd7d27 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Mon, 26 Jan 2015 14:51:44 -0500
Subject: fix order of operations in orum cave

---
 world/map/npc/009-4/barriers.txt | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 9e9ef7bc..3479b0ee 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -49,9 +49,10 @@ L_Error2:
     if (OrumQuest >= 3) close;
     if (OrumQuest == 2) goto L_Started;
 
-    warp "009-4.gat", 37, 118;
     mes "As you try to pass, two torches begin to flare and push you back. They seem to form some kind of barrier.";
-    close;
+    close2;
+    warp "009-4.gat", 37, 118;
+    end;
 
 L_Started:
     message strcharinfo(0), "The torches dim as you approach, granting you passage.";
@@ -81,12 +82,13 @@ L_Started:
     if (OrumQuest > 7 && @TorchColor == @BarrierColor)
         goto L_Allow_Second_Passage;
 
-    warp "009-4.gat", 60, 56;
     mes "As you try to pass, the torches begin to flare and push you back. Perhaps there's a way to get past it.";
     mes "";
     setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
     mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
-    close;
+    close2;
+    warp "009-4.gat", 60, 56;
+    end;
 
 L_Allow_Second_Passage:
     if (OrumQuest < 9) goto L_Advance_Quest;
@@ -126,12 +128,13 @@ L_Advance_Quest:
     if (OrumQuest > 8 && @Torch2Color == @firstColor && @Torch1Color == @secondColor)
         goto L_Allow_Third_Passage;
 
-    warp "009-4.gat", 23, 64;
     mes "As you try to pass, the torches begin to flare and push you back. Perhaps there is a way to get past it.";
     mes "";
     setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
     mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
-    close;
+    close2;
+    warp "009-4.gat", 23, 64;
+    end;
 
 L_Allow_Third_Passage:
     if (OrumQuest < 10) goto L_Advance_Quest;
@@ -239,12 +242,13 @@ L_Advance_Quest:
     goto L_Deny_Final_Passage;
 
 L_Deny_Final_Passage:
-    warp "009-4.gat", 47, 36;
     mes "As you try to pass, the torches begin to flare and push you back. Perhaps there is a way to get past it.";
     mes "";
     setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
     mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
-    close;
+    close2;
+    warp "009-4.gat", 47, 36;
+    end;
 
 L_Allow_Final_Passage:
     if (OrumQuest < 11) goto L_Advance_Quest;
-- 
cgit v1.2.3-60-g2f50