From 0832c02a2c9c87dd9284a3cd93be52e0ddbb2629 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 21 Jul 2019 21:50:12 -0300
Subject: Rewrite a bit Vincent's dialog. Fixes TS/BUG 19

Vincent doesn't offers to take Bug Legs if you already have them
---
 npc/005-1/vincent.txt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'npc/005-1/vincent.txt')

diff --git a/npc/005-1/vincent.txt b/npc/005-1/vincent.txt
index 726864905..e23ed7b5f 100644
--- a/npc/005-1/vincent.txt
+++ b/npc/005-1/vincent.txt
@@ -12,9 +12,10 @@
 
     speech S_LAST_BLANK_LINE,
         l("I am making a figurin with Bug legs."),
-        lg("Be a friend and bring me @@ @@.", "Be a friend and bring me @@ @@.", .LegsCount, getitemlink(.LegsID));
+        lg("Be a friend and bring me @@ @@.", "Be a friend and bring me @@ @@.", .LegsCount, getitemlink(BugLeg));
 
     switch (select(l("Ok, I'll be back in no time."),
+                   rif(countitem(BugLeg) >= .LegsCount, l("I have them here already.")),
                    l("Sorry, I'm doing other things at the moment.")))
     {
         case 1:
@@ -23,25 +24,29 @@
                 l("Thank you. I'll wait here.");
             close;
         case 2:
+            setq CandorQuest_Vincent, 1;
+            goto L_CheckItems;
+        case 3:
             speech S_FIRST_BLANK_LINE,
-                l("But I'm almost out of @@...", getitemlink(.LegsID));
+                l("But I'm almost out of @@...", getitemlink(BugLeg));
             close;
     }
 
 L_CheckItems:
-    if (countitem(.LegsID) < .LegsCount)
+    if (countitem(BugLeg) < .LegsCount)
     {
         speech
             l("Sorry, but you don't have what I need."),
-            l("I need @@ @@.", .LegsCount, getitemlink(.LegsID));
+            l("I need @@ @@.", .LegsCount, getitemlink(BugLeg));
         close;
     }
 
     speech
+        l("I can't believe it! You've brought me @@ @@!", .LegsCount, getitemlink(BugLeg)),
         l("That's exactly what I needed!"),
         l("I will be forever grateful!");
 
-    delitem .LegsID, .LegsCount;
+    delitem BugLeg, .LegsCount;
     getexp 15, 5;
     Zeny = Zeny + 850;
     message strcharinfo(0), l("You receive @@ GP!", 850);
@@ -63,7 +68,6 @@ OnInit:
     setunitdata(.@npcId, UDT_HAIRSTYLE, 25);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 4);
 
-    .LegsID = BugLeg;
     .LegsCount = 10;
 
     .sex = G_MALE;
-- 
cgit v1.2.3-60-g2f50