Fix Nylo and the bankers. Remove Artis' quests from Cynric.

2 files changed, 20 insertions, 101 deletions

diff --git a/npc/005-5/cynric.txt b/npc/005-5/cynric.txt
index f5a0f8441..edb8beff7 100644
--- a/npc/005-5/cynric.txt
+++ b/npc/005-5/cynric.txt
@@ -10,53 +10,8 @@
 //    gumi
 //    Reid
 // Description:
-//    Lloyd the banker NPC.
-// Variables:
-//    0  ArtisQuests_Lloyd
-//    1  ArtisQuests_Fexil
-//    2  ArtisQuests_Enora
-// Quest states:
-//    00  -- Never talked
-//    01  -- Registred on the Guild
-//    10  -- not started
-//    11  -- Lloyd warned about the quest
-//    20  -- Default.
-//    21  -- BlackSmith quest delivered.
-//    22  -- Chelios Quest given.
-//    23  -- Chelios Quest done.
-
-
-    function enora_quest {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Black iron... That is a very specific request that you have for me!"),
-            l("Let me check in my inventory book..."),
-            l("..."),
-            l("Yes, I have some! \"5x Black Iron Ingots\""),
-            lg("Is this for you or somebody else? Because you need to be registered to obtain these materials.");
-
-        switch (selectd(ArtisQuests_Enora,
-                        l("This is for my own use."),
-                        l("Chelios asked me to get it.")))
-        {
-            case 1:
-                speech S_FIRST_BLANK_LINE,
-                    l("This is your first time asking for something, you won't pay this time, take it as a sign of good faith!"),
-                    l("If you need something in the future, do not hesitate to pass by here, our stock is full of boxes collecting dust.");
-                emotion E_WINK;
-                break;
-            case 2:
-                speech S_FIRST_BLANK_LINE,
-                    l("Chelios... He is part of the Blacksmith House, is he not?"),
-                    l("Since Don settled in Artis he and his band refused to register to the Merchant Guild."),
-                    l("I will close an eye for once, but only because it's your first time asking for something!"),
-                    l("Sometimes a good merchant needs to reach out first. It's on the house, give Chelios my regards!");
-                emotion E_WINK;
-                break;
-        }
-        setq ArtisQuests_Enora, 3;
+//    Banker NPC.
 
-        return;
-    }
 
     function explain_guild {
         speech S_LAST_NEXT,
@@ -83,7 +38,7 @@
             l("\"@@\", I like this name!", strcharinfo(0)),
             l("Oh, wait a second...");
         narrator S_LAST_NEXT,
-            l("@@ is searching something in his book.", .npcname$);
+            l("@@ is searching something in his book.", .name$);
         speech S_LAST_NEXT,
             l("I see."),
             lg("You are new around here, right?");
@@ -91,7 +46,7 @@
         if (selectd(l("How do you know?"), l("Yes I am.")) == 1)
         {
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                l("Oh, it is simple. I have on this book the names of every citizen of Artis and its surroundings."),
+                l("Oh, it is simple. I have on this book the names of every citizen of Candor and its surroundings."),
                 l("And I have no mention of a so called \"@@\" on it!", strcharinfo(0));
         }
         else
@@ -135,40 +90,6 @@
         return;
     }
 
-    function paper_to_deliver {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Now that you bring up that topic, that reminds me of something..."),
-            l("Earlier today there was this young seller named Fexil that passed by here."),
-            l("He asked to lend some money and a place to open his store, I think that he asked for a place on the merchant squares on the south-west of the city..."),
-            l("Anyway, he forgot his permit when he left the building."),
-            l("Could you bring it to him?");
-
-        do
-        {
-            .@q = selectd(ArtisQuests_Fexil,
-                          l("Ok, I will bring it to him."),
-                          l("I need more information first."),
-                          l("I don't have the time."));
-            switch (.@q)
-            {
-                case 1:
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("Thank you for this!");
-                    setq ArtisQuests_Fexil, 1;
-                    break;
-                case 2:
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("You should look for a seller named Fexil around the merchant square."),
-                        l("Ask other merchants, they might know where he is.");
-                    break;
-                case 3:
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("No problem, come back later if you changed your mind!");
-                    break;
-            }
-        } while (.@q == 2);
-    }
-
     if (getq(ArtisQuests_Lloyd) == 0)
     {
         first_visit;
@@ -197,7 +118,10 @@
         switch (@menu)
         {
             case 1:
-                enora_quest;
+                //enora_quest;
+                mes "";
+                mesn;
+                mesq l("We have none.");
                 break;
             case 2:
                 openstorage;
@@ -212,15 +136,8 @@
                 explain_guild;
                 break;
             case 5:
-                if (getq(ArtisQuests_Fexil) >= 1)
-                {
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("There are no tasks for you right now.");
-                    continue;
-                }
-
-                paper_to_deliver;
-
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("There are no tasks for you right now.");
                 continue;
         }
         if (@menu != 6)
@@ -235,7 +152,6 @@
     close;
 
 OnInit:
-    .quest_debug = ArtisQuests_Lloyd;
     .sex = G_MALE;
     .distance = 4;
     end;
diff --git a/npc/005-5/nylo.txt b/npc/005-5/nylo.txt
index c60c0239a..3c6035251 100644
--- a/npc/005-5/nylo.txt
+++ b/npc/005-5/nylo.txt
@@ -1,5 +1,6 @@
 // Author:
 //    Saulc
+//    Jesusalva
 
 005-5,27,38,0	script	Nylo	NPC_PLAYER,{
 
@@ -9,14 +10,12 @@
 
     function nylo_thanks {
     	speech S_LAST_BLANK_LINE,
-        l("[Nyle]"),
         l("You are very welcome.");
         close;
     }
 
     function nylo_items2 {
     	speech S_LAST_BLANK_LINE,
-        	l("[Nyle]"),
         	l("Let Cynric open your storage. You might also want to open your inventory."),
         	l("Pick an item from either storage or inventory and choose what you want to do with it by clicking the right button."),
         	l("You can also pick and drag items from one window into the other but this will move all items of this kind.");
@@ -39,7 +38,6 @@
 
     function nylo_money2 {
     	speech S_LAST_BLANK_LINE,
-        	l("[Nyle]"),
         	l("That's easy. Cynric will save your money when you ask him to deposit. Or you pick up your money by asking to withdraw."),
         	l("You only have to tell him how much you want to deposit or withdraw."),
         	l("Also you can ask how much he already save for you by checking your balance.");
@@ -63,7 +61,6 @@
 
     function nylo_items {
     	speech S_LAST_BLANK_LINE,
-        	l("[Nyle]"),
         	l("Let Cynric open your storage. You might also want to open your inventory."),
         	l("Pick an item from either storage or inventory and choose what you want to do with it by clicking the right button."),
         	l("You can also pick and drag items from one window into the other but this will move all items of this kind.");
@@ -90,7 +87,6 @@
 
     function nylo_money {
     	speech S_LAST_BLANK_LINE,
-        	l("[Nyle]"),
         	l("That's easy. Cynric will save your money when you ask him to deposit. Or you pick up your money by asking to withdraw."),
         	l("You only have to tell him how much you want to deposit or withdraw."),
         	l("Also you can ask how much he already save for you by checking your balance.");
@@ -118,7 +114,6 @@
 
 	function nylo_eplain {
 		speech S_LAST_BLANK_LINE,
-        	l("[Nyle]"),
         	l("There are banks all over the world. Usually every important village or city has one."),
         	l("You can save both items and money at a bank.");
 
@@ -145,7 +140,6 @@
 	}
 
 	speech S_LAST_BLANK_LINE,
-        l("[Nyle]"),
         l("Visiting the bank too right? We're only a small village but Cynric is the best bank guy I know.");
 
     do
@@ -169,8 +163,17 @@
     close;
 
 OnInit:
+    .@npcId = getnpcid(0, .name$);
+    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1321);
+    //setunitdata(.@npcId, UDT_HEADBOTTOM, 2217);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1300);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2200);
+    setunitdata(.@npcId, UDT_WEAPON, 1803);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 0);
+
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 4;
     end;
 }