test hat location + add HAS quest + candor battle warp

6 files changed, 229 insertions, 27 deletions

diff --git a/npc/000-2-1/_savepoints.txt b/npc/000-2-1/_savepoints.txt
index 4d48830c8..14b79c7e4 100644
--- a/npc/000-2-1/_savepoints.txt
+++ b/npc/000-2-1/_savepoints.txt
@@ -18,6 +18,15 @@ OnInit:
     .sex = G_OTHER;
     end;
 }
+000-2-1,50,38,0	script	#save_000-2-1_50_38	NPC_SAVE_POINT,{
+    savepointparticle .map$, .x, .y, NO_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}
 000-2-1,55,40,0	script	#save_000-2-1_55_40	NPC_SAVE_POINT,{
     savepointparticle .map$, .x, .y, NO_INN;
     close;
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 6bd89a8f6..ba10b7386 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -2,36 +2,35 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-1/_mobs.txt",
 "npc/003-1/_warps.txt",
-"npc/003-1/tamiloc.txt",
-"npc/003-1/sarah.txt",
-"npc/003-1/guardphilip.txt",
-"npc/003-1/itka.txt",
-"npc/003-1/ninathetraveler.txt",
-"npc/003-1/guardmoustacha.txt",
-"npc/003-1/guardpopaul.txt",
+"npc/003-1/ched.txt",
+"npc/003-1/constableperry.txt",
+"npc/003-1/cyndala.txt",
+"npc/003-1/eomie.txt",
 "npc/003-1/gladys.txt",
-"npc/003-1/michel.txt",
-"npc/003-1/swezanne.txt",
-"npc/003-1/luca.txt",
-"npc/003-1/neko.txt",
-"npc/003-1/inar.txt",
-"npc/003-1/malivox.txt",
 "npc/003-1/guardavou.txt",
+"npc/003-1/guardbenji.txt",
 "npc/003-1/guarddefou.txt",
+"npc/003-1/guardfalko.txt",
+"npc/003-1/guardmoustacha.txt",
+"npc/003-1/guardphilip.txt",
+"npc/003-1/guardpopaul.txt",
+"npc/003-1/guardvalou.txt",
+"npc/003-1/guardyen.txt",
+"npc/003-1/inac.txt",
+"npc/003-1/inar.txt",
+"npc/003-1/itka.txt",
+"npc/003-1/jakod.txt",
 "npc/003-1/jerican.txt",
+"npc/003-1/luca.txt",
+"npc/003-1/mahoud.txt",
+"npc/003-1/malivox.txt",
 "npc/003-1/mariusthebard.txt",
+"npc/003-1/michel.txt",
+"npc/003-1/neko.txt",
+"npc/003-1/ninathetraveler.txt",
+"npc/003-1/sarah.txt",
 "npc/003-1/silvia.txt",
-"npc/003-1/guardbenji.txt",
-"npc/003-1/guardvalou.txt",
+"npc/003-1/swezanne.txt",
+"npc/003-1/tamiloc.txt",
+"npc/003-1/tinris.txt",
 "npc/003-1/well.txt",
-"npc/003-1/mahoud.txt",
-"npc/003-1/inac.txt",
-"npc/003-1/constableperry.txt",
-"npc/003-1/guadyen.txt",
-"npc/003-1/cyndala.txt",
-"npc/003-1/jakod.txt",
-"npc/003-1/ched.txt",
-"npc/003-1/guardyen.txt",
-"npc/003-1/guardfalko.txt",
-"npc/003-1/eomie.txt",
-"npc/003-1/tinris.txt",
\ No newline at end of file
diff --git a/npc/003-1/well.txt b/npc/003-1/well.txt
index 986d21c77..695dae536 100644
--- a/npc/003-1/well.txt
+++ b/npc/003-1/well.txt
@@ -3,9 +3,53 @@
 
 003-1,45,80,0	script	Well	NPC_NO_SPRITE,{
 
+    .Item1 = IronOre; //7
+    .GP = 8500;
+    .ItemCreate = IronIngot;
+
+    function quest_create {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("How many ingots do you want to make?");
+        input .amount;
+
+        if (countitem("Iron Ore") >= .amount * 7 && Zeny >= 8500 * .amount)
+        {
+            delitem .Item1, .amount * 7;
+            Zeny = Zeny - .amount * .GP;
+            getitem .ItemCreate, .amount;
+            close;
+        }
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("You don't have enought quantity.");
+        close;
+        
+    }
+
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        l("Hello do you want to craft @@, for that i will need 7 @@,and @@ gp.", getitemlink(.ItemCreate),getitemlink(.Item1),.GP);
+
+    do
+    {
+        .@karim = getq(Karim_Quest);
+        select
+            l("Yes"),
+            menuaction(l("Quit"));
+
+        switch (@menu)
+        {
+            case 1:
+                quest_create;
+                break;
+        }
+    } while (@menu != 2);
+
+    closedialog;
+    goodbye;
+    close;
 
 OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}
+
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 1159841a8..4a1411f8e 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -2,3 +2,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/005-1/_mobs.txt",
 "npc/005-1/_warps.txt",
+"npc/005-1/ayasha.txt",
+"npc/005-1/warpcandorbattle.txt",
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
new file mode 100644
index 000000000..adc39cf3e
--- /dev/null
+++ b/npc/005-1/ayasha.txt
@@ -0,0 +1,137 @@
+// Author:

+//    Crazyfefe

+

+

+

+

+005-1,52,81,0	script	Ayasha	NPC_PLAYER,{

+

+    

+    function quest_findAllKids

+    {

+        setq CandorQuest_HAS, 1;

+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

+            l("Good luck !");

+        close;

+    }

+

+    .@has = getq(CandorQuest_HAS);

+    if (.@has == 0)

+    {

+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

+            l("Hello can you help me for find all kids");

+        do

+        {

+            select

+                l("Yes"),

+                menuaction(l("Quit"));

+

+            switch (@menu)

+            {

+                case 1:

+                    quest_findAllKids;

+                    break;

+            }

+        } while (@menu != 2);

+    }

+    else if (.@has == 1)

+    {

+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

+            l("You don't find all of them yet.");

+        close;

+    }

+    else if (.@has == 2)

+    {

+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

+            l("Thank you, there is your reward");

+            narrator("You receive 30 exp.");

+        getexp 30, 0;

+        setq CandorQuest_HAS, 3;

+        close;

+    }

+    else

+    {

+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

+            l("Thank you for your help.");

+        close;

+    }

+

+    closedialog;

+    goodbye;

+    close;

+

+OnInit:

+    .sex = G_MALE;

+    .distance = 3;

+    end;

+}

+

+

+function	script	CheckEnfant	{

+    .questCheck = .questCheck + 1;

+            l("Oh Welcome then.");

+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

+            l("Oh! You found me well played !.");

+            narrator("You receive 5 exp.");

+    if (.questCheck == 5)

+    {

+        setq CandorQuest_HAS, 2;

+    }

+    getexp 5,0;

+    close;

+}

+005-1,69,90,0	script	Charda	451,{

+    if (getq(CandorQuest_HAS) == 1)

+    {

+        CheckEnfant();

+    }

+    end;

+OnInit:

+    .sex = G_OTHER;

+    .distance = 1;

+    end;

+}

+005-1,23,84,0	script	Faris	451,{

+    if (getq(CandorQuest_HAS) == 1)

+    {

+        CheckEnfant();

+    }

+    end;

+OnInit:

+    .sex = G_OTHER;

+    .distance = 1;

+    end;

+}

+005-1,84,21,0	script	Ghada	445,{

+    if (getq(CandorQuest_HAS) == 1)

+    {

+        CheckEnfant();

+    }

+    end;

+OnInit:

+    .sex = G_OTHER;

+    .distance = 1;

+    end;

+}

+005-1,38,58,0	script	Latif	445,{

+    if (getq(CandorQuest_HAS) == 1)

+    {

+        CheckEnfant();

+    }

+    end;

+OnInit:

+    .sex = G_OTHER;

+    .distance = 1;

+    end;

+}

+005-1,18,43,0	script	Rasin	445,{

+    if (getq(CandorQuest_HAS) == 1)

+    {

+        CheckEnfant();

+    }

+    end;

+OnInit:

+    .sex = G_OTHER;

+    .distance = 1;

+    end;

+}

diff --git a/npc/005-1/warpcandorbattle.txt b/npc/005-1/warpcandorbattle.txt
new file mode 100644
index 000000000..6fb86ffe5
--- /dev/null
+++ b/npc/005-1/warpcandorbattle.txt
@@ -0,0 +1,11 @@
+// Author:
+//    Crazyfefe
+
+005-1,59,52,0	script	Magic Barrier	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    if(BaseLevel >= 40)
+        warp "005-1", 59, 66;
+    else
+    npctalk l("You don't have the level require for pass this door,");
+}
\ No newline at end of file