Erik is paying less EXP than AFKing at the Carpet... So prepare to update

1 files changed, 26 insertions, 12 deletions

diff --git a/npc/017-10/dispatcher.txt b/npc/017-10/dispatcher.txt
index b47060d36..99b131dfc 100644
--- a/npc/017-10/dispatcher.txt
+++ b/npc/017-10/dispatcher.txt
@@ -65,9 +65,9 @@ L_Main:
         rif(gethominfo(6) >= 10, l("Deploy to Rare Mines [2h]")),
         rif(gethominfo(6) >= 15, l("Deploy to Slime Nest [2h]")),
         rif(gethominfo(6) >= 30, l("Deploy to Snake Pit [3h]")),
-        rif(gethominfo(6) >= 55 && $GAME_STORYLINE >= 3, l("Deploy to Dangerous Area [6h]")),
-        rif(gethominfo(6) >= 70 && $GAME_STORYLINE >= 4, l("Deploy to Monster King Basement [8h]")),
-        "",
+        rif(gethominfo(6) >= 45 && $GAME_STORYLINE >= 3, l("Deploy to Dangerous Area [6h]")),
+        rif(gethominfo(6) >= 60 && $GAME_STORYLINE >= 4, l("Deploy to Monster King Basement [8h]")),
+        rif(gethominfo(6) >= 80 && $GAME_STORYLINE >= 5, l("Deploy to Moubootaur's Domain [12h]")),
         l("Deploy to The Market [1h]"),
         l("Don't deploy");
     mes "";
@@ -92,7 +92,7 @@ L_Main:
         case 2:
             mesc ".:: " + l("Herb Fields") + " ::.";
             mesc l("If you need more herbs, the best place to look.");
-            mesc l("Average EXP: "+10), 3;
+            mesc l("Average EXP: "+60), 3;
             mesc l("Common Drops: "+
                     getitemlink(ArtichokeHerb));
             mesc l("Regular Drops: "+
@@ -109,7 +109,7 @@ L_Main:
         case 3:
             mesc ".:: " + l("Ore Mines") + " ::.";
             mesc l("Send your Homunculus to mineration!");
-            mesc l("Average EXP: "+24), 3;
+            mesc l("Average EXP: "+124), 3;
             mesc l("Common Drops: "+
                     getitemlink(Coal));
             mesc l("Regular Drops: "+
@@ -130,7 +130,7 @@ L_Main:
         case 4:
             mesc ".:: " + l("Rare Mines") + " ::.";
             mesc l("Send your Homunculus to mineration!");
-            mesc l("Average EXP: "+30), 3;
+            mesc l("Average EXP: "+130), 3;
             mesc l("Common Drops: "+
                     getitemlink(Pearl));
             mesc l("Regular Drops: "+
@@ -237,10 +237,21 @@ L_Main:
             .@dest=HCD_MKBASEMENT;
             .@hours=8;
             break;
+        case 9:
+            mesc ".:: " + l("Moubootaur's Domain") + " ::.";
+            mesc l("Send your Homunculus to THE most dangerous...!");
+            mesc l("Average EXP: "+format_number(2000000)), 3;
+            mesc l("Common Drops: None");
+            mesc l("Regular Drops: None");
+            mesc l("Rare Drops: None");
+            next;
+            .@dest=HCD_MOUBOOTAUR;
+            .@hours=12;
+            break;
         case 10:
             mesc ".:: " + l("The Market") + " ::.";
             mesc l("Send your Homunculus to make money!");
-            mesc l("Average EXP: "+16), 3;
+            mesc l("Average EXP: "+36), 3;
             mesc l("Maximum Profit: @@ GP", format_number(.zenycap)), 3;
             mesc l("Common Drops: "+
                     getitemlink(Piberries));
@@ -291,7 +302,7 @@ function lootField {
                 GoldenApple, 1, 100);
         break;
     case HCD_HERBFIELDS:
-        .@val+=10;
+        .@val+=60;
         anyloot(ArtichokeHerb, .@lv, 10000,
                 CobaltHerb, max(1, .@lv/2), 6000,
                 GambogeHerb, max(1, .@lv/2), 6000,
@@ -301,7 +312,7 @@ function lootField {
                 ReedBundle, 2, 800);
         break;
     case HCD_OREMINES:
-        .@val+=24;
+        .@val+=124;
         anyloot(Coal, .@lv, 9999,
                 IronOre, max(1, .@lv/2), 2000,
                 CopperOre, max(1, .@lv/2), 1000,
@@ -314,7 +325,7 @@ function lootField {
                 (REBIRTH ? PlatinumOre : IridiumOre), 1, 20);
         break;
     case HCD_RAREMINES:
-        .@val+=30;
+        .@val+=130;
         anyloot(Pearl, 1, 9999,
                 Diamond, limit(1, .@lv/2, 3), 2000,
                 Ruby, limit(1, .@lv/2, 3), 1700,
@@ -383,8 +394,11 @@ function lootField {
                 DivineApple, 1, 60,
                 MagicApple, 1, 45);
         break;
+    case HCD_MOUBOOTAUR:
+        .@val+=2000000;
+        break;
     case HCD_MARKET:
-        .@val+=16;
+        .@val+=36;
         // Sending a fresh homun in market may yield no GP.
         Zeny+=min(.zenycap, 1000*.@lv*min(10000, gethominfo(3))/100000);
         anyloot(Piberries, .@lv, 9000,
@@ -395,7 +409,7 @@ function lootField {
         break;
     }
     // A final boost for sake of randomness
-    .@val+=rand2(0, 10);
+    .@val+=rand2(0, 10+gethominfo(6));
     return .@val;
 }