Fix Heroes Hold Master Dungeon

9 files changed, 58 insertions, 53 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index dc2555e4a..6a4b3db82 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -110,6 +110,7 @@ map_list: (
     "018-2-2",
     "018-2-3",
     "018-2-4",
+    "018-2-5",
     "018-2",
     "018-3",
     "018-4-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index a33cecfbe..d614084ec 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -107,36 +107,37 @@
 018-2-2 107
 018-2-3 108
 018-2-4 109
-018-2 110
-018-3 111
-018-4-1 112
-018-4-2 113
-018-4 114
-018-5 115
-019-1-1 116
-019-1 117
-019-2 118
-019-3 119
-019-4-1 120
-019-4 121
-020-1 122
-020-2 123
-020-3 124
-020-4 125
-020-5 126
-020-6 127
-021-1 128
-021-2 129
-021-3 130
-021-4 131
-022-1 132
-023-1 133
-023-2 134
-024-1 135
-boss 136
-botcheck 137
-sec_pri 138
-soren-2 139
-soren 140
-test 141
-testbg 142
+018-2-5 110
+018-2 111
+018-3 112
+018-4-1 113
+018-4-2 114
+018-4 115
+018-5 116
+019-1-1 117
+019-1 118
+019-2 119
+019-3 120
+019-4-1 121
+019-4 122
+020-1 123
+020-2 124
+020-3 125
+020-4 126
+020-5 127
+020-6 128
+021-1 129
+021-2 130
+021-3 131
+021-4 132
+022-1 133
+023-1 134
+023-2 135
+024-1 136
+boss 137
+botcheck 138
+sec_pri 139
+soren-2 140
+soren 141
+test 142
+testbg 143
diff --git a/maps/re/014-3.mcache b/maps/re/014-3.mcache
index 4c76e284e..d4ef906b4 100644
--- a/maps/re/014-3.mcache
+++ b/maps/re/014-3.mcache
diff --git a/maps/re/018-2-5.mcache b/maps/re/018-2-5.mcache
new file mode 100644
index 000000000..0ba5e7138
--- /dev/null
+++ b/maps/re/018-2-5.mcache
diff --git a/npc/014-3/_mobs.txt b/npc/014-3/_mobs.txt
index b1d8e7c0b..50bb6dbfa 100644
--- a/npc/014-3/_mobs.txt
+++ b/npc/014-3/_mobs.txt
@@ -6,6 +6,6 @@
 014-3,44,82,37,32	monster	Centaur	1139,3,80000,90000
 014-3,164,75,31,14	monster	Pinkie	1132,9,30000,50000,Oscar::OnKillPinkie
 014-3,95,65,49,25	monster	Poison Spiky Mushroom	1043,11,45000,45000
-014-3,128,112,70,21	monster	Mauve Plant	1135,4,90000,90000
+014-3,128,112,70,21	monster	Mauve Plant	1135,5,90000,90000
 014-3,44,82,37,32	monster	Chagashroom Field	1128,4,90000,90000
 014-3,95,65,49,25	monster	Plushroom Field	1011,4,90000,90000
diff --git a/npc/018-2-1/warps.txt b/npc/018-2-1/warps.txt
index 6864c2bb2..098732b05 100644
--- a/npc/018-2-1/warps.txt
+++ b/npc/018-2-1/warps.txt
@@ -87,7 +87,7 @@ OnTouch:
             case 6:
                 @HH_LEVEL=HH_MASTER;
                 @HH_TIMER=0;
-                warp "018-2-3", 132, 92;
+                warp "018-2-5", 132, 92;
                 addtimer(500, "#HH_CONTROLLER01::OnPlayerCycle");
                 closedialog;
                 break;
diff --git a/npc/018-2-2/main.txt b/npc/018-2-2/main.txt
index 54fd063c2..1af3bf6e7 100644
--- a/npc/018-2-2/main.txt
+++ b/npc/018-2-2/main.txt
@@ -66,7 +66,7 @@ OnMasterBossKilled:
         mesc l("You just gained a Karma point, a Prism Gift, and 2000 Job Exp for your bravery!"), 2;
     }
     DungeonClear();
-    monster "018-2-3", any(52,188), any(29,196), "Master Dungeon Boss", MonsterKing, 1, "#HH_CONTROLLER01::OnMasterBossKilled";
+    monster "018-2-5", any(52,188), any(29,196), "Master Dungeon Boss", MonsterKing, 1, "#HH_CONTROLLER01::OnMasterBossKilled";
     end;
 
 
@@ -168,7 +168,7 @@ OnTimer7000:
     // HH_MASTER
     freeloop(true);
     for (.@i=0;.@i<getarraysize(.Master_Mobs);.@i++) {
-        areamonster "018-2-3", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[.@i]), .Master_Mobs[.@i], .Master_Ammo[.@i], "#HH_CONTROLLER01::OnMaster"+.@i;
+        areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[.@i]), .Master_Mobs[.@i], .Master_Ammo[.@i], "#HH_CONTROLLER01::OnMaster"+.@i;
     }
     freeloop(false);
 
@@ -177,7 +177,7 @@ OnTimer7000:
     monster "018-2-3@In", 52, 196, "Intermiary Dungeon Boss", FafiDragon, 1, "#HH_CONTROLLER01::OnIntermBossKilled";
     monster "018-2-2@Ad", 52, 29, "Advanced Dungeon Boss", GiantMutatedBat, 1, "#HH_CONTROLLER01::OnAdvancedBossKilled";
     monster "018-2-3@Ex", 188, 196, "Expert Dungeon Boss", FallenKing1, 1, "#HH_CONTROLLER01::OnExpertBossKilled";
-    monster "018-2-3", any(52,188), any(29,196), "Master Dungeon Boss", MonsterKing, 1, "#HH_CONTROLLER01::OnMasterBossKilled";
+    monster "018-2-5", any(52,188), any(29,196), "Master Dungeon Boss", MonsterKing, 1, "#HH_CONTROLLER01::OnMasterBossKilled";
 
     // TODO: We still need the main logic for this. I mean, what is the objective on each floor of Master Dungeon?
     debugmes "Heroes Hold Monsters: Success";
@@ -413,49 +413,49 @@ OnExpert14:
     areamonster "018-2-2@Ex", 20, 20, 220, 220, strmobinfo(1, .Expert_Mobs[14]), .Expert_Mobs[14], 1, "#HH_CONTROLLER01::OnExpert14"; end;
 OnMaster0:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[0])*4)+strmobinfo(7,.Master_Mobs[0])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[0]), .Master_Mobs[0], 1, "#HH_CONTROLLER01::OnMaster0"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[0]), .Master_Mobs[0], 1, "#HH_CONTROLLER01::OnMaster0"; end;
 OnMaster1:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[1])*4)+strmobinfo(7,.Master_Mobs[1])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[1]), .Master_Mobs[1], 1, "#HH_CONTROLLER01::OnMaster1"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[1]), .Master_Mobs[1], 1, "#HH_CONTROLLER01::OnMaster1"; end;
 OnMaster2:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[2])*4)+strmobinfo(7,.Master_Mobs[2])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[2]), .Master_Mobs[2], 1, "#HH_CONTROLLER01::OnMaster2"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[2]), .Master_Mobs[2], 1, "#HH_CONTROLLER01::OnMaster2"; end;
 OnMaster3:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[3])*4)+strmobinfo(7,.Master_Mobs[3])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[3]), .Master_Mobs[3], 1, "#HH_CONTROLLER01::OnMaster3"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[3]), .Master_Mobs[3], 1, "#HH_CONTROLLER01::OnMaster3"; end;
 OnMaster4:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[4])*4)+strmobinfo(7,.Master_Mobs[4])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[4]), .Master_Mobs[4], 1, "#HH_CONTROLLER01::OnMaster4"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[4]), .Master_Mobs[4], 1, "#HH_CONTROLLER01::OnMaster4"; end;
 OnMaster5:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[5])*4)+strmobinfo(7,.Master_Mobs[5])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[5]), .Master_Mobs[5], 1, "#HH_CONTROLLER01::OnMaster5"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[5]), .Master_Mobs[5], 1, "#HH_CONTROLLER01::OnMaster5"; end;
 OnMaster6:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[6])*4)+strmobinfo(7,.Master_Mobs[6])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[6]), .Master_Mobs[6], 1, "#HH_CONTROLLER01::OnMaster6"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[6]), .Master_Mobs[6], 1, "#HH_CONTROLLER01::OnMaster6"; end;
 OnMaster7:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[7])*4)+strmobinfo(7,.Master_Mobs[7])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[7]), .Master_Mobs[7], 1, "#HH_CONTROLLER01::OnMaster7"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[7]), .Master_Mobs[7], 1, "#HH_CONTROLLER01::OnMaster7"; end;
 OnMaster8:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[8])*4)+strmobinfo(7,.Master_Mobs[8])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[8]), .Master_Mobs[8], 1, "#HH_CONTROLLER01::OnMaster8"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[8]), .Master_Mobs[8], 1, "#HH_CONTROLLER01::OnMaster8"; end;
 OnMaster9:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[9])*4)+strmobinfo(7,.Master_Mobs[9])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[9]), .Master_Mobs[9], 1, "#HH_CONTROLLER01::OnMaster9"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[9]), .Master_Mobs[9], 1, "#HH_CONTROLLER01::OnMaster9"; end;
 OnMaster10:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[10])*4)+strmobinfo(7,.Master_Mobs[10])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[10]), .Master_Mobs[10], 1, "#HH_CONTROLLER01::OnMaster10"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[10]), .Master_Mobs[10], 1, "#HH_CONTROLLER01::OnMaster10"; end;
 OnMaster11:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[11])*4)+strmobinfo(7,.Master_Mobs[11])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[11]), .Master_Mobs[11], 1, "#HH_CONTROLLER01::OnMaster11"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[11]), .Master_Mobs[11], 1, "#HH_CONTROLLER01::OnMaster11"; end;
 OnMaster12:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[12])*4)+strmobinfo(7,.Master_Mobs[12])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[12]), .Master_Mobs[12], 1, "#HH_CONTROLLER01::OnMaster12"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[12]), .Master_Mobs[12], 1, "#HH_CONTROLLER01::OnMaster12"; end;
 OnMaster13:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[13])*4)+strmobinfo(7,.Master_Mobs[13])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[13]), .Master_Mobs[13], 1, "#HH_CONTROLLER01::OnMaster13"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[13]), .Master_Mobs[13], 1, "#HH_CONTROLLER01::OnMaster13"; end;
 OnMaster14:
     if (rand(0, 2000) <= readparam(Luk)+(strmobinfo(3,.Master_Mobs[14])*4)+strmobinfo(7,.Master_Mobs[14])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
-    areamonster "018-2-2@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[14]), .Master_Mobs[14], 1, "#HH_CONTROLLER01::OnMaster14"; end;
+    areamonster "018-2-5", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[14]), .Master_Mobs[14], 1, "#HH_CONTROLLER01::OnMaster14"; end;
 
 }
 
diff --git a/npc/018-2-5/_import.txt b/npc/018-2-5/_import.txt
new file mode 100644
index 000000000..53f7e5b6f
--- /dev/null
+++ b/npc/018-2-5/_import.txt
@@ -0,0 +1,2 @@
+// Map 018-2-5: Heroes Hold - Main Dungeon
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/_import.txt b/npc/_import.txt
index 3852a47ff..c1eff78d2 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -109,6 +109,7 @@
 @include "npc/018-2-2/_import.txt"
 @include "npc/018-2-3/_import.txt"
 @include "npc/018-2-4/_import.txt"
+@include "npc/018-2-5/_import.txt"
 @include "npc/018-2/_import.txt"
 @include "npc/018-3/_import.txt"
 @include "npc/018-4-1/_import.txt"