Prepare GM Gift Box so it can be used reliably

2 files changed, 7 insertions, 11 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 96d2e2eba..3b6579caa 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -6440,11 +6440,7 @@ mob_db: (
 	AttackMotion: 672
 	DamageMotion: 480
 	Drops: {
-		CasinoCoins: 2000
-		MysteriousBottle: 2000
-		CelestiaTea: 2000
-		BronzeGift: 2000
-		Pearl: 2000
+		StrangeCoin: 10000
 	}
 },
 {
diff --git a/npc/042-5/ctrl.txt b/npc/042-5/ctrl.txt
index e3c520cd8..246d85cd7 100644
--- a/npc/042-5/ctrl.txt
+++ b/npc/042-5/ctrl.txt
@@ -35,12 +35,12 @@ OnInstanceInit:
     areamonster(.map$, 20, 20, 80, 100, strmobinfo(1, ManaGhost), ManaGhost, max(1, .@mx/10));
 
     // Bonus monsters
+    if (!rand2(3))
+        areamonster(.map$, 20, 20, 60, 100, strmobinfo(1, WhirlyBird), WhirlyBird, 1);
     if (!rand2(2))
-        areamonster(.map$, 20, 20, 80, 100, strmobinfo(1, MagicBif), MagicBif, 1);
+        areamonster(.map$, 20, 20, 60, 100, strmobinfo(1, SilverChest), SilverChest, 1);
     if (!rand2(2))
-        areamonster(.map$, 20, 20, 80, 100, strmobinfo(1, SilverChest), SilverChest, 1);
-    if (!rand2(2))
-        areamonster(.map$, 20, 20, 80, 100, strmobinfo(1, BronzeChest), BronzeChest, 1);
+        areamonster(.map$, 20, 20, 60, 100, strmobinfo(1, BronzeChest), BronzeChest, 2);
     // Next time I promise a Whirly Bird >.>
     end;
 
@@ -124,6 +124,7 @@ function	script	KamelotTreasure	{
         mesc l("The chest is unlocked and empty.");
         close;
     }
+    inventoryplace Iten, 1, NPCEyes, 2;
 
     mesc l("Open the chest?");
     mesc l("Cost: 1 @@", getitemlink(TreasureKey)), 1;
@@ -153,10 +154,9 @@ function	script	KamelotTreasure	{
         else if (.@r < 300) // 0.3% each
             .@loot=any(MagicApple, PrismGift, EquipmentBlueprintD, ChampionshipBow, Halberd, AncientShield, AncientSword, Setzer, MercBoxD, Shemagh);
         else
-            .@loot=any(SacredImmortalityPotion, DivineApple, ArcmageBoxset, GoldenApple, MercBoxA, MercBoxB, MercBoxC, MoveSpeedPotion, AtroposMixture, EverburnPowder, IridiumOre, PlatinumOre, YerbaMate, SmokeGrenade, SnakeEgg, LachesisBrew, BoneAmmoBox, GoldPieces, SilverGift, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, FluoPowder, EquipmentBlueprintC, AlchemyBlueprintC, AlchemyBlueprintD, AncientBlueprint, JasmineTea, MoubooSteak, ClothoLiquor, Coal, RedPlushWine, HastePotion, CoinBag, StrengthPotion, Dagger, BronzeGift, IronOre, CopperOre, BlueDye, EquipmentBlueprintB, AlchemyBlueprintB, AlchemyBlueprintC, OolongTea, Croconut, Potatoz, MoubooSteak, ClothoLiquor, Coal, SmallMushroom, HastePotion, StrengthPotion, WoodenLog, LeatherPatch, DwarvenSake, EquipmentBlueprintA, EquipmentBlueprintB, AlchemyBlueprintA, SpearmintTea, TreasureMap, FatesPotion, CrazyRum, LightGreenDiamond, EarthPowder, WoodenLog, LeatherPatch, FluoPowder, ChamomileTea); // > 70 options (~1% each)
+            .@loot=any(SacredImmortalityPotion, DivineApple, ArcmageBoxset, GoldenApple, MercBoxA, MercBoxB, MercBoxC, MoveSpeedPotion, AtroposMixture, EverburnPowder, IridiumOre, PlatinumOre, YerbaMate, SmokeGrenade, SnakeEgg, LachesisBrew, BoneAmmoBox, GoldPieces, SilverGift, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, FluoPowder, EquipmentBlueprintC, AlchemyBlueprintC, AlchemyBlueprintD, AncientBlueprint, JasmineTea, MoubooSteak, ClothoLiquor, Coal, RedPlushWine, HastePotion, CoinBag, StrengthPotion, Pearl, BronzeGift, IronOre, CopperOre, BlueDye, EquipmentBlueprintB, AlchemyBlueprintB, AlchemyBlueprintC, OolongTea, Croconut, CelestiaTea, MoubooSteak, ClothoLiquor, Coal, SmallMushroom, HastePotion, StrengthPotion, WoodenLog, LeatherPatch, DwarvenSake, EquipmentBlueprintA, EquipmentBlueprintB, AlchemyBlueprintA, SpearmintTea, TreasureMap, FatesPotion, CrazyRum, LightGreenDiamond, EarthPowder, WoodenLog, MysteriousBottle, FluoPowder, ChamomileTea); // > 70 options (~1% each)
 
 
-        inventoryplace .@loot, 1;
         mesc l("You find @@ inside!", getitemlink(.@loot));
         getitem .@loot, 1;
     } else {