Rewrite Tolchi

1 files changed, 53 insertions, 46 deletions

diff --git a/npc/005-4/tolchi.txt b/npc/005-4/tolchi.txt
index 0a40082ca..4e45e1fe9 100644
--- a/npc/005-4/tolchi.txt
+++ b/npc/005-4/tolchi.txt
@@ -1,6 +1,7 @@
 // TMW2 scripts.
 // Author:
 //    Saulc
+//    Jesusalva
 // Variables:
 //    CandorQuests_Tolchi
 // Description:
@@ -10,6 +11,7 @@
 //    1    BlackSmith quest ask for 1 iron oore
 //    2    BlackSmith quest ask for 3 coal
 //    3    BlackSmith quest ask for 1 iron ingot
+//    4    Quest is Complete
 
 
 005-4,42,37,0	script	Tolchi	NPC_RAIJIN_FEMALE_LEGION_ARTIS,{
@@ -19,10 +21,10 @@
     .Item3 = IronIngot;
 
     function quest_close {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Maybe next time.");
-            goodbye;
-        close;        
+        speech S_FIRST_BLANK_LINE,
+            l("Maybe next time, then.");
+        close2;
+        goodbye;
     }
 
     function quest_giveitem {
@@ -30,27 +32,27 @@
         if (.@tolchi == 2)
         {
             if (countitem("Iron Ingot") == 0)
-            {           
-                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            {
+                speech S_FIRST_BLANK_LINE,
                     l("You don't have the Iron Ingot.");
-                    goodbye;
-                close;
+                close2;
+                goodbye;
             }
             delitem .Item3, 1;
             Zeny = Zeny + 8000;
-            getexp 1500,0; 
+            getexp 1500,0;
             setq CandorQuest_Tolchi, 3;
-            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Thanks mate, that is everything I need! Have a good day!");  
+            speech S_FIRST_BLANK_LINE,
+            l("Thanks mate, that is everything I need! Have a good day!");
         }
         if (.@tolchi == 1)
         {
             if (countitem("Coal") <= 2)
-            {           
-                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            {
+                speech S_FIRST_BLANK_LINE,
                     l("You don't have the three Coal lumps.");
-                    goodbye;
-                close;
+                close2;        
+                goodbye;
             }
             delitem .Item2, 3;
             Zeny = Zeny + 800;
@@ -60,15 +62,15 @@
         if (.@tolchi == 0)
         {
             if (countitem("Iron Ore") == 0)
-            {           
-                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            {
+                speech S_FIRST_BLANK_LINE,
                     l("You don't have the Iron Ore.");
-                    goodbye;                 
-                close;
+                close2;
+                goodbye;
             }
             delitem .Item1, 1;
             Zeny = Zeny + 200;
-            getexp 50,0; 
+            getexp 50,0;
             setq CandorQuest_Tolchi, 1;
         }
         close;
@@ -76,12 +78,14 @@
 
     function quest_first {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Can you bring me 1 @@", getitemlink(.Item1));
+            l("Well, it is terrible! How can I make armours if I ran out of Iron? Shall the citizens of Candor Island perish in a monster attack?!"), // NOTE: I really prefer EN_US (eg. armor vs armour)
+            l("They shouldn't. Could you perhaps, kindly bring me 1 @@?", getitemlink(.Item1));
         do
         {
+            //l("Do not worry, I'll seek and bring it to you."),
             select
-                l("Yes."),
-                l("No.");
+                l("Do not worry, I have them right here."),
+                l("I am not a citizen of Candor.");
 
             switch (@menu)
             {
@@ -91,18 +95,20 @@
                 case 2:
                     quest_close;
                     break;
-            }   
-        } while (@menu != 2);       
+            }
+        } while (@menu != 2);
     }
 
     function quest_second {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Can you bring me 3 @@", getitemlink(.Item2));
+        speech  S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Thanks for helping my shop earlier. I forge weapons, but unfortunately, I need more than just iron to forge them."),
+            l("Can you bring me 3 @@? Of course, you'll be rewarded.", getitemlink(.Item2));
         do
         {
+            // l("Hey, I like rewards. Wait me, I'll be back!"),
             select
-                l("Yes."),
-                l("No.");
+                l("You better have it ready, because I have the Coal with me!"),
+                l("Eh, that seems too problematic. Sorry.");
 
             switch (@menu)
             {
@@ -112,18 +118,20 @@
                 case 2:
                     quest_close;
                     break;
-            }   
-        } while (@menu != 2);       
+            }
+        } while (@menu != 2);
     }
 
     function quest_third {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Can you bring me 1 @@", getitemlink(.Item3));
+            l("Ok, this will be my last request. The Trainer asked me for a fine weapon, to protect our village."),
+            l("Problem is, I do not have the knowledge to make it without @@. If you bring me one, I'll reward you with one quarter of my commission.", getitemlink(.Item3));
         do
         {
+            // l("Do not worry, I'll be back in a jiffy."),
             select
-                l("Yes."),
-                l("No.");
+                l("No problem is too big for me. I have them right here!"),
+                l("Sorry, I am busy...");
 
             switch (@menu)
             {
@@ -133,32 +141,31 @@
                 case 2:
                     quest_close;
                     break;
-            }   
-        } while (@menu != 2);       
+            }
+        } while (@menu != 2);
     }
 
     .@tolchi = getq(CandorQuest_Tolchi);
 
     if (BaseLevel <= 4 || BaseLevel <= 9 && .@tolchi == 1 || BaseLevel <= 14 && .@tolchi == 2)
     {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        l("You aren't strong enough. Come back later.");
+        speech 0x0,
+        l("I need help, but you aren't strong enough. Please come back later.");
+        close2;
         goodbye;
-        close;
     }
 
     if (.@tolchi == 3)
     {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        speech 0x0,
         l("Hey! How are you today? Thanks again for your help.");
+        close2;
         goodbye;
-        close;
     }
 
-    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        l("Hello can you help me?");
+    speech S_LAST_NEXT,
+        l("Hello! You seem strong enough, could take a request from me? Of course, not for free.");
 
-    
     do
     {
         select
@@ -171,7 +178,7 @@
         {
             case 1:
                 quest_first;
-                setq CandorQuest_Tolchi, 0;
+                setq CandorQuest_Tolchi, 0; // TODO: Suspicious piece of code
                 break;
             case 2:
                 quest_second;
@@ -182,7 +189,7 @@
             case 4:
                 quest_close;
                 goodbye;
-                break;        
+                break;
         }
     } while (@menu != 4);