1 files changed, 9 insertions, 30 deletions

diff --git a/npc/005-5/cynric.txt b/npc/005-5/cynric.txt
index edb8beff7..72b03e6ce 100644
--- a/npc/005-5/cynric.txt
+++ b/npc/005-5/cynric.txt
@@ -15,8 +15,8 @@
 
     function explain_guild {
         speech S_LAST_NEXT,
-            l("The guild is in charge of the commerce regularization throughout Artis and its surroundings."),
-            l("With the help of the town hall and the Legion of Aemil we organize some auction and we help local merchants to launch their businesses."),
+            l("The guild is in charge of the commerce regularization throughout Candor and its surroundings."),
+            l("With the help of the town hall we organize some auction and we help local merchants to launch their businesses."),
             l("We also feature some services like a storage and a bank for members."),
             l("Registration is open to everybody, but newcomers need to pay a fee for all of the paperwork.");
 
@@ -30,7 +30,7 @@
     function first_visit {
         speech S_LAST_NEXT,
             l("Welcome!"),
-            l("My name is Cynric, I am a representative of the Merchant Guild.");
+            l("My name is Cynric, I am a representative of the Merchant Guild on Candor.");
 
         selectd(l("My name is @@...", strcharinfo(0)));
 
@@ -63,7 +63,7 @@
 
         .@price = 7700;
         speech S_LAST_NEXT,
-            l("The fee is of @@ E. So, do you want to register?", .@price);
+            l("The fee is of @@ GP. So, do you want to register?", .@price);
 
         switch (selectd(l("Yes."),
                         l("I don't have the time now.")))
@@ -100,52 +100,39 @@
     }
 
     speech S_LAST_NEXT,
-        l("Welcome to the Merchant Guild!"),
+        l("Welcome to the Merchant Guild of Tulimshar."),
         l("What do you want today?");
 
     do
     {
-        .@enora = getq(ArtisQuests_Enora);
 
         selectd
-            rif(.@enora == 2, l("I'm looking for some black iron ingots.")),
             l("I would like to store some items."),
             l("I would like to perform money transactions."),
             l("What is this guild for?"),
-            l("Does the guild has any work for me right now?"),
             l("Bye.");
 
         switch (@menu)
         {
             case 1:
-                //enora_quest;
-                mes "";
-                mesn;
-                mesq l("We have none.");
-                break;
-            case 2:
                 openstorage;
                 closedialog;
                 close;
                 break;
-            case 3:
+            case 2:
                 MerchantGuild_Bank;
                 break;
-            case 4:
+            case 3:
                 mes "";
                 explain_guild;
                 break;
-            case 5:
-                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("There are no tasks for you right now.");
-                continue;
         }
-        if (@menu != 6)
+        if (@menu != 4)
         {
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT | S_NO_NPC_NAME,
                 l("Something else?");
         }
-    } while (@menu != 6);
+    } while (@menu != 4);
 
     closedialog;
     goodbye;
@@ -155,13 +142,5 @@ OnInit:
     .sex = G_MALE;
     .distance = 4;
     end;
-
-OnPCLoginEvent:
-    if (#MerchantBank)
-    {
-        BankVault += max(0, #MerchantBank);
-        #MerchantBank = 0;
-    }
-    end;
 }