add movement to tolchi in 005-4

4 files changed, 83 insertions, 34 deletions

diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 4a1411f8e..4b268866d 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -4,3 +4,4 @@
 "npc/005-1/_warps.txt",
 "npc/005-1/ayasha.txt",
 "npc/005-1/warpcandorbattle.txt",
+"npc/005-1/movetest.txt",
\ No newline at end of file
diff --git a/npc/005-1/movetest.txt b/npc/005-1/movetest.txt
new file mode 100644
index 000000000..f69a20ab4
--- /dev/null
+++ b/npc/005-1/movetest.txt
@@ -0,0 +1,27 @@
+// Authors: Saulc
+
+
+005-1,44,35,0	script	AyashaT	NPC_PLAYER,{
+
+    legiontalk;
+
+    close;
+
+OnTimer1000:
+    domovestep;
+
+OnInit:
+    initpath "move", 44, 35,
+             "dir", TOP, 0,
+             "wait", 2, 0,
+             "move", 51, 81,
+             "dir", DOWN, 0,
+             "wait", 2, 0,""
+             "Mmove", 50, 88,
+             "dir", DOWN, 0,
+             "wait", 2, 0;
+
+    initialmove;
+    initnpctimer;
+    .distance = 5;
+}
\ No newline at end of file
diff --git a/npc/005-4/rosen.txt b/npc/005-4/rosen.txt
index 32d2bcb81..60bf6c73f 100644
--- a/npc/005-4/rosen.txt
+++ b/npc/005-4/rosen.txt
@@ -1,10 +1,10 @@
-// Evol scripts.
+// TMW2 scripts.
 // Author:
-//    Reid
+//    Saulc
 // Description:
 //    Light Armor shop keeper.
 // Variables:
-//    ArtisQuests_Enora
+//    CandorQuests_Rosen
 // Values:
 //    0    Default.
 //    1    BlackSmith quest delivered.
@@ -16,54 +16,51 @@
 
 005-4,29,36,0	script	Rosen	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
 
-    function explain_craft {
+    function explain_ironingot {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Did you see Don the blacksmith? He might know how you could improve your metal equipment."),
-            l("Nevertheless, you can craft some cards that you can then attach to your equipment."),
-            l("We sell a brimmed hat, you can craft a feather card and attach it to this hat to obtain an enhanced version of it!");
+            l("Did you see Jhedia the blacksmith in Tulimshar? He might know how you could get this."),
+            l("Nevertheless, you can sap it on Bif, if you are lucky.");
 
         return;
     }
 
-    function enora_quest {
+    function rosen_quest {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("I thought that she would never come to pick it up!"),
-            l("Here it is, a fashionable @@.", getitemlink(ArtisTankTop, CamelCottonDye)),
             l("I asked Calypsan to dye this tank top, now it has an unique look!");
 
         narrator S_LAST_NEXT, l("You pick up the package.");
 
-        setq ArtisQuests_Enora, 6;
+        setq CandorQuests_Rosen, 6;
 
         return;
     }
 
     speech S_LAST_NEXT,
-        l("Welcome to my office."),
+        l("Welcome to Tolchi and Rosen Shop."),
         l("What would you like today?");
 
     do
     {
-        .@enora = getq(ArtisQuests_Enora);
+        .@rosen = getq(CandorQuests_Rosen);
         select
-            rif(.@enora == 5, lg("I came to retrieve a package for Enora.")),
+            rif(.@rosen == 5, lg("I came to retrieve a package for Rosen.")),
             menuaction(l("Trade")),
-            l("How can I improve my equipment?"),
+            l("How can I get iron ingot?"),
             menuaction(l("Quit"));
 
         switch (@menu)
         {
-            case 1:
-                enora_quest;
+            case 1: //broken need a fix
+                rosen_quest;
                 closedialog;
                 goodbye;
                 close;
             case 2:
                 closedialog;
-                shop "Store#001-2-0";
+                shop "Shop";
                 close;
             case 3:
-                explain_craft;
+                explain_ironingot;
                 break;
             case 4:
                 closedialog;
diff --git a/npc/005-4/tolchi.txt b/npc/005-4/tolchi.txt
index 99d68d691..4653259a8 100644
--- a/npc/005-4/tolchi.txt
+++ b/npc/005-4/tolchi.txt
@@ -1,24 +1,48 @@
-// Evol scripts.
+// TMW2 scripts.
 // Author:
-//    Reid
-// Description:
-//    Light Armor shop keeper.
+//    Saulc
 // Variables:
-//    ArtisQuests_Enora
+//    CandorQuests_BlackSmith
 // Values:
 //    0    Default.
-//    1    BlackSmith quest delivered.
-//    2    Chelios Quest given.
-//    3    Chelios Quest done.
-//    4    BlackSmith gave the sword.
-//    5    Light Armor Shop quest delivered.
-//    6    Light Armor Shop gave the cloths.
+//    1    BlackSmith quest ask for 1 iron oore
+//    2    BlackSmith quest ask for 3 coal
+//    3    BlackSmith quest ask for 1 iron ingot
 
-005-4,42,37,0	script	Tolchi	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
 
+005-4,42,37,0	script	Tolchi	NPC_RAIJIN_FEMALE_LEGION_ARTIS,{
+
+
+OnTimer1000:
+    domovestep;
 
 OnInit:
-    .sex = G_FEMALE;
-    .distance = 2;
-    end;
+    initpath "move", 44, 35,
+             "dir", UP, 0,
+             "wait", 30, 0,
+             "move", 43, 40,
+             "dir", UP, 0,
+             "wait", 30, 0,
+             "move", 40, 35,
+             "dir", UP, 0,
+             "wait", 30, 0,
+             "dir", LEFT, 0,
+             "wait", 30, 0,
+             "move", 42, 37,
+             "dir", DOWN, 0,
+             "dir", UP, 0,
+             "wait", 30, 0,
+             "Mmove", 45, 37,
+             "dir", DOWN, 0,
+             "wait", 30, 0,
+             "move", 33, 37,
+             "dir", LEFT, 0,
+             "wait", 30, 0,
+             "move", 33, 37,
+             "dir", RIGHT, 0,
+             "wait", 30, 0;
+
+    initialmove;
+    initnpctimer;
+    .distance = 5;
 }