summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormekolat <mekolat@gmail.com>2015-01-14 21:20:44 -0500
committermekolat <mekolat@gmail.com>2015-01-14 22:36:11 -0500
commita691a9fdb0ceed48367283de57a932a59eddb908 (patch)
treec710cef4cc80c0591491663e5bf15939cc6438c0
parent3d7fd218c50a39c643245d3520e4bbd314e4f3fa (diff)
downloadserverdata-a691a9fdb0ceed48367283de57a932a59eddb908.tar.gz
serverdata-a691a9fdb0ceed48367283de57a932a59eddb908.tar.bz2
serverdata-a691a9fdb0ceed48367283de57a932a59eddb908.tar.xz
serverdata-a691a9fdb0ceed48367283de57a932a59eddb908.zip
fix candor announcements
-rw-r--r--world/map/npc/029-1/barrier.txt8
-rw-r--r--world/map/npc/029-3/parua.txt8
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 cb236d52..1083df43 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;
@@ -189,7 +191,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;
@@ -322,7 +325,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;