1 files changed, 5 insertions, 50 deletions
diff --git a/npc/020-1/siege.txt b/npc/020-1/siege.txt
index d73d62f15..49b7c41af 100644
--- a/npc/020-1/siege.txt
+++ b/npc/020-1/siege.txt
@@ -14,7 +14,7 @@ OnLoop:
     @nlib_time+=5; // This is looped every 5 s
 
     // Victory conditions: All monsters dead & number of waves filled. (Or if you reach level 40)
-    if (BaseLevel >= 40 || (@nlib_wave >= 10 && mobcount("020-1", "#NLib_Siege::OnPetDeath") <= 0))
+    if (BaseLevel >= 30 || (@nlib_wave >= 10 && mobcount("020-1", "#NLib_Siege::OnPetDeath") <= 0))
         goto L_CleanUp;
 
     // New wave condition: Waves pending and A- All Mobs Dead B- 4 minutes spent
@@ -33,55 +33,10 @@ L_NextRound:
     .@amount=@nlib_wave+rand(1,2);
     freeloop(true);
 	for (.@i = 0; .@i < .@amount; ++.@i) {
-        .@mid=rand(1,22);
-        .@monsterId=Piou;
-        switch (.@mid) {
-            case 1:
-                .@monsterId = CaveMaggot ; break;
-            case 2:
-                .@monsterId = GiantMaggot ; break;
-                //.@monsterId = Wolvern ; break;
-            case 3:
-                .@monsterId = WhiteSlime ; break;
-            case 4:
-                .@monsterId = MagicGoblin ; break;
-            case 5:
-                .@monsterId = Bandit ; break;
-            case 6:
-                .@monsterId = GreenSlime ; break;
-            case 7:
-                .@monsterId = LavaSlime ; break;
-            case 8:
-                .@monsterId = CaveSnake ; break;
-            case 9:
-                .@monsterId = DesertBandit ; break;
-            case 10:
-                .@monsterId = Sarracenus ; break;
-            case 11:
-                .@monsterId = AngryRedScorpion ; break;
-            case 12:
-                .@monsterId = IcedFluffy ; break;
-            case 13:
-                .@monsterId = Scorpion ; break;
-            case 14:
-                .@monsterId = RedScorpion ; break;
-            case 15:
-                .@monsterId = BlackSlime ; break;
-            case 16:
-                .@monsterId = Piousse ; break;
-            case 17:
-                .@monsterId = CandiedSlime ; break;
-            case 18:
-                .@monsterId = BlueSlime ; break;
-            case 19:
-                .@monsterId = SlimeBlast ; break;
-            case 20:
-                .@monsterId = BlackSlime ; break;
-            case 21:
-                .@monsterId = RedSlime ; break;
-            default:
-                .@monsterId = AngryScorpion ; break;
-        }
+        .@monsterId=any(CaveMaggot, WhiteSlime, MagicGoblin, Bandit, GreenSlime,
+                        CaveSnake, LavaSlime, DesertBandit, AngryRedScorpion,
+                        Scorpion, RedScorpion, BlackSlime, Piousse, CandiedSlime,
+                        AzulSlime, BlueSlime, SlimeBlast, RedSlime, AngryScorpion);
         areamonster "020-1", 20, 20, 100, 100, strmobinfo(1, .@monsterId), .@monsterId, 1, "#NLib_Siege::OnPetDeath";
     }
     freeloop(false);