Autogenerate 018-2-x mobs

3 files changed, 207 insertions, 15 deletions

diff --git a/npc/018-2-1/warps.txt b/npc/018-2-1/warps.txt
index 4ea412232..a023803be 100644
--- a/npc/018-2-1/warps.txt
+++ b/npc/018-2-1/warps.txt
@@ -33,11 +33,11 @@ OnTouch:
         mes "";
         select
             l("Sorry, I am a newbie."),
-            rif(!(.@q & HH_NOVICE), l("Novice Dungeon")),
-            rif(!(.@q & HH_INTERMEDIARY), l("Intermediary Dungeon")),
-            rif(!(.@q & HH_ADVANCED), l("Advanced Dungeon")),
-            rif(!(.@q & HH_EXPERT), l("Expert Dungeon")),
-            rif((.@q & HH_REQUISITE), l("Master Dungeon")),
+            rif(!(.@q & HH_NOVICE), l("Novice Dungeon")), // Level 0-40
+            rif(!(.@q & HH_INTERMEDIARY), l("Intermediary Dungeon")), // Level 21-60
+            rif(!(.@q & HH_ADVANCED), l("Advanced Dungeon")), // Level 41-80
+            rif(!(.@q & HH_EXPERT), l("Expert Dungeon")), // Level 61-100
+            rif((.@q & HH_REQUISITE), l("Master Dungeon")), // Level 81+
             l("None at the moment");
         mes "";
         switch (@menu) {
@@ -51,7 +51,7 @@ OnTouch:
             case 3:
                 @HH_LEVEL=HH_INTERMEDIARY;
                 @HH_TIMER=0;
-                warp "018-2-2@In", 204, 40;
+                warp "018-2-3@In", 204, 40;
                 addtimer(500, "#HH_CONTROLLER01::OnPlayerCycle");
                 closedialog;
                 break;
@@ -65,11 +65,13 @@ OnTouch:
             case 5:
                 @HH_LEVEL=HH_EXPERT;
                 @HH_TIMER=0;
-                warp "018-2-2@Ex", 51, 40;
+                warp "018-2-3@Ex", 51, 40;
                 addtimer(500, "#HH_CONTROLLER01::OnPlayerCycle");
                 closedialog;
                 break;
             case 6:
+                mesc l("Work in Progress."), 1;
+                close;
                 @HH_LEVEL=HH_MASTER;
                 @HH_TIMER=0;
                 warp "018-2-3", 132, 92;
diff --git a/npc/018-2-2/main.txt b/npc/018-2-2/main.txt
index 753c831a1..d504b072f 100644
--- a/npc/018-2-2/main.txt
+++ b/npc/018-2-2/main.txt
@@ -26,10 +26,33 @@ OnPlayerCycle:
 OnInit:
     // Novice
     setarray .Novice_Mobs, AngryScorpion,CaveMaggot,MagicGoblin,ViciousSquirrel,AngryBat,RedSlime,AngryRedScorpion,Bandit,Skeleton,GreenSlime,
-                            BlueSlime,LavaSlime,RedMushroom,RobinBandit,AngryYellowSlime,OldSnake,GrassSnake,BlackSlime;
+                           BlueSlime,LavaSlime,RedMushroom,RobinBandit,AngryYellowSlime,OldSnake,GrassSnake,BlackSlime,SmallMagicBif,BronzeChest;
     setarray .Novice_Ammo,            40,        40,         40,             50,      40,      80,              20,    20,      10,        90,
-                                   30,       30,        25,          10,              40,      10,        15,        50;
+                                  30,       30,        25,          10,              40,      10,        15,        50,            7,          2;
 
+    // Intermediary
+    setarray .Interm_Mobs, RedSlime,AngryRedScorpion,Bandit,Skeleton,GreenSlime, BlueSlime,LavaSlime,RedMushroom,RobinBandit,
+                           AngryYellowSlime,OldSnake,GrassSnake,BlackSlime,Wolvern,DarkLizard,BlackScorpion,RevolverShooter,MagicBif,SilverChest;
+    setarray .Interm_Ammo,       80,              50,    50,      10,        90,        30,       60,        35,          20,
+                                          50,      20,        25,        50,    30,        20,           25,              5,      7,          2;
+
+    // Advanced
+    setarray .Advanc_Mobs, AngryYellowSlime,Snake,GrassSnake,BlackSlime,Wolvern,DarkLizard,BlackScorpion,RevolverShooter,MagicBif,SilverChest,
+                           MountainSnake, Yeti, WickedMushroom,Forain,GoldenChest,BigMagicBif,GatlingShooter;
+    setarray .Advanc_Ammo,               50,   30,        35,        90,    30,        30,           45,             15,      7,           2,
+                                      15,   10,             30,     5,          2,          1,            10;
+
+    // Expert
+    setarray .Expert_Mobs, MountainSnake, Yeti, WickedMushroom,Forain,GoldenChest,BigMagicBif,GatlingShooter,BlackMamba,Terranite, Wolvern,
+                           PrismChest, BlueSlime, GreenDragon;
+    setarray .Expert_Ammo,            45,   30,             90,    35,          3,          7,            30,        20,       15,      10,
+                                    1,       140,          15;
+
+    // Master
+    setarray .Master_Mobs, SupremeChest,BlueSlime,MurdererScorpion,Tipiou,AlphaMouboo,BanditLord,Tipiu,GreenDragon,GiantMutatedBat,FallenKing1,
+                           FallenKing2, EvilScythe, YetiKing, TheMonsterKing;
+    setarray .Master_Ammo,            1,      140,              20,    20,         20,        20,   20,         20,             20,         10,
+                                    10,         1,         7,              1;
     end;
 
 // Respawn Arrays (Manual)
@@ -75,6 +98,142 @@ OnNovice19:
     areamonster "018-2-2@No", 20, 20, 220, 220, strmobinfo(1, .Novice_Mobs[19]), .Novice_Mobs[19], .Novice_Ammo[19], "#HH_CONTROLLER01::OnNovice19"; end;
 OnNovice20:
     areamonster "018-2-2@No", 20, 20, 220, 220, strmobinfo(1, .Novice_Mobs[20]), .Novice_Mobs[20], .Novice_Ammo[20], "#HH_CONTROLLER01::OnNovice20"; end;
+OnInterm0:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[0]), .Interm_Mobs[0], .Interm_Ammo[0], "#HH_CONTROLLER01::OnInterm0"; end;
+OnInterm1:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[1]), .Interm_Mobs[1], .Interm_Ammo[1], "#HH_CONTROLLER01::OnInterm1"; end;
+OnInterm2:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[2]), .Interm_Mobs[2], .Interm_Ammo[2], "#HH_CONTROLLER01::OnInterm2"; end;
+OnInterm3:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[3]), .Interm_Mobs[3], .Interm_Ammo[3], "#HH_CONTROLLER01::OnInterm3"; end;
+OnInterm4:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[4]), .Interm_Mobs[4], .Interm_Ammo[4], "#HH_CONTROLLER01::OnInterm4"; end;
+OnInterm5:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[5]), .Interm_Mobs[5], .Interm_Ammo[5], "#HH_CONTROLLER01::OnInterm5"; end;
+OnInterm6:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[6]), .Interm_Mobs[6], .Interm_Ammo[6], "#HH_CONTROLLER01::OnInterm6"; end;
+OnInterm7:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[7]), .Interm_Mobs[7], .Interm_Ammo[7], "#HH_CONTROLLER01::OnInterm7"; end;
+OnInterm8:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[8]), .Interm_Mobs[8], .Interm_Ammo[8], "#HH_CONTROLLER01::OnInterm8"; end;
+OnInterm9:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[9]), .Interm_Mobs[9], .Interm_Ammo[9], "#HH_CONTROLLER01::OnInterm9"; end;
+OnInterm10:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[10]), .Interm_Mobs[10], .Interm_Ammo[10], "#HH_CONTROLLER01::OnInterm10"; end;
+OnInterm11:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[11]), .Interm_Mobs[11], .Interm_Ammo[11], "#HH_CONTROLLER01::OnInterm11"; end;
+OnInterm12:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[12]), .Interm_Mobs[12], .Interm_Ammo[12], "#HH_CONTROLLER01::OnInterm12"; end;
+OnInterm13:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[13]), .Interm_Mobs[13], .Interm_Ammo[13], "#HH_CONTROLLER01::OnInterm13"; end;
+OnInterm14:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[14]), .Interm_Mobs[14], .Interm_Ammo[14], "#HH_CONTROLLER01::OnInterm14"; end;
+OnInterm15:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[15]), .Interm_Mobs[15], .Interm_Ammo[15], "#HH_CONTROLLER01::OnInterm15"; end;
+OnInterm16:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[16]), .Interm_Mobs[16], .Interm_Ammo[16], "#HH_CONTROLLER01::OnInterm16"; end;
+OnInterm17:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[17]), .Interm_Mobs[17], .Interm_Ammo[17], "#HH_CONTROLLER01::OnInterm17"; end;
+OnInterm18:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[18]), .Interm_Mobs[18], .Interm_Ammo[18], "#HH_CONTROLLER01::OnInterm18"; end;
+OnInterm19:
+    areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[19]), .Interm_Mobs[19], .Interm_Ammo[19], "#HH_CONTROLLER01::OnInterm19"; end;
+OnAdvanc0:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[0]), .Advanc_Mobs[0], .Advanc_Ammo[0], "#HH_CONTROLLER01::OnAdvanc0"; end;
+OnAdvanc1:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[1]), .Advanc_Mobs[1], .Advanc_Ammo[1], "#HH_CONTROLLER01::OnAdvanc1"; end;
+OnAdvanc2:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[2]), .Advanc_Mobs[2], .Advanc_Ammo[2], "#HH_CONTROLLER01::OnAdvanc2"; end;
+OnAdvanc3:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[3]), .Advanc_Mobs[3], .Advanc_Ammo[3], "#HH_CONTROLLER01::OnAdvanc3"; end;
+OnAdvanc4:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[4]), .Advanc_Mobs[4], .Advanc_Ammo[4], "#HH_CONTROLLER01::OnAdvanc4"; end;
+OnAdvanc5:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[5]), .Advanc_Mobs[5], .Advanc_Ammo[5], "#HH_CONTROLLER01::OnAdvanc5"; end;
+OnAdvanc6:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[6]), .Advanc_Mobs[6], .Advanc_Ammo[6], "#HH_CONTROLLER01::OnAdvanc6"; end;
+OnAdvanc7:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[7]), .Advanc_Mobs[7], .Advanc_Ammo[7], "#HH_CONTROLLER01::OnAdvanc7"; end;
+OnAdvanc8:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[8]), .Advanc_Mobs[8], .Advanc_Ammo[8], "#HH_CONTROLLER01::OnAdvanc8"; end;
+OnAdvanc9:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[9]), .Advanc_Mobs[9], .Advanc_Ammo[9], "#HH_CONTROLLER01::OnAdvanc9"; end;
+OnAdvanc10:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[10]), .Advanc_Mobs[10], .Advanc_Ammo[10], "#HH_CONTROLLER01::OnAdvanc10"; end;
+OnAdvanc11:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[11]), .Advanc_Mobs[11], .Advanc_Ammo[11], "#HH_CONTROLLER01::OnAdvanc11"; end;
+OnAdvanc12:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[12]), .Advanc_Mobs[12], .Advanc_Ammo[12], "#HH_CONTROLLER01::OnAdvanc12"; end;
+OnAdvanc13:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[13]), .Advanc_Mobs[13], .Advanc_Ammo[13], "#HH_CONTROLLER01::OnAdvanc13"; end;
+OnAdvanc14:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[14]), .Advanc_Mobs[14], .Advanc_Ammo[14], "#HH_CONTROLLER01::OnAdvanc14"; end;
+OnAdvanc15:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[15]), .Advanc_Mobs[15], .Advanc_Ammo[15], "#HH_CONTROLLER01::OnAdvanc15"; end;
+OnAdvanc16:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[16]), .Advanc_Mobs[16], .Advanc_Ammo[16], "#HH_CONTROLLER01::OnAdvanc16"; end;
+OnAdvanc17:
+    areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[17]), .Advanc_Mobs[17], .Advanc_Ammo[17], "#HH_CONTROLLER01::OnAdvanc17"; end;
+OnExpert0:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[0]), .Expert_Mobs[0], .Expert_Ammo[0], "#HH_CONTROLLER01::OnExpert0"; end;
+OnExpert1:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[1]), .Expert_Mobs[1], .Expert_Ammo[1], "#HH_CONTROLLER01::OnExpert1"; end;
+OnExpert2:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[2]), .Expert_Mobs[2], .Expert_Ammo[2], "#HH_CONTROLLER01::OnExpert2"; end;
+OnExpert3:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[3]), .Expert_Mobs[3], .Expert_Ammo[3], "#HH_CONTROLLER01::OnExpert3"; end;
+OnExpert4:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[4]), .Expert_Mobs[4], .Expert_Ammo[4], "#HH_CONTROLLER01::OnExpert4"; end;
+OnExpert5:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[5]), .Expert_Mobs[5], .Expert_Ammo[5], "#HH_CONTROLLER01::OnExpert5"; end;
+OnExpert6:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[6]), .Expert_Mobs[6], .Expert_Ammo[6], "#HH_CONTROLLER01::OnExpert6"; end;
+OnExpert7:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[7]), .Expert_Mobs[7], .Expert_Ammo[7], "#HH_CONTROLLER01::OnExpert7"; end;
+OnExpert8:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[8]), .Expert_Mobs[8], .Expert_Ammo[8], "#HH_CONTROLLER01::OnExpert8"; end;
+OnExpert9:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[9]), .Expert_Mobs[9], .Expert_Ammo[9], "#HH_CONTROLLER01::OnExpert9"; end;
+OnExpert10:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[10]), .Expert_Mobs[10], .Expert_Ammo[10], "#HH_CONTROLLER01::OnExpert10"; end;
+OnExpert11:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[11]), .Expert_Mobs[11], .Expert_Ammo[11], "#HH_CONTROLLER01::OnExpert11"; end;
+OnExpert12:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[12]), .Expert_Mobs[12], .Expert_Ammo[12], "#HH_CONTROLLER01::OnExpert12"; end;
+OnExpert13:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[13]), .Expert_Mobs[13], .Expert_Ammo[13], "#HH_CONTROLLER01::OnExpert13"; end;
+OnExpert14:
+    areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[14]), .Expert_Mobs[14], .Expert_Ammo[14], "#HH_CONTROLLER01::OnExpert14"; end;
+OnMaster0:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[0]), .Master_Mobs[0], .Master_Ammo[0], "#HH_CONTROLLER01::OnMaster0"; end;
+OnMaster1:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[1]), .Master_Mobs[1], .Master_Ammo[1], "#HH_CONTROLLER01::OnMaster1"; end;
+OnMaster2:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[2]), .Master_Mobs[2], .Master_Ammo[2], "#HH_CONTROLLER01::OnMaster2"; end;
+OnMaster3:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[3]), .Master_Mobs[3], .Master_Ammo[3], "#HH_CONTROLLER01::OnMaster3"; end;
+OnMaster4:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[4]), .Master_Mobs[4], .Master_Ammo[4], "#HH_CONTROLLER01::OnMaster4"; end;
+OnMaster5:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[5]), .Master_Mobs[5], .Master_Ammo[5], "#HH_CONTROLLER01::OnMaster5"; end;
+OnMaster6:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[6]), .Master_Mobs[6], .Master_Ammo[6], "#HH_CONTROLLER01::OnMaster6"; end;
+OnMaster7:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[7]), .Master_Mobs[7], .Master_Ammo[7], "#HH_CONTROLLER01::OnMaster7"; end;
+OnMaster8:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[8]), .Master_Mobs[8], .Master_Ammo[8], "#HH_CONTROLLER01::OnMaster8"; end;
+OnMaster9:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[9]), .Master_Mobs[9], .Master_Ammo[9], "#HH_CONTROLLER01::OnMaster9"; end;
+OnMaster10:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[10]), .Master_Mobs[10], .Master_Ammo[10], "#HH_CONTROLLER01::OnMaster10"; end;
+OnMaster11:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[11]), .Master_Mobs[11], .Master_Ammo[11], "#HH_CONTROLLER01::OnMaster11"; end;
+OnMaster12:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[12]), .Master_Mobs[12], .Master_Ammo[12], "#HH_CONTROLLER01::OnMaster12"; end;
+OnMaster13:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[13]), .Master_Mobs[13], .Master_Ammo[13], "#HH_CONTROLLER01::OnMaster13"; end;
+OnMaster14:
+    areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[14]), .Master_Mobs[14], .Master_Ammo[14], "#HH_CONTROLLER01::OnMaster14"; end;
 
 
 // Controls logic for each instance
@@ -88,6 +247,37 @@ OnInstanceInit:
         }
         freeloop(false);
     }
+    // HH_INTERMEDIARY
+    if (instance_id() == $@HHMD_INSTID2) {
+        freeloop(true);
+        for (.@i=0;.@i<getarraysize(.Interm_Mobs);.@i++) {
+            areamonster "018-2-3@In", 20, 20, 220, 220, strmobinfo(1, .Interm_Mobs[.@i]), .Interm_Mobs[.@i], .Interm_Ammo[.@i], "#HH_CONTROLLER01::OnInterm"+.@i;
+        }
+        freeloop(false);
+    }
+    // HH_ADVANCED
+    if (instance_id() == $@HHMD_INSTID2) {
+        freeloop(true);
+        for (.@i=0;.@i<getarraysize(.Advanc_Mobs);.@i++) {
+            areamonster "018-2-2@Ad", 20, 20, 220, 220, strmobinfo(1, .Advanc_Mobs[.@i]), .Advanc_Mobs[.@i], .Advanc_Ammo[.@i], "#HH_CONTROLLER01::OnAdvanc"+.@i;
+        }
+        freeloop(false);
+    }
+    // HH_EXPERT
+    if (instance_id() == $@HHMD_INSTID2) {
+        freeloop(true);
+        for (.@i=0;.@i<getarraysize(.Expert_Mobs);.@i++) {
+            areamonster "018-2-3@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[.@i]), .Expert_Mobs[.@i], .Expert_Ammo[.@i], "#HH_CONTROLLER01::OnExpert"+.@i;
+        }
+        freeloop(false);
+    }
     end;
 }
 
+/*python
+i=0
+while (i < 20):
+    print('On'+'Novice'+'%d:' % i)
+    print('    areamonster "018-2-2@No", 20, 20, 220, 220, strmobinfo(1, .Novice_Mobs[%d]), .Novice_Mobs[%d], .Novice_Ammo[%d], "#HH_CONTROLLER01::OnNovice%d"; end;' % (i,i,i,i))
+    i+=1
+*/
diff --git a/npc/functions/instances.txt b/npc/functions/instances.txt
index 521e1a90e..78698b8dc 100644
--- a/npc/functions/instances.txt
+++ b/npc/functions/instances.txt
@@ -64,22 +64,22 @@ OnInstRestart:
 
     /* Heroes Hold Main Dungeon */
     $@HHMD_INSTID1 = instance_create("018-2-2@HHMD1", 0, IOT_NONE);
-    instance_attachmap("018-2-2", $@HHMD_INSTID1, 0, "018-2-1@No");
+    instance_attachmap("018-2-2", $@HHMD_INSTID1, 0, "018-2-2@No");
     instance_set_timeout(1000000, 1000000, $@HHMD_INSTID1);
     instance_init($@HHMD_INSTID1);
 
-    $@HHMD_INSTID2 = instance_create("018-2-2@HHMD2", 0, IOT_NONE);
-    instance_attachmap("018-2-2", $@HHMD_INSTID2, 0, "018-2-1@In");
+    $@HHMD_INSTID2 = instance_create("018-2-3@HHMD2", 0, IOT_NONE);
+    instance_attachmap("018-2-3", $@HHMD_INSTID2, 0, "018-2-3@In");
     instance_set_timeout(1000000, 1000000, $@HHMD_INSTID2);
     instance_init($@HHMD_INSTID2);
 
     $@HHMD_INSTID4 = instance_create("018-2-2@HHMD4", 0, IOT_NONE);
-    instance_attachmap("018-2-2", $@HHMD_INSTID4, 0, "018-2-1@Ad");
+    instance_attachmap("018-2-2", $@HHMD_INSTID4, 0, "018-2-2@Ad");
     instance_set_timeout(1000000, 1000000, $@HHMD_INSTID4);
     instance_init($@HHMD_INSTID4);
 
-    $@HHMD_INSTID8 = instance_create("018-2-2@HHMD8", 0, IOT_NONE);
-    instance_attachmap("018-2-2", $@HHMD_INSTID8, 0, "018-2-1@Ex");
+    $@HHMD_INSTID8 = instance_create("018-2-3@HHMD8", 0, IOT_NONE);
+    instance_attachmap("018-2-3", $@HHMD_INSTID8, 0, "018-2-3@Ex");
     instance_set_timeout(1000000, 1000000, $@HHMD_INSTID8);
     instance_init($@HHMD_INSTID8);