update qonan and shovel scripts to use new narrator function

2 files changed, 15 insertions, 16 deletions

diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt
index 00357373..92bc4cc0 100644
--- a/npc/001-1/qonan.txt
+++ b/npc/001-1/qonan.txt
@@ -17,7 +17,7 @@
     if (.@q == 2) goto L_ItemFount;
     if (.@q == 3) goto L_QuestDone;
 
-    speech
+    speech 2,
         l("We didn't meet, right?"),
         l("My name is Q'Onan, I'm a member of Nard's crew."),
         l("I have a lot of work here, so I don't even have time to go to the town."),
@@ -25,7 +25,7 @@
 
     select l("Go on.");
 
-    speech
+    speech 3,
         l("Before I joined Nard, I used to be a thief."),
         l("I'm not proud of it, but I had to get money for living."),
         l("Anyway, the last time I stole something I was almost caught."),
@@ -48,13 +48,13 @@
             getrandompoint(180,27,189,32);
             npcdebug "Chest buriad at (" + .move__rand_x + "," + .move__rand_y + ")";
             shovel_addquest("001-1", .move__rand_x, .move__rand_y, "QOnanFoundItem");
-            speech
+            speech 3,
                 l("Alright, you will need this shovel."),
                 l("I hope to see you soon.");
             getitem IronShovel, 1;
             close;
         case 1:
-            speech
+            speech 3,
                 l("Come on, don't be a coward!"),
                 l("Anyway, let me know if you change your mind.");
             close;
@@ -63,7 +63,7 @@
 L_QuestGiven:
     speech l("I asked you to do me a favour, so why are you here?");
     select l("What should I do, again?");
-    speech
+    speech 1,
         l("Please find the small chest, buried somewhere on the Artis Hill."),
         l("Bring it to me, and you will get your reward.");
     close;
@@ -94,7 +94,7 @@ OnInit:
 function	script	QOnanFoundItem	{
     setq ArtisQuests_QOnan, 2;
     // getitem SmallChest, 1;
-    narrator
+    narrator 1,
        l("You found a small chest, surprisingly heavy for it's size."),
        l("It's probably full of coins, but no matter how hard you try to open it, you can't."),
        l("Better take it back to Q'Onan.");
diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt
index 7580f217..3d5c3251 100644
--- a/npc/items/shovel.txt
+++ b/npc/items/shovel.txt
@@ -47,7 +47,7 @@
         .@tick = gettimetick(1);
         if (@ShovelLastUsed + max(10, .PlayerTiredTime - readparam(bStr)) > .@tick)
         {
-            narrator
+            narrator 1,
                 l("You are exhausted, you should rest a bit.");
             return 1;
         }
@@ -71,18 +71,18 @@
                 deletearray $WorldBuriedTreasures_x[.@i], 1;
                 deletearray $WorldBuriedTreasures_y[.@i], 1;
                 getitem .@id, .@amount;
-                narrator
+                narrator 1,
                     l("You found something!"),
                     l("It's @@ @@.", .@amount, getitemname(.@id));
                 return 1;
             }
         }
-        narrator l("Sadly, you found nothing but dirt.");
+        narrator 1, l("Sadly, you found nothing but dirt.");
         return 0;
     }
 
     function Bury {
-        narrator l("What would you like to bury?");
+        narrator 3, l("What would you like to bury?");
         .@items$ = "";
         getinventorylist;
         for (.@i = 0; .@i < @inventorylist_count; .@i++)
@@ -95,7 +95,7 @@
         .@amount = 1;
         if (@inventorylist_amount[.@idx] > 1)
         {
-            narrator l("Amount?");
+            narrator 3, l("Amount?");
             input .@amount, 1, @inventorylist_amount[.@idx];
         }
 
@@ -107,7 +107,7 @@
         $WorldBuriedTreasures_map$[.@wtc] = .@map$;
         $WorldBuriedTreasures_x[.@wtc] = .@x;
         $WorldBuriedTreasures_y[.@wtc] = .@y;
-        narrator l("You buried @@ @@.", .@amount, getitemname(.@id));
+        narrator 1, l("You buried @@ @@.", .@amount, getitemname(.@id));
 
         return 0;
     }
@@ -135,12 +135,11 @@
 OnUse:
     if (!CheckDigLocation())
     {
-        narrator 0,
-            l("You can't use the shovel here.");
+        narrator l("You can't use the shovel here.");
         close;
     }
 
-    narrator 0,
+    narrator 2,
         l("You hold the shovel in your hangs."),
         l("What are you going to do?");
 
@@ -163,7 +162,7 @@ OnUse:
             Bury();
             break;
         case 3:
-            narrator l("You hide your shovel.");
+            narrator 1, l("You hide your shovel.");
             break;
     }
     close;