diff options
Diffstat (limited to 'world/map/npc/009-4/barriers.txt')
-rw-r--r-- | world/map/npc/009-4/barriers.txt | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt index adaa384e..4a2055fa 100644 --- a/world/map/npc/009-4/barriers.txt +++ b/world/map/npc/009-4/barriers.txt @@ -9,8 +9,8 @@ function|script|GetBarrierColor L_GetBarrierColor: set @Mask, 15; - set @Shift, 4 * @Barrier; - set @BarrierColor, (OrumQuestBarrier >> @Shift) & @Mask; + set @shift, 4 * @Barrier; + set @BarrierColor, (OrumQuestBarrier >> @shift) & @Mask; return; L_Error: @@ -44,7 +44,7 @@ L_Error2: // Starting Barrier / Quest Entrance -009-4,37,119,0|script|#OrumCaveStartMessage|127,0,0 +009-4,37,119,0|script|#OrumCaveStartMessage|32767,0,0 { if (OrumQuest >= 3) end; if (OrumQuest == 2) goto L_Started; @@ -55,10 +55,10 @@ L_Error2: L_Started: message strcharinfo(0), "The torches dim as you approach, granting you passage."; set OrumQuest, 3; - close; + end; } -009-4,37,120,0|script|#OrumCaveStartBarrier|127,0,0 +009-4,37,120,0|script|#OrumCaveStartBarrier|32767,0,0 { if (OrumQuest >= 3) end; warp "009-4", 37, 118; @@ -66,18 +66,19 @@ L_Started: } // First Barrier -009-4,57,29,0|script|#OrumCaveFirstBarrier|127,0,0 +009-4,57,29,0|script|#OrumCaveFirstBarrier|32767,0,0 { - if (OrumQuest >= 5) close; + if (OrumQuest >= 5) end; message strcharinfo(0), "Nothing seems to happen as you enter this room. The barrier must need both of its torches to function properly."; set OrumQuest, 5; - close; + end; } // Second Barrier -009-4,61,55,0|script|#OrumCaveSecondMessage|127,0,0 +009-4,61,55,0|script|#OrumCaveSecondMessage|32767,0,0 { + if (OrumQuest >= 9) end; if (OrumQuest == 3) set OrumQuest, 4; set @Barrier, 0; @@ -103,7 +104,7 @@ L_Advance_Quest: end; } -009-4,61,54,0|script|#OrumCaveSecondBarrier|127,0,0 +009-4,61,54,0|script|#OrumCaveSecondBarrier|32767,0,0 { if (OrumQuest >= 9) end; warp "009-4", 60, 56; @@ -111,8 +112,9 @@ L_Advance_Quest: } // Third Barrier -009-4,24,65,0|script|#OrumCaveThirdMessage|127,0,0 +009-4,24,65,0|script|#OrumCaveThirdMessage|32767,0,0 { + if (OrumQuest >= 10) end; if (OrumQuest == 3) set OrumQuest, 4; if (OrumQuest > 8 && @Torch1Color == @firstColor && @Torch2Color == @secondColor) goto L_Allow_Third_Passage; @@ -152,7 +154,7 @@ L_Advance_Quest: end; } -009-4,24,66,0|script|#OrumCaveThirdBarrier|127,0,0 +009-4,24,66,0|script|#OrumCaveThirdBarrier|32767,0,0 { if (OrumQuest >= 10) end; warp "009-4", 23, 64; @@ -160,7 +162,7 @@ L_Advance_Quest: } // Ending Barrier -009-4,48,37,0|script|#OrumCaveEndMessage|127,0,0 +009-4,48,37,0|script|#OrumCaveEndMessage|32767,0,0 { if (OrumQuest >= 11) end; if (OrumQuest == 3) set OrumQuest, 4; @@ -272,7 +274,7 @@ L_Advance_Quest: close; } -009-4,48,38,0|script|#OrumCaveEndBarrier|127,0,0 +009-4,48,38,0|script|#OrumCaveEndBarrier|32767,0,0 { if (OrumQuest >= 11) end; warp "009-4", 47, 36; |