Merge pull request #213 from mekolat/orum-collision

Prevent crash in torch quest

2 files changed, 9 insertions, 9 deletions

diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 9e3e85b9..9e9ef7bc 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -81,11 +81,11 @@ L_Started:
     if (OrumQuest > 7 && @TorchColor == @BarrierColor)
         goto L_Allow_Second_Passage;
 
-    warp "009-4.gat", 61, 56;
+    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 " + @colors$[@BarrierColor] + " tint to it.";
+    mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
     close;
 
 L_Allow_Second_Passage:
@@ -126,11 +126,11 @@ L_Advance_Quest:
     if (OrumQuest > 8 && @Torch2Color == @firstColor && @Torch1Color == @secondColor)
         goto L_Allow_Third_Passage;
 
-    warp "009-4.gat", 24, 64;
+    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 " + @colors$[@BarrierColor] + " tint to it.";
+    mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
     close;
 
 L_Allow_Third_Passage:
@@ -239,11 +239,11 @@ L_Advance_Quest:
     goto L_Deny_Final_Passage;
 
 L_Deny_Final_Passage:
-    warp "009-4.gat", 48, 36;
+    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 " + @colors$[@BarrierColor] + " tint to it.";
+    mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
     close;
 
 L_Allow_Final_Passage:
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index b92098c0..fbb88a84 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -132,7 +132,7 @@ function|script|TorchLoop
         "yellow", "light green", "green", "dark green",
         "blue", "dark purple", "purple", "light purple";
     setarray @intensities$, "calm", "bright", "blinding";
-    mes "Looking closely you notice that this torch is not like the others. This one has a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + " tint to it.";
+    mes "Looking closely you notice that this torch is not like the others. This one has a " + @intensities$[@TorchIntensity] + " ##B" + @colors$[@TorchColor] + "##b tint to it.";
     goto L_Color_Loop;
 
 L_Color_Loop:
@@ -257,7 +257,7 @@ L_Color_Inc:
 L_Show_Color:
     callfunc "SetTorchColor";
     misceffect 5;
-    mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
+    mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " ##B" + @colors$[@TorchColor] + "##b.";
     goto L_Color_Loop;
 
 L_WrongColor:
@@ -267,7 +267,7 @@ L_WrongColor:
         goto L_Failed;
     callfunc "SetTorchIntensity";
     misceffect 5;
-    mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
+    mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " ##B" + @colors$[@TorchColor] + "##b.";
     goto L_Color_Loop;
 
 L_Failed: