diff options
| author | Wushin <pasekei@gmail.com> | 2015-01-24 14:24:22 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-01-24 14:24:22 -0600 |
| commit | 9fe82807061a4f087fca79a326556cf9b033c7ce (patch) | |
| tree | 027214e0ecb34f67f242f65b6485ace41c0aa749 /world | |
| parent | 1494ec8426ba80dad39168a64342afdc8018f15e (diff) | |
| parent | a691a9fdb0ceed48367283de57a932a59eddb908 (diff) | |
| download | serverdata-9fe82807061a4f087fca79a326556cf9b033c7ce.tar.gz serverdata-9fe82807061a4f087fca79a326556cf9b033c7ce.tar.bz2 serverdata-9fe82807061a4f087fca79a326556cf9b033c7ce.tar.xz serverdata-9fe82807061a4f087fca79a326556cf9b033c7ce.zip | |
Merge pull request #246 from mekolat/candor-announce-fix
fix candor announcements
Diffstat (limited to 'world')
| -rw-r--r-- | world/map/npc/029-1/barrier.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/029-3/parua.txt | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt index 1acb0d17..4446ac6c 100644 --- a/world/map/npc/029-1/barrier.txt +++ b/world/map/npc/029-1/barrier.txt @@ -9,3 +9,11 @@ L_Block: message strcharinfo(0), "Some force seems to be blocking you from entering."; end; } + +029-1.gat,69,61,0|script|#CandorAnnouncer|127 +{ + end; +OnCommandTalk: + npctalk $@candor_npctalk$; + end; +} diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt index db0ae0a1..78feb900 100644 --- a/world/map/npc/029-3/parua.txt +++ b/world/map/npc/029-3/parua.txt @@ -1,6 +1,8 @@ // Parua's fight 029-3.gat,50,25,0|script|Parua|183 { + set $@candor_npctalk$, "The dungeon is now ready for its next victims."; + donpcevent "#CandorAnnouncer::OnCommandTalk"; set @FIGHT_CAVE_COST, 20000; set @FIGHT_CAVE_COST$, "20,000"; set @FIGHT_CAVE_ANNOUNCE_COST, 3000; @@ -217,7 +219,8 @@ L_NextRound: areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnNewRound"; - mapannounce "029-1.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; + set $@candor_npctalk$, "The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive."; + donpcevent "#CandorAnnouncer::OnCommandTalk"; mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; set $@MOB_1_SUMMON, 0; @@ -350,7 +353,8 @@ OnInit: L_CleanUp: npctalk "Game Over"; - mapannounce "029-1.gat", "Parua: The dungeon is now ready for its next victims.", 0; + set $@candor_npctalk$, "The dungeon is now ready for its next victims."; + donpcevent "#CandorAnnouncer::OnCommandTalk"; areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnReward"; set $@FIGHT_CAVE_STATUS, 0; set $@FIGHT_CAVE_PAID, 0; |