From b8c073aa82358668018dfa63c622e0cf46119fb6 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 4 May 2019 01:42:02 -0300
Subject: Return potions cannot expire anymore

---
 npc/003-2/lua.txt      | 3 ++-
 npc/012-2/rakinorf.txt | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'npc')

diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index 70c355a01..ba3d37142 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -169,7 +169,8 @@ L_Info:
     getexp BaseLevel*30, JobLevel*5; // Reference Levels: (10, 3)
     setq General_Narrator, 2;
     mesn;
-    mesq l("Lucky for you, the Alliance have means to assist you. Please show me the following:");
+    mesq l("Lucky for you, the Alliance have means to assist you. You'll be a grown up, full fledged adventurer in no time at all, and will be able to visit a friend of mine, who will then send you there.");
+    next;
     goto L_Task;
 
 L_Task:
diff --git a/npc/012-2/rakinorf.txt b/npc/012-2/rakinorf.txt
index 90aedfde1..b7f086039 100644
--- a/npc/012-2/rakinorf.txt
+++ b/npc/012-2/rakinorf.txt
@@ -93,7 +93,7 @@ L_MainStory:
         rif(.@n2 == 4, l("Where can I find the previous mayor?")),
         rif(.@n2 == 6, l("Airlia told me you should lend me a Return Potion.")),
         rif(.@n2 == 7, l("I think I'm ready.")),
-        rif(.@n == 6 && (!countitem(ReturnPotion)||@returnpotion_expiredate<gettimetick(2)), l("I need more return potions.")),
+        //rif(.@n == 6 && (!countitem(ReturnPotion)||@returnpotion_expiredate<gettimetick(2)), l("I need more return potions.")),
         l("Ok, thanks.");
 
     mes "";
@@ -261,6 +261,7 @@ L_MainStory:
                 mes l("- Boss give more Job experience, but as long that you keep killing, you'll keep gaining.");
             break;
 
+        /*
         case 9:
             if (countitem(ReturnPotion))
                 delitem ReturnPotion, countitem(ReturnPotion);
@@ -270,6 +271,7 @@ L_MainStory:
             mesn;
             mesq l("There... *hic* They will expire *hic* in just @@... Or on logout.", FuzzyTime(@returnpotion_expiredate));
             break;
+        */
     }
     close;
 
@@ -290,7 +292,6 @@ L_Complete:
     inventoryplace ReturnPotion, 10;
     setq General_Narrator, 6, 0;
     getitem ReturnPotion, rand(5,10);
-    @returnpotion_expiredate=gettimetick(2)+1200+rand(600,1800); // 20 minutes + 10~30 minutes == last 30~60 minutes
     getexp BaseLevel*750, JobLevel*50;// Reference Levels: (40, 15)
     mesn;
     mesq l("Good, you *hic* proved your *hic* worth. I'll give you them.");
-- 
cgit v1.2.3-70-g09d2