summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-16 22:34:26 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-16 22:34:26 -0300
commit69a6202cea85715ee8bd3183744b9f89f3e2c28e (patch)
tree18b1dd195369547add6908ee050cf77def1bcc4e
parent9fc926a4e8ebb8f827d45d60300ea6d993f2be82 (diff)
downloadserverdata-69a6202cea85715ee8bd3183744b9f89f3e2c28e.tar.gz
serverdata-69a6202cea85715ee8bd3183744b9f89f3e2c28e.tar.bz2
serverdata-69a6202cea85715ee8bd3183744b9f89f3e2c28e.tar.xz
serverdata-69a6202cea85715ee8bd3183744b9f89f3e2c28e.zip
Allow World Expo and Catch the Golden Fish events to start
Prepare their scoreboard function - HallOfAurora()
-rw-r--r--npc/commands/event.txt4
-rw-r--r--npc/commands/kami.txt2
-rw-r--r--npc/functions/aurora.txt22
-rw-r--r--npc/functions/scoreboards.txt17
4 files changed, 41 insertions, 4 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index f7a99bdda..abbe5f34c 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -88,10 +88,6 @@ function script sClear {
DelItemFromEveryPlayer(Event2HSword);
DelItemFromEveryPlayer(EventBow);
DelItemFromEveryPlayer(EventWand);
- DelItemFromEveryPlayer(EventTreasure1);
- DelItemFromEveryPlayer(EventTreasure2);
- DelItemFromEveryPlayer(EventTreasure3);
- DelItemFromEveryPlayer(EventFish);
// We must remove any event drop
charcommand("@reloadmobdb");
diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt
index e2e0eb395..3a4e62220 100644
--- a/npc/commands/kami.txt
+++ b/npc/commands/kami.txt
@@ -77,6 +77,8 @@ OnChamp:
//mes "4144 will hear about this. You are NOT amazing by the way.";
select("Ok");
setskin "";
+ HallOfAurora();
+ next;
closeclientdialog;
end;
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 7ebd4c616..5b84bf7b5 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -36,6 +36,11 @@ function script FYNewEvent {
$FYEVENT_CYCLE+=1;
// Overrides standard event system
$EVENT$="";
+ // Delayed cleanup (Just in case)
+ DelItemFromEveryPlayer(EventTreasure1);
+ DelItemFromEveryPlayer(EventTreasure2);
+ DelItemFromEveryPlayer(EventTreasure3);
+ DelItemFromEveryPlayer(EventFish);
// Select the event
switch ($FYEVENT_CYCLE % 12) {
case 1:
@@ -43,6 +48,8 @@ function script FYNewEvent {
kamibroadcast("Kamelot Season is now open!", "Aurora Events");
break;
case 2:
+ $EVENT$="Expo";
+ kamibroadcast("World Expo is now open!", "Aurora Events");
break;
case 3:
$EVENT$="Regnum";
@@ -50,6 +57,8 @@ function script FYNewEvent {
kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
break;
case 4:
+ $EVENT$="Fishing";
+ kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
break;
case 5:
// FIXME: PLACEHOLDER
@@ -58,6 +67,8 @@ function script FYNewEvent {
break;
case 6:
// FIXME: PLACEHOLDER
+ $EVENT$="Expo";
+ kamibroadcast("World Expo is now open!", "Aurora Events");
break;
case 7:
// FIXME: PLACEHOLDER
@@ -67,6 +78,8 @@ function script FYNewEvent {
break;
case 8:
// FIXME: PLACEHOLDER
+ $EVENT$="Fishing";
+ kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
break;
case 9:
// FIXME: PLACEHOLDER
@@ -75,6 +88,8 @@ function script FYNewEvent {
break;
case 10:
// FIXME: PLACEHOLDER
+ $EVENT$="Expo";
+ kamibroadcast("World Expo is now open!", "Aurora Events");
break;
case 11:
// FIXME: PLACEHOLDER
@@ -84,6 +99,8 @@ function script FYNewEvent {
break;
case 12:
// FIXME: PLACEHOLDER
+ $EVENT$="Fishing";
+ kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
break;
}
return;
@@ -177,9 +194,14 @@ function script FYRewardEvent {
debugmes("Rewards are due");
// This code absolutely can't fail:
.@nb = query_sql("SELECT c.name, i.count2, c.char_id FROM `quest` AS i, `char` AS c WHERE i.quest_id="+Q_AuroraEvent+" AND i.char_id=c.char_id ORDER BY i.count2 DESC LIMIT 10", $@aurora_name$, $@aurora_value, $@aurora_charid);
+ $MOST_HEROIC$=$@aurora_name$[0];
// rodex_sendmail($@aurora_charid, "Aurora Events", "Event Reward!", "Message", gp, item, $@aurora_value);
// Destroy the quest
DelQuestFromEveryPlayer(Q_AuroraEvent);
+ DelItemFromEveryPlayer(EventTreasure1);
+ DelItemFromEveryPlayer(EventTreasure2);
+ DelItemFromEveryPlayer(EventTreasure3);
+ DelItemFromEveryPlayer(EventFish);
}
return;
}
diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt
index 119be4634..41863f00b 100644
--- a/npc/functions/scoreboards.txt
+++ b/npc/functions/scoreboards.txt
@@ -311,6 +311,23 @@ function script HallOfReferral {
return;
}
+
+function script HallOfAurora {
+ mes "";
+ mes l("##BHall Of Aurora: TOP10##b");
+ mesf("1. %s (%s)", $@aurora_name$[0], format_number($@aurora_value[0]));
+ mesf("2. %s (%s)", $@aurora_name$[1], format_number($@aurora_value[1]));
+ mesf("3. %s (%s)", $@aurora_name$[2], format_number($@aurora_value[2]));
+ mesf("4. %s (%s)", $@aurora_name$[3], format_number($@aurora_value[3]));
+ mesf("5. %s (%s)", $@aurora_name$[4], format_number($@aurora_value[4]));
+ mesf("6. %s (%s)", $@aurora_name$[5], format_number($@aurora_value[5]));
+ mesf("7. %s (%s)", $@aurora_name$[6], format_number($@aurora_value[6]));
+ mesf("8. %s (%s)", $@aurora_name$[7], format_number($@aurora_value[7]));
+ mesf("9. %s (%s)", $@aurora_name$[8], format_number($@aurora_value[8]));
+ mesf("10. %s (%s)", $@aurora_name$[9], format_number($@aurora_value[9]));
+ return;
+}
+
// Hall of AFK
function script HallOfAFK {
mes "";