summaryrefslogtreecommitdiff
path: root/npc/functions/aurora.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions/aurora.txt')
-rw-r--r--npc/functions/aurora.txt20
1 files changed, 10 insertions, 10 deletions
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 436750890..3cf52ee1b 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -96,9 +96,9 @@ function script FYNewEvent {
kamibroadcast("Regnum's Blessing: "+$REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
break;
case 4:
- $EVENT$="Fishing";
- callfunc("FYEConf_Fishing");
- kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
+ $EVENT$="Raid";
+ callfunc("FYEConf_Raid");
+ kamibroadcast("Oh noes! "+$RAIDING_BOSS$+" is attacking our world!", "Aurora Events");
break;
case 5:
$EVENT$="Candor";
@@ -115,9 +115,10 @@ function script FYNewEvent {
kamibroadcast("Kamelot Season is now open!", "Aurora Events");
break;
case 8:
- $EVENT$="Raid";
- callfunc("FYEConf_Raid");
- kamibroadcast("Oh noes! "+$RAIDING_BOSS$+" is attacking our world!", "Aurora Events");
+ // FIXME: PLACEHOLDER
+ $EVENT$="Expo";
+ callfunc("FYEConf_Expo");
+ kamibroadcast("World Expo is now open!", "Aurora Events");
break;
case 9:
// FIXME: PLACEHOLDER
@@ -126,10 +127,9 @@ function script FYNewEvent {
kamibroadcast("Regnum's Blessing: "+$REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
break;
case 10:
- // FIXME: PLACEHOLDER
- $EVENT$="Expo";
- callfunc("FYEConf_Expo");
- kamibroadcast("World Expo is now open!", "Aurora Events");
+ $EVENT$="Fishing";
+ callfunc("FYEConf_Fishing");
+ kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
break;
case 11:
// FIXME: PLACEHOLDER