fix the npc talk lock mechanism, make some other npcs use it

1 files changed, 8 insertions, 35 deletions

diff --git a/npc/001-1/merlin.txt b/npc/001-1/merlin.txt
index d970f537..0d9a8b30 100644
--- a/npc/001-1/merlin.txt
+++ b/npc/001-1/merlin.txt
@@ -6,44 +6,17 @@
 
 001-1,73,128,0	script	Merlin	NPC_MERLIN,2,2,{
 
-    function randomDialogue {
-        closedialog;
-
-        .@r = rand (6);
-        if (.@r == 0)
-        {
-            npctalk3 l("Fish, come and see my fish!");
-        }
-        else if (.@r == 1)
-        {
-            npctalk3 l("They are fresh, they are good!");
-        }
-        else if (.@r == 2)
-        {
-            npctalk3 l("Fresh from the sea and cheap!");
-        }
-        else if (.@r == 3)
-        {
-            npctalk3 l("Come, come and see!");
-        }
-        else if (.@r == 4)
-        {
-            npctalk3 l("They are fresh!");
-        }
-        else
-        {
-            npctalk3 l("Fish is good for the brain!");
-        }
-        close;
-    }
-
 OnTouch:
-    if (Repeat_NPC_lock <= gettimetick(2))
+    switch(rand(6))
     {
-        Repeat_NPC_lock = gettimetick(2) + 1;
-        randomDialogue;
+        case 0: npctalkonce(l("Fish, come and see my fish!")); break;
+        case 0: npctalkonce(l("They are fresh, they are good!")); break;
+        case 0: npctalkonce(l("Fresh from the sea and cheap!")); break;
+        case 0: npctalkonce(l("Come, come and see!")); break;
+        case 0: npctalkonce(l("They are fresh!")); break;
+        default: npctalkonce(l("Fish is good for the brain!"));
     }
-    close;
+    end;
 
 OnInit:
     .sex = G_MALE;