From e6d729932ce1dd75939f6e2df8ba943c05cc51df Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 30 Nov 2013 16:33:16 -0800 Subject: Make globals show as from their speaker properly --- world/map/npc/009-6/brodomir.txt | 6 +++--- world/map/npc/013-1/flowerpentagram.txt | 3 ++- world/map/npc/029-3/parua.txt | 12 ++++++------ world/map/npc/051-3/reinforcements.txt | 2 +- world/map/npc/052-2/partyroom.txt | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt index 56139103..ec05d50f 100644 --- a/world/map/npc/009-6/brodomir.txt +++ b/world/map/npc/009-6/brodomir.txt @@ -129,11 +129,11 @@ L_Go: set $@BRODOMIR_MONEY, @brodomir_money; set $@brodomir_delay_seconds, 600; set $@BRODOMIR_PVP_STATUS, 1; - announce "Brodomir: In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0; + announce "Brodomir : In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0; if ($@BRODOMIR_ITEM_AMOUNT > 0) - announce "Brodomir: The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0; + announce "Brodomir : The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0; if ($@BRODOMIR_MONEY > 0) - announce "Brodomir: The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0; + announce "Brodomir : The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0; mes "[Brodomir]"; mes "\"In "+$@brodomir_delay_seconds/60+" minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\""; set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds; diff --git a/world/map/npc/013-1/flowerpentagram.txt b/world/map/npc/013-1/flowerpentagram.txt index 7d9d43ef..2b834a03 100644 --- a/world/map/npc/013-1/flowerpentagram.txt +++ b/world/map/npc/013-1/flowerpentagram.txt @@ -3,7 +3,8 @@ end; OnSummon: - announce "Sagatha: What kind of a foolish trick is this? Who dares to create such calamity in my forest?", 0; + // This is just annoying + //announce "Sagatha : What kind of a foolish trick is this? Who dares to create such calamity in my forest?", 0; callsub S_CleanUp; // area closely to sagatha diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt index 41b5d79c..17cb0791 100644 --- a/world/map/npc/029-3/parua.txt +++ b/world/map/npc/029-3/parua.txt @@ -169,8 +169,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; - mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; + mapannounce "029-1.gat", "Parua : The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; + 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; set $@MOB_2_SUMMON, 0; @@ -214,19 +214,19 @@ L_GlobalAnnounce: L_Five_Minutes: if ($@ANNOUNCE_TIME - gettimetick(2) > 300) end; - announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; + announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 2; end; L_Ten_Minutes: if ($@ANNOUNCE_TIME - gettimetick(2) > 600) end; - announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 10 minutes. Right now, there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; + announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 10 minutes. Right now, there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 3; end; L_Fifteen_Minutes: - announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 15 minutes, so prepare yourself and call your friends. At the moment there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; + announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 15 minutes, so prepare yourself and call your friends. At the moment there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 4; end; @@ -300,7 +300,7 @@ OnInit: L_CleanUp: npctalk "Game Over"; - mapannounce "029-1.gat", "Parua: The dungeon is now ready for its next victims.", 0; + mapannounce "029-1.gat", "Parua : The dungeon is now ready for its next victims.", 0; areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnReward"; set $@FIGHT_CAVE_STATUS, 0; set $@FIGHT_CAVE_PLAYER_COUNT, 0; diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt index 0aff4abc..09ec6cf6 100644 --- a/world/map/npc/051-3/reinforcements.txt +++ b/world/map/npc/051-3/reinforcements.txt @@ -50,7 +50,7 @@ OnRnfrcmts: // Spawn 4 bandit lords areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::OnB"; initnpctimer; - mapannounce "051-3.gat", "Bandit Lords: Do not let them escape!!" , 0; + mapannounce "051-3.gat", "Bandit Lords : Do not let them escape!!" , 0; areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts"; end; diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt index 6d001485..493cd55d 100644 --- a/world/map/npc/052-2/partyroom.txt +++ b/world/map/npc/052-2/partyroom.txt @@ -216,7 +216,7 @@ OnDeath: end; set $@illia_level_7_progress, 4; killmonster "052-2.gat", "#LuviaDaemon::OnWGD"; - mapannounce "052-2.gat", "Luvia: How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; + mapannounce "052-2.gat", "Luvia : How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; set $@illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120; areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP"; -- cgit v1.2.3-60-g2f50