Standardize the Ranked Event Rewards - should be smoother now

1 files changed, 43 insertions, 22 deletions

diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 88027889d..e142490ab 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -133,7 +133,7 @@ function	script	FYNewEvent	{
 
 
 
-// Returns an item: (type, lv)
+// Returns an item: (type, lv). Used by the function below (FYE_Autoset)
 // types: misc, bp, warp, pot, heal, ore, magic, gift
 // maxlv:  3    5     2    3    -     6     -     5
 function	script	FYT	{
@@ -226,6 +226,36 @@ function	script	FYT	{
 
 
 
+
+function	script	FYE_Autoset	{
+    // Sets 30 ranked rewards
+    .@b=FY_BP; .@g=FY_GIFT; .@h=FY_HEAL; .@m=FY_MISC; .@mg=FY_MAGIC;
+    .@o=FY_ORE; .@p=FY_POT; .@w=FY_WARP;
+
+    setarray $FYREWARD_ID, FYT(.@g, 1), StrangeCoin, FYT(.@m, 1), FYT(.@b, 1), FYT(.@p, 1),
+                           FYT(.@h, 1), FYT(.@o, 1), FYT(.@o, 6), FYT(.@g, 2), FYT(.@w, 1),
+                           FYT(.@b, 2), FYT(.@m, 2), FYT(.@o, 2), FYT(.@p, 2), FYT(.@o, 3),
+                           FYT(.@b, 3), FYT(.@m, 3), StrangeCoin, FYT(.@mg, 1), FYT(.@g, 3),
+                           FYT(.@w, 2), StrangeCoin, FYT(.@b, 4), FYT(.@p, 3), AncientBlueprint,
+                           FYT(.@g, 4), FYT(.@o, 4), FYT(.@b, 5), FYT(.@o, 5), FYT(.@g, 5);
+
+    // Item Amount Table
+    .@hv=rand2(1,3);
+    .@p1=any(1,2); .@p2=(.@p1 == 1 ? 2 : 1);
+    setarray  $FYREWARD_AM, 1, 20, 1, 1, .@p1,
+                            .@hv, 1, 1, 1, 1,
+                            1, 1, 1, .@p2, 1,
+                            1, 1, 60, 1, 1,
+                            1, 100, 1, 1, 1,
+                            1, 1, 1, 1, 1;
+    return;
+}
+
+
+
+
+
+
 // Modify Kamelot
 function	script	FYE_Kamelot	{
     .@g=getcharid(2);
@@ -294,25 +324,15 @@ function	script	FYEConf_Regnum	{
 // Configure World Expo
 function	script	FYEConf_Expo	{
     $WORLDEXPO_ENEMY$=any("Xakabael the Dark", "Isbamuth", "Saulc", "SUSAN", "Terogan");
-    setarray $FYREWARD_PT, 100, 220, 440, 880, 1760,
-                           3520, 7040, 10560, 14080, 21120,
-                           28160, 42240, 56320, 84480, 112640,
-                           168960, 225280;
-
-    // FYEIT: misc, bp, warp, pot, heal, ore, magic, gift
-    // maxlv:  3    5     2    3    -     6     -     5
-    .@b=FY_BP; .@g=FY_GIFT; .@h=FY_HEAL; .@m=FY_MISC; .@mg=FY_MAGIC;
-    .@o=FY_ORE; .@p=FY_POT; .@w=FY_WARP;
-
-    // Misc: AncientBlueprint, StrangeCoin
-    setarray $FYREWARD_ID, FYT(.@g, 1), StrangeCoin, FYT(.@m, 1), FYT(.@b, 1), FYT(.@p, 1),
-                           FYT(.@h, 1), FYT(.@o, 1), FYT(.@g, 2), FYT(.@w, 1), FYT(.@b, 2),
-                           FYT(.@m, 2), FYT(.@p, 2), FYT(.@o, 2), FYT(.@b, 3), FYT(.@mg, 1),
-                           FYT(.@o, 3), FYT(.@o, 4);
-    setarray  $FYREWARD_AM, 1, 20, 1, 1, any(1,2),
-                            rand2(1,3), 1, 1, 1, 1,
-                            1, any(1,2), 1, 1, 1,
-                            1, 1;
+    setarray $FYREWARD_PT, 100, 220, 440, 880, 1320,
+                           1760, 2640, 3520, 5280, 7040,
+                           10560, 14080, 21120, 28160, 35200,
+                           42240, 56320, 70400, 84480, 112640,
+                           140800, 168960, 197120, 225280, 281160,
+                           337920, 394240, 450560, 550000, 675000;
+    // PS. Max Est. 225280 pts (#24 - Before Ancient Blueprint)
+
+    FYE_Autoset();
     $FYLOGIN_PTS=rand2(18,22);
     return;
 }
@@ -336,8 +356,9 @@ 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;
+    // PS. Max Est. ????? pts (#?? - [????])
+
+    FYE_Autoset();
     $FYLOGIN_PTS=rand2(6,8);
     return;
 }