diff options
| -rw-r--r-- | world/map/data/017-1.wlk | bin | 27284 -> 27284 bytes | |||
| -rw-r--r-- | world/map/data/020-1.wlk | bin | 18948 -> 18948 bytes | |||
| -rw-r--r-- | world/map/npc/009-4/barriers.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/029-3/parua.txt | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/world/map/data/017-1.wlk b/world/map/data/017-1.wlk Binary files differindex 483857bb..9cf37da8 100644 --- a/world/map/data/017-1.wlk +++ b/world/map/data/017-1.wlk diff --git a/world/map/data/020-1.wlk b/world/map/data/020-1.wlk Binary files differindex 545fbe2b..0ba1ddc7 100644 --- a/world/map/data/020-1.wlk +++ b/world/map/data/020-1.wlk diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt index adaa384e..aed35d96 100644 --- a/world/map/npc/009-4/barriers.txt +++ b/world/map/npc/009-4/barriers.txt @@ -55,7 +55,7 @@ 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 @@ -68,16 +68,17 @@ L_Started: // First Barrier 009-4,57,29,0|script|#OrumCaveFirstBarrier|127,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 { + if (OrumQuest >= 9) end; if (OrumQuest == 3) set OrumQuest, 4; set @Barrier, 0; @@ -113,6 +114,7 @@ L_Advance_Quest: // Third Barrier 009-4,24,65,0|script|#OrumCaveThirdMessage|127,0,0 { + if (OrumQuest >= 10) end; if (OrumQuest == 3) set OrumQuest, 4; if (OrumQuest > 8 && @Torch1Color == @firstColor && @Torch2Color == @secondColor) goto L_Allow_Third_Passage; diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt index d8e100fb..59e0c8b6 100644 --- a/world/map/npc/029-3/parua.txt +++ b/world/map/npc/029-3/parua.txt @@ -267,9 +267,9 @@ L_GlobalAnnounce: L_Five_Minutes: if ($@ANNOUNCE_TIME - gettimetick(2) > 300) end; - if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##75 minutes##1 and, at the moment, there is ##3only 1 fighter##1 in the cave.", 0; - if(($@FIGHT_CAVE_PLAYER_COUNT > 1) && ($@FIGHT_CAVE_PLAYER_COUNT < 5)) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##75 minutes##1 and, at the moment, there are ##3only " + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0; - if($@FIGHT_CAVE_PLAYER_COUNT >= 5) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##75 minutes##1 and, at the moment, there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0; + if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there is ##3only 1 fighter##1 in the cave.", 0; + if(($@FIGHT_CAVE_PLAYER_COUNT > 1) && ($@FIGHT_CAVE_PLAYER_COUNT < 5)) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there are ##3only " + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0; + if($@FIGHT_CAVE_PLAYER_COUNT >= 5) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0; set $@FIGHT_CAVE_STATUS, 2; end; |