Fix some overlooked strings

4 files changed, 7 insertions, 4 deletions

diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index 9a6cf1cc..3fd6d8f0 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -95,8 +95,7 @@ L_StorySeems:
 
     mes "";
     mesn;
-    mesq g(l("It looks like the sweet lady is curious, am I right?"),
-           l("It seems the gentleman is curious, am I right sweetie?"));
+    mesq l("It looks like you are curious, am I right?");
     next;
     mesq l("Well, if you ever do want to join: 'Ye Merry Club Of Thee Bequeathed With Cookies'...");
     next;
diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt
index bb725dbe..91086cbf 100644
--- a/npc/001-2-24/nard.txt
+++ b/npc/001-2-24/nard.txt
@@ -27,7 +27,7 @@
 
     checkclientversion;
     mesn;
-    mesq g(l("Good day miss."), l("Good day mister."));
+    mesq l("Good day sir or madam.");
     next;
     mesq l("What can I do for you?");
     .@q = getq(ArtisQuests_Enora);
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index 64441322..13cf3dd9 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -34,7 +34,7 @@
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("I registered you on one of the rooms of the upper level."),
                 l("You can go upstairs and choose a different room if you want.");
-            savepoint "001-2-29", 29, g(49, 35);
+            savepoint "001-2-29", 29, any(49, 35);
         }
     }
 
diff --git a/npc/test/test1.txt b/npc/test/test1.txt
index 3e6adb30..9fefe307 100644
--- a/npc/test/test1.txt
+++ b/npc/test/test1.txt
@@ -72,11 +72,13 @@ test,10,5,0	script	test1	NPC_HAT_BOX,{
         assert(l("data @@ @@ @@ data", "this", "is", "test") == "data this is test data", "\"data @@ @@ @@ data\", \"this\", \"is\", \"test\"");
         next();
 
+        /*
         mesf("##2Testing old translation system as %s gender...##0", g("female", "male"));
         if (Sex == 1)
             assert(lg("test1 @@", "test2 @@", "line") == "test2 line#1", "\"test1 @@\", \"test2 @@\", \"line\"");
         else if (Sex == 0)
             assert(lg("test1 @@", "test2 @@", "line") == "test1 line#0", "\"test1 @@\", \"test2 @@\", \"line\"");
+        */
         next();
     }
 
@@ -95,6 +97,7 @@ test,10,5,0	script	test1	NPC_HAT_BOX,{
         assert(l("data %s %s %s data", "this", "is", "test") == "data this is test data", "\"data %s %s %s data\", \"this\", \"is\", \"test\"");
         next();
 
+        /*
         mesf("##2Testing new translation system as %s gender...##0", g("female", "male"));
         if (Sex == 1) {
             assert(lg("test") == "test#1", "\"test\"");
@@ -105,6 +108,7 @@ test,10,5,0	script	test1	NPC_HAT_BOX,{
             assert(lg("test1", "test2") == "test1#0", "\"test1\", \"test2\"");
             assert(lg("test1 %s", "test2 %s", "line") == "test1 line#0", "\"test1 %s\", \"test2 %s\", \"line\"");
         }
+        */
         next();
 
         mes("##2Testing advanced translation...##0");