2 files changed, 16 insertions, 3 deletions
diff --git a/npc/003-0-1/professor.txt b/npc/003-0-1/professor.txt
index 43fd6f6cd..a58bc2fab 100644
--- a/npc/003-0-1/professor.txt
+++ b/npc/003-0-1/professor.txt
@@ -10,6 +10,18 @@
     next;
     mesn;
     mesq l("Sit on the rug in front of me and learn wisdom! Maybe you'll learn something this way.");
+    if (!TUTORIAL) close;
+    next;
+    mes ".:: AFK EXP AREA ::.";
+    mesc l("By sitting in the rug in front of the professor (the one with benches)");
+    mesc l("and \"listening\" to his speech, you'll get EXP!");
+    mes "";
+    mesc l("If you get too much exp this way, a skill will level up and you'll get even more!");
+    mesc l("But remember: %s", b(l("You cannot sit idle for too long gaining EXP!")));
+    mesc l("After about 15 minutes AFK, you won't get EXP anymore.");
+    mes "";
+    mesc l("In overall, you'll get more experience by fighting monsters.");
+    mesc l("But if you only want to sit down and chat, this area is ideal for you!");
     close;
 
 OnInit:
@@ -32,6 +44,7 @@ OnTimer3000:
     end;
 
 OnSpeeching:
+    deltimer(.name$+"::OnSpeeching"); // safeguard
     // Max AFK time is determined as 15 minutes + 1 second every 20 minutes AFKed
     // Capped at 1 hour (you've AFK'ed 37 days and 12 hours)
     .@maxafk=max(3600, 900+(AFKING/1200));
@@ -81,12 +94,12 @@ OnSpeeching:
             npctalk3 l("@@, you're a good student. You have a bright future if you keep listening to me.");
             dispbottom l("Learning from seeing (aka. AFK-ing) skill LEVEL UP!!");
             break;
-
+        }
         // There are no further upgrades to TMW2_SPEECH skill
         // You'll need to get the AFK Set if you want to level from 4 to 10.
-        }
 
     }
+    deltimer(.name$+"::OnSpeeching"); // safeguard
     end;
 }
 
diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt
index 92d86f950..2e9ff9b68 100644
--- a/npc/functions/scoreboards.txt
+++ b/npc/functions/scoreboards.txt
@@ -481,7 +481,7 @@ OnCall:
             next;
             break;
         default:
-            end;
+            close;
         }
     } while (true);
     end;