From b6bb37a8553885797c31e28953145ef8bd0f171a Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 25 May 2018 12:37:23 -0300
Subject: Correct Guard Devoir.

---
 npc/003-10/guarddevoir.txt | 52 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'npc/003-10')

diff --git a/npc/003-10/guarddevoir.txt b/npc/003-10/guarddevoir.txt
index 52d8a16ee..c63c351d8 100644
--- a/npc/003-10/guarddevoir.txt
+++ b/npc/003-10/guarddevoir.txt
@@ -10,66 +10,66 @@
 003-10,25,60,0	script	Guard Devoir	NPC_ELF_F,{
 
     mesn;
-    mesq l("that's incredible! Monsters are now close to city gate! We need to stop them progression.");
+    mesq l("That's terrible! Monsters are piling up near city gates! We need to stop their progression.");
     if (BaseLevel >= 25) goto L_Menu;
     close;
 
 L_Menu:
-    mes "[Guard Devoir]";
-    mesq l("Would you like to help us a protection the town of red scorpion invasion ??");
+    mesn;
+    mesq l("Would you like to help us to protect the town from a red scorpion invasion??");
     mes "";
     menu
-        l("Yeah sure ! I'm brave as Simon"),L_Quest,
-        l("Where can i found them?"),L_Where,
+        l("Yeah, sure! I'm brave as Simon."),L_Quest, // famous player name
+        l("Where can I find them?"),L_Where,
         l("No, thanks."),L_Close;
 
 L_Quest:
     mes "";
     .@q=getq(TulimsharQuest_Devoir);
-    mesq l("Nice ! I want you to kill some red scorpion! Mostly male!");
+    mesq l("Nice! I want you to kill some red scorpions, as I said!");
     next;
     if (.@q == 0) goto L_Continue;
-    if (.@q == 1 && gettimetick(2) >= DEVOIR_TIMER + 60 * 60 * 40) setq TulimsharQuest_Devoir, 2;
+    if (.@q == 1 && gettimetick(2) >= getq2(TulimsharQuest_Devoir) + 60 * 60 * 36) setq1 TulimsharQuest_Devoir, 2; // Repats every 36 hours
     if (.@q == 2) goto L_Repeat;
     close;
 
 L_Continue:
-    mesq l("Red Scorpion breed fast as Ratto! With small amount of guard, it's impossible to take over.");
+    mesq l("Red Scorpion breed as fast as the Ratto! With our current numbers, it's nearly impossible to take over.");
     next;
-    mesq l("To prove you help us in this purge i ask you to bring me 14 @@? I will reward you for your bravor.", getitemlink(RedScorpionStinger));
+    mesq l("I usually ask for 7, but to prove you are going to help us in this purge, I will ask you for 14 @@! I will reward you for your bravure.", getitemlink(RedScorpionStinger));
     mes "";
     menu
-        rif(countitem(MaggotSlime) >= 7, l("Here they are miss!")), L_Finish,
+        rif(countitem(RedScorpionStinger) >= 14, l("Here they are, miss!")), L_Finish,
         l("I'll get to it."), L_Close;
     close; // double sure
 
 L_Repeat:
-    mesq l("How your purge was ? i hope you success it!.");
+    mesq l("How is your purge going? I hope you had success at it!");
     next;
-    mesq l("Bring me 7 @@?", getitemlink(RedScorpionStinger));
+    mesq l("Did you brought me 7 @@?", getitemlink(RedScorpionStinger));
     mes "";
     menu
         rif(countitem(RedScorpionStinger) >= 7, l("Here they are miss!")), L_Finish2,
         l("I'll get to it."), L_Close;
     close;
 
-L_Finish2:
-    delitem RedScorpionStinger, 7;
-    getexp 999, 0;
-    Zeny = (Zeny + 680); // 70*7 = 490 base
-    setq TulimsharQuest_Devoir, 1;
-    set DEVOIR_TIMER, gettimetick(2);
+// First Time Only
+L_Finish:
+    delitem RedScorpionStinger, 14;
+    getexp 1555, 10;
+    Zeny = (Zeny + 1410); // 70*14 = 980 base
+    setq TulimsharQuest_Devoir, 1, gettimetick(2);
     mes "";
     mesn;
     mesq l("Many thanks! Come back later to bring me extra @@!", getitemlink(RedScorpionStinger));
     close;
 
-L_Finish:
-    delitem RedScorpionStinger, 14;
-    getexp 1555, 10;
-    Zeny = (Zeny + 1410); // 70*14 = 980 base
-    setq TulimsharQuest_Devoir, 1;
-    set DEVOIR_TIMER, gettimetick(2);
+// Repeat
+L_Finish2:
+    delitem RedScorpionStinger, 7;
+    getexp 999, 0;
+    Zeny = (Zeny + 680); // 70*7 = 490 base
+    setq TulimsharQuest_Devoir, 1, gettimetick(2);
     mes "";
     mesn;
     mesq l("Many thanks! Come back later to bring me extra @@!", getitemlink(RedScorpionStinger));
@@ -77,9 +77,9 @@ L_Finish:
 
 L_Where:
     mes "";
-    mesq l("Ah, their is lot of in miner cave?");
+    mesq l("Ah, there are lots on the miners cave.");
     next;
-    mes l("Be aware to don't attack them when they are in group!.");
+    mes l("Take care though, don't attack them when they are in group!");
     next;
     mes l("Good luck.");
     goto L_Close;
-- 
cgit v1.2.3-70-g09d2