Lua Quest 2-2: A Stable Income

2 files changed, 43 insertions, 6 deletions

diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index c7b407c8d..1fc179e9b 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -360,22 +360,58 @@ function luaCheckTask1 {
 
 
 function luaAssignTask2 {
+    mesn;
+    mesq l("Great! Here, I'll give you %d GP so you can start here with more ease.", 500);
+    tutmes l("You can get money in several ways, including by selling monster parts and doing daily quests. Read the [@@help://faq|FAQ@@] (opens ingame) for help."), l("Getting Money");
+    next;
+    mesn;
+    mesq l("Well, I have a small problem. Sorry, but my superior officer did not like you. This happens, not everyone will like us, right? A lot of adventurers actually hate me %%R");
+    next;
+    mesn;
+    mes l("Anyway, he had a point. What will you do once the Monster War is over?");
+    if (MPQUEST)
+        mes l("The monster hunting program will end, and what will you do?");
+    if (countitem(TulimsharGuardCard))
+        mes l("The city guard won't need help from strangers anymore.");
+    next;
+    mesn;
+    mesq l("So, you need an alternative way to earn a living. So I looked at what is at highest demand right now, and which will remain once the war ends, and I've found you... %s!", b(l("two jobs")));
+    next;
+    mesn;
+    mes l("%s is by becoming a %s.", b(l("The first job,")), b(l("Fisherman/Fisherwoman")));
+    mes l("Food is, and should always will be, in demand.");
+    // If you skipped Tutorial: You already know all this
+    tutmes l("Fishing is a boring task. Throw the bait, wait for fish to bite. Pull before it is too late. Then sell the fish for money."), l("Fishing");
+    next;
+    mes l("However, you need a %s or a Fishing Net. There's one fisherman in Tulimshar Center, called Eugene. He should have one, but he lives isolated on a small island... Good luck getting to him.", getitemlink(FishingRod));
+    tutmes l("The path to reach Eugene is hidden. However, if you pay attention to the map, you should figure out how to reach that island without swimming."), l("Secret Passages");
     next;
+    mesn;
+    mes l("%s is by becoming a %s.", b(l("The second job,")), b(l("Craftsman/Craftswoman")));
+    tutmes l("One of the most important jobs on Moubootaur Legends, crafted equipment is much stronger than regular ones. Specially weapons."), l("Crafting");
+    tutmes l("To craft an item, you'll need to learn its blueprint. Blueprints can be very hard to obtain! Being a crafter will take a lot of your time."), l("Crafting");
+    next;
+    mesn;
+    mesq l("I think Intense Beard, on Tulimshar's Forge, was taking new apprentices. Try talking to him!");
+    next;
+    mesn;
+    mesq l("Again, you don't need to do both right now, but you probably will want to. Once you have a stable alternative income, I'll have... This paperwork sorted.");
+    // Rewards from previous quest
+    next;
+    Zeny+=500;
+    getexp 200, 20;
     return;
 } // Fishing & Crafting
 
 function luaTask2 {
     msObjective(countitem(FishingRod), l("* @@/@@ @@", countitem(FishingRod), 1, getitemlink(FishingRod)));
-    msObjective(CRAFTQUEST, l("* Register as a Crafter or Hunter"));
+    mes l("--- OR ---");
+    msObjective(CRAFTQUEST, l("* Register as a Craftsman/Craftswoman."));
     return;
 }
 
 function luaCheckTask2 {
-    return (BaseLevel >= 20 &&
-        JobLevel >= 6 &&
-        Zeny >= 1000 &&
-        (CRAFTQUEST || MPQUEST) &&
-        countitem(TulimsharGuardCard) &&
+    return (CRAFTQUEST ||
         countitem(FishingRod));
 }
 
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index bdd00cc06..56290a7a5 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -490,6 +490,7 @@ OnInit:
         ReplaceItemFromEveryPlayer(RiceHat, BullHelmet);
         DelItemFromEveryPlayer(SilverEasteregg);
         query_sql("UPDATE `quest` SET `count1` = '2' WHERE `quest`.`quest_id`="+General_Narrator+" AND `count1` = '3'");
+        query_sql("UPDATE `quest` SET `count2` = '0' WHERE `quest`.`quest_id`="+General_Narrator+" AND `count1` = '2'");
         debugmes "";
         debugmes "* Bull Helmet Fix";
         debugmes "* Remove Silver Easter Eggs";