add Maya npc on 003-1

22 files changed, 834 insertions, 39 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 42f634dfb..43d79bf1d 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -62,6 +62,8 @@ map_list: (
     "001-3-1",
     "002-1",
     "002-2",
+    "002-3",
+    "002-4",
     "003-1",
     "003-2-0",
     "003-2-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 6f6266865..06ccd54dd 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -59,36 +59,38 @@
 001-3-1 59
 002-1 60
 002-2 61
-003-1 62
-003-2-0 63
-003-2-1 64
-003-2-2 65
-003-2 66
-003-3 67
-003-5 68
-003-7 69
-003-8 70
-005-1 71
-005-2 72
-005-3 73
-005-4 74
-005-5 75
-005-6 76
-008-1 77
-008-2-0 78
-008-2-1 79
-008-2-10 80
-008-2-11 81
-008-2-12 82
-008-2-13 83
-008-2-14 84
-008-2-2 85
-008-2-3 86
-008-2-4 87
-008-2-5 88
-008-2-6 89
-008-2-7 90
-008-2-8 91
-008-2-9 92
-test 93
-testbg 94
+002-3 62
+002-4 63
+003-1 64
+003-2-0 65
+003-2-1 66
+003-2-2 67
+003-2 68
+003-3 69
+003-5 70
+003-7 71
+003-8 72
+005-1 73
+005-2 74
+005-3 75
+005-4 76
+005-5 77
+005-6 78
+008-1 79
+008-2-0 80
+008-2-1 81
+008-2-10 82
+008-2-11 83
+008-2-12 84
+008-2-13 85
+008-2-14 86
+008-2-2 87
+008-2-3 88
+008-2-4 89
+008-2-5 90
+008-2-6 91
+008-2-7 92
+008-2-8 93
+008-2-9 94
+test 95
+testbg 96
diff --git a/db/quest_db.conf b/db/quest_db.conf
index bad26d61e..bd8683023 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -182,6 +182,10 @@ quest_db: (
     Name: "CandorQuest_Tolchi"
 },
 {
+    Id: 38
+    Name: "CandorQuest_Maya"
+},
+{
 	Id: 1000
 	Name: "Test_testing1"
 },
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index ce8bf6328..0a84d166d 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -9023,12 +9023,12 @@ item_db: (
     AegisName: "GoldenBlackPearlRing"
     Name: "Golden Pearl Ring"
     Type: "IT_ARMOR"
-    Buy: 1200
-    Sell: 250
+    Buy: 10000
+    Sell: 5000
     Weight: 1
     Atk: 0
     Matk: 0
-    Def: 140
+    Def: 1
     Range: 0
     Slots: 0
     Job: {
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 66e98e2b9..2cdfd5a32 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/npc/002-1/_warps.txt b/npc/002-1/_warps.txt
index 76473f7bf..17c593156 100644
--- a/npc/002-1/_warps.txt
+++ b/npc/002-1/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 002-1: Second Deck warps
-002-1,72,30,0	warp	#002-1_72_30	0,0,005-2,31,26
+002-1,72,30,0	warp	#002-1_72_30	0,0,002-3,31,26
diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt
new file mode 100644
index 000000000..77541ce13
--- /dev/null
+++ b/npc/002-3/_import.txt
@@ -0,0 +1,8 @@
+// Map 002-3: First Deck
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/002-3/_warps.txt",
+"npc/002-3/billybons.txt",
+"npc/002-3/doors.txt",
+"npc/002-3/julia.txt",
+"npc/002-3/mapflags.txt",
+"npc/002-3/note.txt",
diff --git a/npc/002-3/_warps.txt b/npc/002-3/_warps.txt
new file mode 100644
index 000000000..11eb4b760
--- /dev/null
+++ b/npc/002-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 002-3: First Deck warps
+002-3,31,25,0	warp	#002-3_31_25	0,0,002-1,72,29
diff --git a/npc/002-3/billybons.txt b/npc/002-3/billybons.txt
new file mode 100644
index 000000000..6338f0406
--- /dev/null
+++ b/npc/002-3/billybons.txt
@@ -0,0 +1,108 @@
+// Evol scripts.
+// Author:
+//    Reid
+// Description:
+//    Drunk easteregg telling about the player's past.
+
+002-3,20,23,0	script	Billy Bons	NPC_BILLY_BONS,{
+    if (rand(5) == 2) goto L_Hic;
+    .@q = getq(ShipQuests_Bottle);
+    if (.@q) == 1 close;
+
+    mesn;
+    mesq l("You? Here?");
+    mesq l("How is *hic* it possible?");
+    next;
+
+    mesn "Narrator";
+    mes col(l("The sailor chugs his beer."), 9);
+    next;
+
+    select
+        lg("Excuse me? Do you know who I am?");
+
+    mes "";
+    mesn;
+    mesq l("Don't do theee... *hic* with me eh!");
+    next;
+
+    menu
+        l("Are you ok?"), L_Quit,
+         ("Take the bottle?"), L_Give,
+        l("Alright... Bye."), -;
+
+    mes "";
+    mesn;
+    mesq lg("No and *hic*... No, you and you and your... *burp* stup*hic* guild!");
+    next;
+    mesq l("You tried to get rid of me, eeh? But surprise! I'm still here... *hic* Or there...");
+    next;
+    mesq l("But you won't *hic* me this time...");
+    next;
+
+    menu
+        l("What are you talking about? What guild?"), L_Quit,
+        l("You are full of wine, my friend..."), -,
+        l("You should go and get some sleep."), L_Quit;
+
+    mes "";
+    mesn;
+    mesq l("If I saw *hic* who you were... *hic* Would not have helped you! ");
+    next;
+
+    menu
+        l("But who am I?"), -,
+        l("What am I supposed to say?"), L_Quit,
+        l("You should go and get some sleep."), L_Secret;
+
+    mes "";
+    mesn;
+    mesq l("The giant boogeyman!");
+
+    close;
+
+L_Secret:
+    mes "";
+    mesn;
+    mesq l("Hear me *hic* well, what ever, whatididever you will *hic* said ab... uhm... out what?! You saw there, the Legion of Aemil won't let it get public.");
+    next;
+    mesq l("Nobody will know about the existence of the Mercurians.");
+    next;
+    mesq l("Nobody! *burp*");
+    next;
+
+    close;
+
+L_Hic:
+    npctalk3 l("*Hic*");
+
+    close;
+
+L_Quit:
+    mes "";
+    mesn;
+    mesq l("Yeah you're all like *hic* that in Esperia, but you won't get me! *burp*");
+    next;
+    mesq l("I'm not that numb eeh *hic* what did ever yous disco... ...vered there, the Legion of Aemil won't get me!");
+    mesq l("*burp*");
+    next;
+
+    mesn "Narrator";
+    mes col(l("The sailor turns his back to you."), 9);
+
+    close;
+
+    L_Give:
+    mes "";
+    inventoryplace 833, 1;
+
+    setq ShipQuests_Bottle, 1;
+    getitem 833, 1;
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 3;
+    end;
+}
diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt
new file mode 100644
index 000000000..4e39b520c
--- /dev/null
+++ b/npc/002-3/doors.txt
@@ -0,0 +1,85 @@
+// Evol scripts.
+// Author:
+//    Reid
+// Description:
+//    Doors NPCs.
+//    The third value of the .@nard variable has been removed for the beta2, it'll then be re-added for the Aurora release.
+// Variable:
+//    0 ShipQUests_Nard
+//    1 ShipQuests_Julia
+// Values:
+//    Nard:
+//    00   Introduction of the boxes and Nard. This is displayed when the player never spoke to Nard or his box.
+//    01   Nard spoke and gave access to the outdoor of the ship.
+//    02   Completed the Gugli quest.
+//    03   ChefGado Quest accepted.
+//    04   ChefGado Quest completed and "Introduction" chapter finalized.
+//    05   Reward taken from the box.
+//    10   Has not talked to Julia
+//    11   Need to see Julia
+//    12   Has been registered by Julia
+
+002-3,19,28,0	script	AreaNPC#doors1	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    .@nard = getq(ShipQuests_Nard);
+
+    if (getq(General_Narrator) > 0)
+    {
+        warp "005-1", 42, 107;
+        close;
+    }
+
+    if (.@nard == 4) goto L_GotoNard;
+    if (.@nard == 5) goto L_End;
+    if (.@nard > 0 && countitem(718) > 0) goto L_Key;
+
+    setcamnpc "Julia";
+    mesn "Julia";
+    mesq l("The captain has locked the door, you should go see him.");
+    next;
+
+    mesn "Narrator";
+    mes col(l("Captain Nard is in the room to your right."), 9);
+    next;
+    restorecam;
+
+    close;
+
+L_Key:
+    warp "005-1", 42, 107;
+    close;
+
+L_GotoNard:
+    setcamnpc "Julia";
+    mesn "Julia";
+    mesq l("The captain is waiting for you! Hurry up.");
+    next;
+    restorecam;
+
+    close;
+
+L_End:
+    mesn "Narrator";
+    mesq col(l("This door is locked."), 9);
+    setcamnpc "Julia";
+    next;
+    mesn "Julia";
+    mesq l("We're soon leaving that island, please return to your cabine.");
+    next;
+    restorecam;
+   
+    close;
+}
+
+002-3,33,28,0	script	AreaNPC#doors2	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    .@julia = getq(ShipQuests_Julia);
+    if (.@julia == 2) goto L_Warp;
+    close;
+
+L_Warp:
+    warp "002-3", 20, 27;
+    close;
+}
diff --git a/npc/002-3/julia.txt b/npc/002-3/julia.txt
new file mode 100644
index 000000000..5c873a158
--- /dev/null
+++ b/npc/002-3/julia.txt
@@ -0,0 +1,302 @@
+// Evol scripts.
+// Authors:
+//    4144
+//    Qwerty Dragon
+//    Vasily_Makarov
+// Description:
+//    Allows to change language and talks about what happened to him.
+//    2 Bits Array:
+//    ShipQuests
+// Variables:
+//    0 ShipQuests_Julia
+//    1 ShipQuests_ChefGado
+//    2 ShipQuests_Nard
+// Values:
+//    Julia:
+//    10   Default, no quest given.
+//    01   Need to see Julia.
+//    02   Has been registered by Julia.
+//    Gado:
+//    10   Default, no quest given.
+//    11   Quest accepted.
+//    12   Ingredients collected, ready to poison Julia.
+//    13   Julia poisoned.
+//    14   Quest complete. Chef Gago wins.
+//    15   Quest complete. Julia wins (poison dish returned).
+//    16   Quest complete. Julia wins.
+//    Nard:
+//    20   Introduction of the boxes and Nard. This is displayed when the player never spoke to Nard or his box.
+//    21   Nard spoke and gave access to the outdoor of the ship.
+//    22   Completed the Gugli quest.
+//    23   ChefGado Quest accepted.
+//    24   ChefGado Quest completed and "Introduction" chapter finalized.
+//    25   Reward taken from the box.
+
+002-3,27,24,0	script	Julia	NPC_JULIA,2,10,{
+
+    function ynMenu {
+        if (select(l("Yes, I do."), l("No, none.")) == 1) {
+            return;
+        }
+        closedialog;
+    }
+
+    function poisonJulia {
+        mes "";
+        mesn;
+        mesq l("Seems yummy! Let me taste it!");
+        next;
+        mesq l("Hmmm, hm... *cough*, *cough*, *burp*, *cough*. What... What is that?!... *cough*, *burp*... Damn Gado... *cough*");
+        if (countitem(PoisonedDish) > 0) delitem PoisonedDish, 1;
+        setq ShipQuests_ChefGado, 3;
+        close;
+    }
+
+    function gotoSleep {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("You already did enough for us, follow Nard's advice and get some rest."),
+            l("We are at half a day from our final destination, by the time that you wake up I'm sure that we will be there!"),
+            l("Do you have any other questions for me?");
+        ynMenu;
+        return;
+    }
+
+    function heardRumors {
+        mes "";
+        mesn;
+        mesq l("You shouldn't believe every tale drunken sailors tell you.");
+        next;
+
+        select
+            l("Let's say the person who told me about that is well respected on this ship and never drunk.");
+
+        mes "";
+        mesn;
+        mesq l("Hahaha! All sailors aboard this ship are always drunk... Well... Except... Wait, what?! Nard told you?!");
+        next;
+        mesq l("Doesn't he like the way I'm taking care of his ship? Everything is clean and tidy with me, rightful lieutenant of La Johanne.");
+        next;
+        mesq l("I give tasks to every single sailor, all day long. That should make him happy!");
+        next;
+
+        select
+            l("Well... I don't think it is the best way to rule a ship. Think about it."),
+            l("In fact, everything seems to work perfectly under your guidance. Nard has made the right choice.");
+
+        if (@menu == 1)
+        {
+            closedialog;
+            end;
+        }
+
+        mes "";
+        mesn;
+        mesq l("I'm glad you're on my side.");
+        next;
+        mesq l("Take this money as a reward for your nice words.");
+
+        setq ShipQuests_ChefGado, 6;
+        Zeny += 100;
+        message strcharinfo(0), l("You receive @@ E!", 100);
+        getexp 8, 0;
+        close;
+    }
+
+    function gotRegrets {
+        mes "";
+        mesn;
+        mesq l("Why? And who should you bring it back to?");
+        next;
+
+        select
+            l("Ehm... He was really upset because of some past stories.");
+
+        mes "";
+        mesn;
+        mesq l("Gado! That coward lives in the past, I will ask Nard to punish him, again!");
+        next;
+        mesq l("Take this money for your wise choice. But do not try it again. The open sea has been merciful with you once... Do not further tempt the fates!");
+
+        setq ShipQuests_ChefGado, 5;
+        Zeny += 200;
+        message strcharinfo(0), l("You receive @@ E!", 200);
+        getexp 15, 0;
+        close;
+    }
+
+    function basicSkill {
+        mes "";
+        mesn;
+        mesq l("Let me check into it...");
+        next;
+        adddefaultskills;
+        mesq l("Here you go, everything is fixed.");
+        emotion E_HAPPY;
+        next;
+        mesq l("Do you have any other questions for me?");
+        next;
+        ynMenu;
+        return;
+    }
+
+    function chooseLang {
+        mes "";
+        mesn;
+        mesq l("Of course! Tell me which language you speak and I will change the note on the ship passenger list.");
+        next;
+
+        asklanguage(LANG_IN_SHIP);
+
+        mes "";
+        mesn;
+        mesq l("Ok, done.");
+
+        if (getq(ShipQuests_Julia) == 2)
+        {
+            next;
+            mesq l("Do you have any other questions for me?");
+            next;
+            ynMenu;
+            return;
+        }
+
+        next;
+        mesq l("I'm sure that you've got some questions for me, feel free to ask them, but first I need to tell you the rules of proper social conduct on board.");
+
+        mesq l("Here they are.");
+        next;
+
+        narrator S_LAST_NEXT,
+            l("There is a paper with some rules written on it.");
+
+        GameRules 8 | 4;
+
+        mesn;
+        mesq l("Oh, and I almost forgot! Do not give the password of your room to anybody! I am the only one who has the other key and I won't ask for yours so keep it secret and try not to use the same password for any other room in the future.");
+        next;
+        mesq l("If you want to read this page again, there is a copy up on the left wall.");
+        next;
+        mesq l("You can also read The Book of Laws at any time to see the rules.");
+        next;
+        mesq l("I think I'm done with that now. Do you have any questions?");
+        next;
+
+        setq ShipQuests_Julia, 2;
+        return;
+    }
+
+    function whereAmI {
+        mes "";
+        mesn;
+        mesq l("You're on a ship, we're on our way to the commercial capital of Artis.");
+        next;
+        mesq l("We should be there in a few days, once we arrive, I will warn the Legion of Aemil about what happened, I'm sure they can help.");
+        next;
+        mesq l("But for now, you can relax on the ship, or visit the island we're docked at! Its a small island, but a good place to get some exercise and stretch your legs.");
+        next;
+        mesq l("Do you have any other questions for me?");
+        next;
+        ynMenu;
+        return;
+    }
+
+    function whatHappened {
+        mes "";
+        mesn;
+        mesq l("We thought that you could help us understand this, all we know is that we found you cast in the sea, adrift on your raft.");
+        next;
+        mesq lg("You were in bad shape, you should be happy we found you before the sea killed you.");
+        next;
+        mesq l("Oh, and there was this inscription on your raft. It represents the Legion of Aemil, one of the four main guilds of Gasaron. Does that help you remember anything, anything at all?");
+        next;
+
+        select
+            l("Sorry, but I can't tell you anything about that."),
+            l("Nothing, sorry.");
+
+        mes "";
+        mesn;
+        mesq l("No problem, do you have any other questions for me?");
+        next;
+        ynMenu;
+        return;
+    }
+
+    function readRules {
+        mes "";
+        mesn;
+        mesq l("Of course, they are on the left wall, go have a look at them.");
+        next;
+        mesq l("Do you have any other questions for me?");
+        next;
+        ynMenu;
+        return;
+    }
+
+    function mainMenu {
+        do
+        {
+            .@q2 = getq(ShipQuests_ChefGado);
+            .@q3 = getq(ShipQuests_Nard);
+            .@q4 = getq(General_Narrator);
+
+            selectd
+                rif(.@q3 == 5 && .@q4 < 1, l("What can I do now?")),
+                rif(.@q3 == 3 && .@q2 == 0, l("I heard rumors about some old hostilities between you and Gado. Are they true?")),
+                rif(.@q2 == 2 && countitem(PoisonedDish), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")),
+                rif(.@q2 == 2 && countitem(PoisonedDish), l("I have brought you a tasty present for your delicate mouth.")),
+                rif(getskilllv(NV_BASIC) < 6, l("Something is wrong with me, I can't smile nor sit.")),
+                lg("I made a mistake, I would like to change my language."),
+                l("Could you explain to me where I am?"),
+                l("What happened to me?"),
+                l("Can I read these rules again?"),
+                l("Nothing, sorry.");
+
+            switch (@menu)
+            {
+                case 1: gotoSleep; break;
+                case 2: heardRumors; break;
+                case 3: gotRegrets; break;
+                case 4: poisonJulia; break;
+                case 5: basicSkill; break;
+                case 6: chooseLang .@s$; break;
+                case 7: whereAmI; break;
+                case 8: whatHappened; break;
+                case 9: readRules; break;
+                case 10: closedialog; end;
+            }
+        } while (1);
+    }
+
+    mesn;
+    mesq lg("Hello dear!");
+    next;
+    mesq l("What do you want today?");
+    next;
+
+    mainMenu;
+
+OnTouch:
+    .@q = getq(ShipQuests_Julia);
+    if (.@q > 1) end;
+
+    checkclientversion;
+
+    mesn;
+    mesq l("Hi, nice to see you!");
+    next;
+    mesq l("My name is Julia, it is me who took care of you after we found you in the sea.");
+    next;
+    mesq lg("I'm glad to see you're okay.");
+    next;
+    mesq lg("Could I ask you what your native language is? A sailor told me you're Russian, but another one told me you're French... I'm a bit lost. I will register you on the ship passenger list just after that.");
+    next;
+    chooseLang;
+    mainMenu;
+    end;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 10;
+    .quest_debug = ShipQuests_Julia;
+}
diff --git a/npc/002-3/mapflags.txt b/npc/002-3/mapflags.txt
new file mode 100644
index 000000000..02156ece0
--- /dev/null
+++ b/npc/002-3/mapflags.txt
@@ -0,0 +1 @@
+002-3	mapflag	town
diff --git a/npc/002-3/note.txt b/npc/002-3/note.txt
new file mode 100644
index 000000000..0509e9f02
--- /dev/null
+++ b/npc/002-3/note.txt
@@ -0,0 +1,27 @@
+// Evol scripts.
+// Authors:
+//    gumi
+//    Qwerty Dragon
+//    Reid
+//    WildX
+// Description:
+//    A small note presenting the 6 main rules of Evol Online.
+
+002-3,29,25,0	script	Note	NPC_PAPER_NOTE,{
+    narrator S_LAST_NEXT,
+            l("There is a paper with some rules written on it.");
+
+    GameRules 8 | 4;
+
+    narrator S_NO_NPC_NAME,
+        l("Following these lines are some other writings on this paper."),
+        l("Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Julia"),
+        l("Does anyone know a good place to hang out in Esperia? - M. Arpan"),
+        l("Other things are written but are not legible anymore.");
+
+    close;
+
+OnInit:
+    .distance = 2;
+    end;
+}
diff --git a/npc/002-4/_import.txt b/npc/002-4/_import.txt
new file mode 100644
index 000000000..ad86a9440
--- /dev/null
+++ b/npc/002-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 002-4: Nard's Room
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/002-4/_warps.txt",
diff --git a/npc/002-4/_warps.txt b/npc/002-4/_warps.txt
new file mode 100644
index 000000000..3bcf15199
--- /dev/null
+++ b/npc/002-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 002-4: Nard's Room warps
+002-4,19,27,0	warp	#002-4_19_27	0,0,002-3,32,28
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 25ef20d9e..d651cb42d 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -26,3 +26,4 @@
 "npc/003-1/tamiloc.txt",
 "npc/003-1/tinris.txt",
 "npc/003-1/well.txt",
+"npc/003-1/wateranimation.txt",
\ No newline at end of file
diff --git a/npc/003-1/wateranimation.txt b/npc/003-1/wateranimation.txt
new file mode 100644
index 000000000..48a4b3cfa
--- /dev/null
+++ b/npc/003-1/wateranimation.txt
@@ -0,0 +1,19 @@
+// Evol scripts.
+// Author:
+//    gumi
+//    Reid
+// Description:
+//    Water animations, splash, fishes, etc...
+
+003-1,104,100,0	script	#water_animation0	NPC_WATER_SPLASH,{
+
+    fishing; // begin or continue fishing
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 5;
+    end;
+}
+
+003-1,108,102,0	duplicate(#water_animation0)	#water_animation16	NPC_WATER_SPLASH
\ No newline at end of file
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 2df3502fb..505976e41 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -3,5 +3,6 @@
 "npc/005-1/_mobs.txt",
 "npc/005-1/_warps.txt",
 "npc/005-1/ayasha.txt",
+"npc/005-1/maya.txt",
 "npc/005-1/movetest.txt",
 "npc/005-1/warpcandorbattle.txt",
diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt
index 558d5242b..37724759a 100644
--- a/npc/005-1/_warps.txt
+++ b/npc/005-1/_warps.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 005-1: Candor Island warps
-005-1,43,107,0	warp	#005-1_43_107	0,0,000-2-0,21,28
+005-1,43,107,0	warp	#005-1_43_107	0,0,002-2,21,28
 005-1,31,80,0	warp	#005-1_31_80	0,0,005-2,33,42
 005-1,34,74,0	warp	#005-1_34_74	0,0,005-3,25,42
 005-1,48,70,0	warp	#005-1_48_70	0,0,005-4,25,42
diff --git a/npc/005-1/maya.txt b/npc/005-1/maya.txt
new file mode 100644
index 000000000..1b51c4a20
--- /dev/null
+++ b/npc/005-1/maya.txt
@@ -0,0 +1,224 @@
+// TMW2 scripts.
+// Author:
+//    Saulc
+// Variables:
+//    CandorQuests_Maya
+// Values:
+//    0    Default.
+//    1    5 cotton cloth -> candor shirt
+//    2    if end meye quest -> 10k + pearl + (random item) --> pearl ring
+//    3    wolvern tooth +20k + 2000monster point ->claw pendant
+
+
+005-1,42,37,0	script	Maya	NPC_RAIJIN_FEMALE_LEGION_ARTIS,{
+
+    .Item1 = CottonCloth;
+    .Item2 = Pearl;
+    .Item3 = WolvernTooth;
+
+    function quest_close {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Maybe next time.");
+            goodbye;
+        close;        
+    }
+
+    function quest_giveitem {
+    .@maya = getq(CandorQuest_Maya);
+        if (.@maya == 2)
+        {
+            if (countitem("Iron Ingot") == 0)
+            {           
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("You don't have the item.");
+                    goodbye;
+                close;
+            }
+            delitem .Item3, 1;
+            Zeny = Zeny + 8000;
+            getexp 1500,0; 
+            setq CandorQuest_Tolchi, 3;
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Thanks mate that all i need ! Have a good day !");  
+        }
+        if (.@maya == 1)
+        {
+            if (countitem("Coal") <= 2)
+            {           
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("You don't have the item.");
+                    goodbye;
+                close;
+            }
+            delitem .Item2, 3;
+            Zeny = Zeny + 800;
+            getexp 100,0; 
+            setq CandorQuest_Maya, 2;
+        }
+        if (.@maya == 0)
+        {
+            if (countitem("Iron Ore") == 0)
+            {           
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("You don't have the item.");
+                    goodbye;                 
+                close;
+            }
+            delitem .Item1, 1;
+            Zeny = Zeny + 200;
+            getitem RustyKnife, 1;
+            getexp 50,0; 
+            setq CandorQuest_Maya, 1;
+        }
+        close;
+    }
+
+    function quest_first {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Can you bring me 2 @@", getitemlink(.Item1));
+        do
+        {
+            select
+                l("Yes."),
+                l("No.");
+
+            switch (@menu)
+            {
+                case 1:
+                    quest_giveitem;
+                    break;
+                case 2:
+                    quest_close;
+                    break;
+            }   
+        } while (@menu != 2);       
+    }
+
+    function quest_second {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Can you bring me 3 @@", getitemlink(.Item2));
+        do
+        {
+            select
+                l("Yes."),
+                l("No.");
+
+            switch (@menu)
+            {
+                case 1:
+                    quest_giveitem;
+                    break;
+                case 2:
+                    quest_close;
+                    break;
+            }   
+        } while (@menu != 2);       
+    }
+
+    function quest_third {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Can you bring me 4 @@", getitemlink(.Item3));
+        do
+        {
+            select
+                l("Yes."),
+                l("No.");
+
+            switch (@menu)
+            {
+                case 1:
+                    quest_giveitem;
+                    break;
+                case 2:
+                    quest_close;
+                    break;
+            }   
+        } while (@menu != 2);       
+    }
+
+    .@maya = getq(CandorQuest_Maya;
+
+    if (BaseLevel <= 4 || BaseLevel <= 9 && .@maya == 1 || BaseLevel <= 14 && .@maya == 2)
+    {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        l("You aren't strong enought. Come Back Later.");
+        goodbye;
+        close;
+    }
+
+    if (.@maya == 3)
+    {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        l("Hey ! How are you today ? Thanks again for your help.");
+        goodbye;
+        close;
+    }
+
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        l("Hello can you help me?");
+
+    
+    do
+    {
+        select
+            rif(.@maya == 0, l("Yes.")),
+            rif(.@maya == 1, l("Yes.")),
+            rif(.@maya == 2, l("Yes.")),
+            l("No.");
+
+        switch (@menu)
+        {
+            case 1:
+                quest_first;
+                setq CandorQuest_Maya, 0;
+                break;
+            case 2:
+                quest_second;
+                break;
+            case 3:
+                quest_third;
+                break;
+            case 4:
+                quest_close;
+                goodbye;
+                break;        
+        }
+    } while (@menu != 4);
+
+    closedialog;
+    goodbye;
+    close;
+
+OnTimer1000:
+    domovestep;
+
+OnInit:
+    initpath "move", 44, 35,
+             "dir", UP, 0,
+             "wait", 30, 0,
+             "move", 43, 40,
+             "dir", UP, 0,
+             "wait", 30, 0,
+             "move", 40, 35,
+             "dir", UP, 0,
+             "wait", 30, 0,
+             "dir", LEFT, 0,
+             "wait", 30, 0,
+             "move", 42, 37,
+             "dir", DOWN, 0,
+             "dir", UP, 0,
+             "wait", 30, 0,
+             "Mmove", 45, 37,
+             "dir", DOWN, 0,
+             "wait", 30, 0,
+             "move", 33, 37,
+             "dir", LEFT, 0,
+             "wait", 30, 0,
+             "move", 33, 37,
+             "dir", RIGHT, 0,
+             "wait", 30, 0;
+
+    initialmove;
+    initnpctimer;
+    .distance = 5;
+}
diff --git a/npc/005-4/tolchi.txt b/npc/005-4/tolchi.txt
index 197b055b1..788ac9de4 100644
--- a/npc/005-4/tolchi.txt
+++ b/npc/005-4/tolchi.txt
@@ -2,7 +2,7 @@
 // Author:
 //    Saulc
 // Variables:
-//    CandorQuests_BlackSmith
+//    CandorQuests_Tolchi
 // Values:
 //    0    Default.
 //    1    BlackSmith quest ask for 1 iron oore
diff --git a/npc/_import.txt b/npc/_import.txt
index 4671e0836..95f72d17d 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -61,6 +61,8 @@
 @include "npc/001-3-1/_import.txt"
 @include "npc/002-1/_import.txt"
 @include "npc/002-2/_import.txt"
+@include "npc/002-3/_import.txt"
+@include "npc/002-4/_import.txt"
 @include "npc/003-1/_import.txt"
 @include "npc/003-2-0/_import.txt"
 @include "npc/003-2-1/_import.txt"