summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/commands/event.txt5
-rw-r--r--npc/functions/aurora.txt52
2 files changed, 51 insertions, 6 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index aff195ed2..b87d0c247 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -69,6 +69,11 @@ function script sClear {
// Hand Aurora Event Rewards
callfunc("FYRewardEvent");
+ $WORLDEXPO_ENEMY$="";
+ deletearray $FYREWARD_PT;
+ deletearray $FYREWARD_ID;
+ deletearray $FYREWARD_AM;
+ $FYLOGIN_PTS=0;
// Simpler events
$PATRICK_DAYCTRL=0;
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index f93552d26..c5041c04a 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -64,16 +64,17 @@ function script FYNewEvent {
break;
case 2:
$EVENT$="Expo";
- $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN");
+ callfunc("FYEConf_Expo");
kamibroadcast("World Expo is now open!", "Aurora Events");
break;
case 3:
$EVENT$="Regnum";
- callfunc("FYE_Regnum");
+ callfunc("FYEConf_Regnum");
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");
break;
case 5:
@@ -84,7 +85,7 @@ function script FYNewEvent {
case 6:
// FIXME: PLACEHOLDER
$EVENT$="Expo";
- $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN");
+ callfunc("FYEConf_Expo");
kamibroadcast("World Expo is now open!", "Aurora Events");
break;
case 7:
@@ -96,6 +97,7 @@ function script FYNewEvent {
case 8:
// FIXME: PLACEHOLDER
$EVENT$="Fishing";
+ callfunc("FYEConf_Fishing");
kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
break;
case 9:
@@ -106,7 +108,7 @@ function script FYNewEvent {
case 10:
// FIXME: PLACEHOLDER
$EVENT$="Expo";
- $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN");
+ callfunc("FYEConf_Expo");
kamibroadcast("World Expo is now open!", "Aurora Events");
break;
case 11:
@@ -118,6 +120,7 @@ function script FYNewEvent {
case 12:
// FIXME: PLACEHOLDER
$EVENT$="Fishing";
+ callfunc("FYEConf_Fishing");
kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
break;
}
@@ -126,6 +129,10 @@ function script FYNewEvent {
}
+
+
+
+
// Modify Kamelot
function script FYE_Kamelot {
.@g=getcharid(2);
@@ -159,8 +166,12 @@ function script FYE_Kamelot {
}
-// Regnum Blessing
-function script FYE_Regnum {
+
+
+
+
+// Configure Regnum Blessing
+function script FYEConf_Regnum {
setarray .@ma$, "004-1", "007-1", "004-2", "010-2", "014-3", "014-5", "015-5",
"018-3", "019-1", "025-2", "025-2-1", "soren";
setarray .@mb$, "Tulimshar Outskirts", "Tulimshar Mines",
@@ -178,6 +189,21 @@ function script FYE_Regnum {
}
+
+
+
+
+// Configure World Expo
+function script FYEConf_Expo {
+ $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN");
+ setarray $FYREWARD_PT, 100, 200;
+ setarray $FYREWARD_ID, Bread, Bread;
+ setarray $FYREWARD_AM, 1, 2;
+ $FYLOGIN_PTS=rand2(18,22);
+ return;
+}
+
+
// Modify Treasure Chests
function script FYE_Expo {
// TODO: Merit-based random formula
@@ -188,6 +214,20 @@ function script FYE_Expo {
}
+
+
+
+
+// Configure Fishing
+function script FYEConf_Fishing {
+ setarray $FYREWARD_PT, 100, 200;
+ setarray $FYREWARD_ID, Bread, Bread;
+ setarray $FYREWARD_AM, 1, 2;
+ $FYLOGIN_PTS=rand2(6,8);
+ return;
+}
+
+
// Modify Fishing
function script FYE_Fishing {
// TODO: Merit-based random formula