summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-02-01 12:55:15 -0600
committerWushin <pasekei@gmail.com>2015-02-01 12:55:15 -0600
commit44d34c2835e8f6601bbb0e320c82240c19cdbea3 (patch)
tree53a668204db2f70b6aa30da7f43f4348c847d676
parent69638d932f76c807218b5d5a3649ffe190906d2d (diff)
parent29d114cbe216e3b521f089ce591256b6802f7ab7 (diff)
downloadserverdata-44d34c2835e8f6601bbb0e320c82240c19cdbea3.tar.gz
serverdata-44d34c2835e8f6601bbb0e320c82240c19cdbea3.tar.bz2
serverdata-44d34c2835e8f6601bbb0e320c82240c19cdbea3.tar.xz
serverdata-44d34c2835e8f6601bbb0e320c82240c19cdbea3.zip
Merge pull request #259 from mekolat/candor-announcements
yet another candor "fix"
-rw-r--r--world/map/npc/029-3/parua.txt17
1 files changed, 12 insertions, 5 deletions
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 78feb900..d2158a4a 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -154,7 +154,7 @@ L_Explain_Boss_Points:
mes "[Parua]";
mes "\"Boss points are another type of experience.\"";
next;
- mes "\"Fighting experience makes you level up, magic experience makes your spells more effective and allows you to learn new spells.\"";
+ mes "\"Fighting experience makes you level up, magic experience makes your spells more effective and allows you to learn new spells.\"";
next;
mes "\"Boss Points show your skills and nerves in important battles and heroic actions.\"";
next;
@@ -162,7 +162,7 @@ L_Explain_Boss_Points:
menu
"Thanks, I will think about your offer now.", L_Exit,
"I want to challenge the powers in this cave.", L_Next;
-
+
L_Stuck:
mes "[Parua]";
mes "\"I see. I can teleport you to another nice cave.\"";
@@ -253,6 +253,7 @@ L_Summon:
goto L_Return_1;
L_GlobalAnnounce:
+ set $@FIGHT_CAVE_PLAYER_COUNT, getmapusers("029-3.gat");
if ($@FIGHT_CAVE_STATUS == 3)
goto L_Five_Minutes;
if ($@FIGHT_CAVE_STATUS == 4)
@@ -266,19 +267,25 @@ 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;
+ 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;
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;
+ if($@FIGHT_CAVE_PLAYER_COUNT == 1) 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 ##B##610 minutes##1##b. Right now, 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. You still have time to prepare yourself for this fight, since it will only start in ##B##610 minutes##1##b. Right now, 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. You still have time to prepare yourself for this fight, since it will only start in ##B##610 minutes##1##b. Right now, there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 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;
+ if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. 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. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. 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. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. At the moment there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
set $@FIGHT_CAVE_STATUS, 4;
end;