032-2 (Past Tulimshar Tree Cave) is now an Overclocked map.

3 files changed, 139 insertions, 2 deletions

diff --git a/npc/032-2/_config.txt b/npc/032-2/_config.txt
new file mode 100644
index 000000000..17ef014c6
--- /dev/null
+++ b/npc/032-2/_config.txt
@@ -0,0 +1,135 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 032-2: Tree Maze conf
+
+032-2,40,21,0	script	#032-2_40_21	NPC_HIDDEN,0,1,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,75,28,0	script	#032-2_75_28	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,133,29,0	script	#032-2_133_29	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,177,39,0	script	#032-2_177_39	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,165,79,0	script	#032-2_165_79	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,147,66,0	script	#032-2_147_66	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,178,88,0	script	#032-2_178_88	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,170,107,0	script	#032-2_170_107	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,168,150,0	script	#032-2_168_150	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,146,153,0	script	#032-2_146_153	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,119,154,0	script	#032-2_119_154	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,87,174,0	script	#032-2_87_174	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,47,167,0	script	#032-2_47_167	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,25,179,0	script	#032-2_25_179	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,41,136,0	script	#032-2_41_136	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,36,109,0	script	#032-2_36_109	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,34,71,0	script	#032-2_34_71	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,75,54,0	script	#032-2_75_54	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
+
+032-2,130,72,0	script	#032-2_130_72	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	doevent "#DungeonCore::OnClocked";
+	end;
+}
diff --git a/npc/032-2/_import.txt b/npc/032-2/_import.txt
index ac4567da5..51bb8a728 100644
--- a/npc/032-2/_import.txt
+++ b/npc/032-2/_import.txt
@@ -1,5 +1,6 @@
 // Map 032-2: Tree Maze
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/032-2/_config.txt",
 "npc/032-2/_mobs.txt",
 "npc/032-2/_warps.txt",
 "npc/032-2/episode.txt",
diff --git a/npc/functions/dungeon.txt b/npc/functions/dungeon.txt
index 20489d0cc..580635623 100644
--- a/npc/functions/dungeon.txt
+++ b/npc/functions/dungeon.txt
@@ -13,7 +13,7 @@ OnInit:
     setarray .cursemap$, "006-4", "006-4-1", "025-1", "026-2";
     setarray .sickmap$, "029-5";
     setarray .bleedmap$, "006-9", "026-6", "026-7";
-    setarray .clockmap$, "017-0";
+    setarray .clockmap$, "017-0", "032-2";
     end;
 
 /////////////////////////////////////////
@@ -229,7 +229,8 @@ OnClocked:
         }
         // Sanitize the effect (it cannot go past 30%)
         // (Note it reaches the cap if it fires at 100% rate twice w/o Homun)
-        .@eff = min(30, .@eff);
+        .@cap = (getmap() == "017-0" ? 30 : 40);
+        .@eff = min(.@cap, .@eff);
         SC_Bonus(30, SC_BOTTER_SYNDROME, .@eff);
     }