Add an option to disable global timers for debugging

8 files changed, 10 insertions, 1 deletions

diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index b715d0f9..cc604257 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -1,5 +1,7 @@
 // Constants usable in scripts.
-// This constant is used to define whether unreleased items are equippable. This defaults to on, but should be disabled on the official server.
+// This constant is used to define whether unreleased items are equippable.
+// This defaults to 1, but should be disabled on the official server.
+// If set to 2 or higher, it also disables global timers to aid gdb'ing.
 
 debug            1
 
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index b1ef1372..bef7d2ab 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
@@ -40,5 +40,6 @@ OnTimer3000:
     setnpctimer 0;
 
 OnInit:
+    if (debug >= 2) end;
     initnpctimer;
 }
diff --git a/world/map/npc/005-4/bossfight.txt b/world/map/npc/005-4/bossfight.txt
index bc196ef3..b16db617 100644
--- a/world/map/npc/005-4/bossfight.txt
+++ b/world/map/npc/005-4/bossfight.txt
@@ -189,6 +189,7 @@ onRedDeath:
     end;
 
 onInit:
+    if (debug >= 2) end;
     initnpctimer;
     stopnpctimer;
 L_CleanUp:
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 510ee9d3..2e59275c 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -148,6 +148,7 @@ onInit:
     setarray $@FinalAnnualEasterReward$, "RedEggshellHat", "BlueEggshellHat", "YellowEggshellHat", "GreenEggshellHat", "OrangeEggshellHat", "DarkEggshellHat";
 
     callsub S_disableEggs;
+    if (debug >= 2) end;
     initnpctimer;
     end;
 
diff --git a/world/map/npc/019-1/mobmanager.txt b/world/map/npc/019-1/mobmanager.txt
index d0d4e498..ef9e0c73 100644
--- a/world/map/npc/019-1/mobmanager.txt
+++ b/world/map/npc/019-1/mobmanager.txt
@@ -12,6 +12,7 @@ onInit:
     set $@019_1_SANTASLIME_MONSTER_SPAWN_Y2,101;
     set $@019_1_SANTASLIME_month,gettime(6);
     set $@019_1_SANTASLIME_monster_number,0;
+    if (debug >= 2) end;
     initnpctimer;
     if ($@019_1_SANTASLIME_month == 12 || $@019_1_SANTASLIME_month == 1 || $@019_1_SANTASLIME_month == 2) goto L_Init_Spawn;
     end;
diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
index 4535395e..5e243920 100644
--- a/world/map/npc/021-1/bakery.txt
+++ b/world/map/npc/021-1/bakery.txt
@@ -13,5 +13,6 @@ OnTimer300000:
     end;
 
 OnInit:
+    if (debug >= 2) end;
     initnpctimer;
 }
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 837e913a..cf0d9e0c 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -293,6 +293,7 @@ onPetDeath:
     end;
 
 onInit:
+    if (debug >= 2) end;
     initnpctimer;
     stopnpctimer;
 
diff --git a/world/map/npc/easter/2010/eggs.txt b/world/map/npc/easter/2010/eggs.txt
index 0b1af508..cf4b81f4 100644
--- a/world/map/npc/easter/2010/eggs.txt
+++ b/world/map/npc/easter/2010/eggs.txt
@@ -85,6 +85,7 @@ L_Needle:
 	end;
 
 OnInit:
+	if (debug >= 2) end;
 	initnpctimer;
 
 OnTimer300000: