Redesign how shovel_scatter() works, I had to remove an option from Aeros master.

Now, Aeros is just an automatic scatter area.

1 files changed, 7 insertions, 16 deletions

diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index 29590f4f8..4abc9b5fa 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -45,12 +45,12 @@
         // [0] East [1] West [2] Full makeitem
         switch($@AEROS_SPWN) {
         case 1:
-            shovel_scatter("001-1", 20, 20, 140, 140, getarg(0), getarg(1,1));
+            shovel_scatter("001-1", 20, 20, 140, 140, getarg(1,1), getarg(0));
             break;
         case 2:
-            shovel_scatter("001-1", 20, 20, 340, 160, getarg(0), getarg(1,1));
+            shovel_scatter("001-1", 20, 20, 340, 160, getarg(1,1), getarg(0));
         default:
-            shovel_scatter("001-1",171, 20, 340, 160, getarg(0), getarg(1,1));
+            shovel_scatter("001-1",171, 20, 340, 160, getarg(1,1), getarg(0));
         }
     }
 
@@ -768,7 +768,6 @@ L_Drop:
     select
         "Abort",                                   // 1
         "Bury 10x Coins",                          // 2
-        "Bury Random Crap",                        // 3
         "Toothbrush",                              // 4
         "Bronze Gift",                             // 5
         "Silver Gift",                             // 6
@@ -789,22 +788,14 @@ L_Drop:
         case 2:
             buryitem(StrangeCoin, .@c*any(9,10,10,10,11,11)); break;
         case 3:
-            setarray .@Treasure,
-                                Bread,Candy,BugLeg,Cheese,Acorn,
-                                ScorpionStinger,CoinBag,RustyKnife,TreasureKey,CasinoCoins,SulfurPowder,
-                                Coal,IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre,
-                                Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst,
-                                BoneArrow, SacredBullet;
-            buryitem(.@Treasure, .@c*any(9,10,10,10,11,11)); break;
-        case 4:
             mkitem(Toothbrush, .@c); break;
-        case 5:
+        case 4:
             mkitem(BronzeGift, .@c); break;
-        case 6:
+        case 5:
             mkitem(SilverGift, .@c); break;
-        case 7:
+        case 6:
             mkitem(GoldenGift, .@c); break;
-        case 8:
+        case 7:
             mkitem(PrismGift, .@c); break;
         default:
             mkitem(SupremeGift, .@c); break;