New item selection to Erik, the Homunculus Dispatcher

2 files changed, 55 insertions, 12 deletions

diff --git a/npc/017-10/dispatcher.txt b/npc/017-10/dispatcher.txt
index ea01f3583..0d8ae71ab 100644
--- a/npc/017-10/dispatcher.txt
+++ b/npc/017-10/dispatcher.txt
@@ -180,7 +180,8 @@ L_Main:
                     getitemlink(SnakeEgg)+
                     getitemlink(SnakeTongue));
             mesc l("Regular Drops: "+
-                    getitemlink(SnakeSkin));
+                    getitemlink(SnakeSkin)+
+                    getitemlink(BlackMambaEgg));
             mesc l("Rare Drops: "+
                     getitemlink(JeansShorts)+
                     getitemlink(DivineApple)+
@@ -198,7 +199,7 @@ L_Main:
                     getitemlink(MoubooSteak)+
                     getitemlink(HastePotion)+
                     getitemlink(StrengthPotion)+
-                    getitemlink(SmokeGrenade)+
+                    getitemlink(SmallMushroom)+
                     getitemlink(Grenade)+
                     getitemlink(MercBoxA)+
                     getitemlink(AncientBlueprint)+
@@ -221,7 +222,7 @@ L_Main:
                     getitemlink(Curshroom)+
                     getitemlink(HastePotion)+
                     getitemlink(StrengthPotion)+
-                    getitemlink(SmokeGrenade)+
+                    getitemlink(SmallMushroom)+
                     getitemlink(Grenade)+
                     getitemlink(AncientBlueprint)+
                     getitemlink(DungeonMap)+
@@ -241,9 +242,29 @@ L_Main:
             mesc ".:: " + l("Moubootaur's Domain") + " ::.";
             mesc l("Send your Homunculus to THE most dangerous...!");
             mesc l("Average EXP: "+format_number(1500000)), 3;
-            mesc l("Common Drops: None");
-            mesc l("Regular Drops: None");
-            mesc l("Rare Drops: None");
+            mesc l("Common Drops: "+
+                    getitemlink(Wurtzite)+
+                    getitemlink(ChickenLeg)+
+                    getitemlink(Tomato));
+            mesc l("Regular Drops: "+
+                    getitemlink(Quill)+
+                    getitemlink(DodgeDonut)+
+                    getitemlink(MintDonut)+
+                    getitemlink(ChocolateDonut)+
+                    getitemlink(StrawberryDonut)+
+                    getitemlink(SparklyChocolateDonut)+
+                    getitemlink(SparklyStrawberryDonut)+
+                    getitemlink(SkullBloodyMug)+
+                    getitemlink(PurificationPotion)+
+                    getitemlink(DeathPotion)+
+                    getitemlink(CrazyRum)+
+                    getitemlink(MercBoxC));
+            mesc l("Rare Drops: "+
+                    getitemlink(Setzer)+
+                    getitemlink(TortugaShell),
+                    getitemlink(SaviorBlueprint)+
+                    getitemlink(DivineApple)+
+                    getitemlink(MagicApple));
             next;
             .@dest=HCD_MOUBOOTAUR;
             .@hours=12;
@@ -260,7 +281,8 @@ L_Main:
                     getitemlink(Cheese)+
                     getitemlink(Beer));
             mesc l("Rare Drops: "+
-                    getitemlink(TreasureMap));
+                    getitemlink(TreasureMap)+
+                    getitemlink(DungeonMap));
             next;
             .@dest=HCD_MARKET;
             .@hours=1;
@@ -358,6 +380,7 @@ function lootField {
         anyloot(SnakeEgg, limit(1, .@lv/8, 10), 9600,
                 SnakeTongue, limit(1, .@lv/16, 5), 9500,
                 SnakeSkin, limit(1, .@lv/20, 3), 7000,
+                BlackMambaEgg, limit(1, .@lv/40, 3), 4000,
                 JeansShorts, 1, 300,
                 DivineApple, 1, 10,
                 Kanabo, 1, 1); // Teasing Xanthem for mapping here
@@ -366,7 +389,7 @@ function lootField {
         .@val+=140000;
         anyloot(HastePotion, limit(1, .@lv/20, 10), 4000,
                 StrengthPotion, limit(1, .@lv/20, 10), 4000,
-                SmokeGrenade, limit(1, .@lv/18, 8), 4000,
+                SmallMushroom, limit(1, .@lv/18, 8), 4000,
                 Grenade, limit(1, .@lv/28, 6), 3000,
                 MoubooSteak, limit(1, .@lv/28, 6), 2500,
                 MercBoxA, 1, 2000,
@@ -382,7 +405,7 @@ function lootField {
         anyloot(HastePotion, limit(1, .@lv/20, 10), 6000,
                 StrengthPotion, limit(1, .@lv/20, 10), 6000,
                 Curshroom, limit(1, .@lv/28, 6), 4500,
-                SmokeGrenade, limit(1, .@lv/18, 8), 4500,
+                SmallMushroom, limit(1, .@lv/18, 8), 4500,
                 Grenade, limit(1, .@lv/28, 6), 3500,
                 AncientBlueprint, 1, 2500,
                 DungeonMap, 1, 2000,
@@ -396,6 +419,25 @@ function lootField {
         break;
     case HCD_MOUBOOTAUR:
         .@val+=1500000;
+        anyloot(Tomato, limit(1, .@lv/20, 8), 10000,
+                Wurtzite, limit(1, .@lv/25, 6), 95000,
+                ChickenLeg, limit(1, .@lv/25, 6), 95000,
+                Quill, 1, 6500,
+                SkullBloodyMug, limit(1, .@lv/28, 5), 4200,
+                ChocolateDonut, limit(1, .@lv/24, 5), 4000,
+                StrawberryDonut, limit(1, .@lv/24, 5), 4000,
+                DodgeDonut, limit(1, .@lv/22, 5), 3500,
+                MintDonut, limit(1, .@lv/22, 5), 3500,
+                SparklyChocolateDonut, limit(1, .@lv/26, 5), 3000,
+                SparklyStrawberryDonut, limit(1, .@lv/26, 5), 3000,
+                DeathPotion, limit(1, .@lv/41, 3), 2000,
+                PurificationPotion, limit(1, .@lv/42, 3), 1800,
+                CrazyRum, limit(1, .@lv/44, 3), 1500,
+                MercBoxC, 1, 1000,
+                TortugaShell, 10, 80,
+                DivineApple, 1, 70,
+                MagicApple, 1, 50,
+                Setzer, 1, 6);
         break;
     case HCD_MARKET:
         .@val+=36;
@@ -405,7 +447,8 @@ function lootField {
                 Bread, limit(1, .@lv/3, 12), 7000,
                 Cheese, .@lv, 5000,
                 Beer, limit(1, .@lv/10, 10), 1200,
-                TreasureMap, 1, 420);
+                TreasureMap, 1, 420,
+                DungeonMap, 1, 280);
         break;
     }
     // A final boost for sake of randomness
@@ -418,7 +461,7 @@ OnInit:
     .distance=5;
     // Old Maximum Profit: 10,000 GP
     // Coin Bag farming: 180 mobs, at 5% drop rate: 5,000 GP max
-    .zenycap=7500;
+    .zenycap=7500*min(1, ($GAME_STORYLINE+1)/2);
     end;
 
 }
diff --git a/npc/031-5/beatrice.txt b/npc/031-5/beatrice.txt
index 6671ef7ac..711d13535 100644
--- a/npc/031-5/beatrice.txt
+++ b/npc/031-5/beatrice.txt
@@ -123,7 +123,7 @@ OnInit:
     .ratio = 100; // Max drop rate
     // Some items can be obtained by "other means" and thus, their value cannot be
     // reliably calculated
-    setarray .blacklist, GuildCoin, WarlordPlate, Lightsaber, PowerfulLightsaber, Emperium, PinkieCrystal, PinkieHat, IronIngot, Kanabo, WarlordHelmet, Kitana, LeatherGloves, SacredManaPotion, EverburnPowder, WoodenSword, MoubooFigurine, FancyHat, LOFCoin, JeansShorts, MinerHat, LeatherShield, Boots, CommonCarp, IcedBottle, ShortBow, CottonShirt, MinerGloves, LoveLetter, LegendaryTortuga, ChocolateDye;
+    setarray .blacklist, GuildCoin, WarlordPlate, Lightsaber, PowerfulLightsaber, Emperium, PinkieCrystal, PinkieHat, IronIngot, Kanabo, WarlordHelmet, Kitana, LeatherGloves, SacredManaPotion, EverburnPowder, WoodenSword, MoubooFigurine, FancyHat, LOFCoin, JeansShorts, MinerHat, LeatherShield, Boots, CommonCarp, IcedBottle, ShortBow, CottonShirt, MinerGloves, LoveLetter, LegendaryTortuga, ChocolateDye, Quill;
 
 	tradertype(NST_CUSTOM);
     // Okay, so for the catalog