add npc in 003-2

11 files changed, 324 insertions, 28 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index f32d2f0bb..260b0b179 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -65,6 +65,7 @@ map_list: (
     "003-2-0",
     "003-2-1",
     "003-2-2",
+    "003-2",
     "005-1",
     "005-2",
     "005-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 6f20914da..61129b6b9 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -62,27 +62,28 @@
 003-2-0 62
 003-2-1 63
 003-2-2 64
-005-1 65
-005-2 66
-005-3 67
-005-4 68
-005-5 69
-005-6 70
-008-1 71
-008-2-0 72
-008-2-1 73
-008-2-10 74
-008-2-11 75
-008-2-12 76
-008-2-13 77
-008-2-14 78
-008-2-2 79
-008-2-3 80
-008-2-4 81
-008-2-5 82
-008-2-6 83
-008-2-7 84
-008-2-8 85
-008-2-9 86
-test 87
-testbg 88
+003-2 65
+005-1 66
+005-2 67
+005-3 68
+005-4 69
+005-5 70
+005-6 71
+008-1 72
+008-2-0 73
+008-2-1 74
+008-2-10 75
+008-2-11 76
+008-2-12 77
+008-2-13 78
+008-2-14 79
+008-2-2 80
+008-2-3 81
+008-2-4 82
+008-2-5 83
+008-2-6 84
+008-2-7 85
+008-2-8 86
+008-2-9 87
+test 88
+testbg 89
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 340a7b35b..333fa0ee5 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt
index a652a7c5e..2f19b1b9a 100644
--- a/npc/001-2-9/janus.txt
+++ b/npc/001-2-9/janus.txt
@@ -14,7 +14,7 @@
 001-2-9,30,28,0	script	Janus	NPC_JANUS,{
 
     function create_party {
-        .@party_price = 1000;
+        .@party_price = 10000;
 
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Creating a party has some advantages, it's a pretty good choice!"),
diff --git a/npc/003-2/_import.txt b/npc/003-2/_import.txt
new file mode 100644
index 000000000..3cac95565
--- /dev/null
+++ b/npc/003-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 003-2: Tulimshar Guild House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-2/estard.txt",
diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt
new file mode 100644
index 000000000..43ae3602d
--- /dev/null
+++ b/npc/003-2/estard.txt
@@ -0,0 +1,125 @@
+// Evol scripts.
+// Author:
+//    Reid
+// Description:
+//    Light Armor shop keeper.
+// Variables:
+//    ArtisQuests_Enora
+// Values:
+//    0    Default.
+//    1    BlackSmith quest delivered.
+//    2    Chelios Quest given.
+//    3    Chelios Quest done.
+//    4    BlackSmith gave the sword.
+//    5    Light Armor Shop quest delivered.
+//    6    Light Armor Shop gave the cloths.
+
+003-2,24,26,0	script	Estard	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
+
+    function create_party {
+        .@party_price = 10000;
+
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Creating a party has some advantages, it's a pretty good choice!"),
+            l("I remember when I created my first party, we were amazed to share some experience with a small group of adventurer..."),
+            l("Oh! And our party chat was really entertaining, I do highly recommend you to share this fun as well."),
+            lg("The cost to create a party is @@ E, are you interested?",
+               "The cost to create a party is @@ E, are you interested?", .@party_price);
+
+        if (askyesno() == 1)
+        {
+            if (Zeny < .@party_price)
+            {
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring @@ E.", .@party_price);
+            }
+            else
+            {
+                Zeny = Zeny - .@party_price;
+                setq General_Janus, 2;
+                skill NV_BASIC, 7, 0;
+
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Awesome, come back if you ever want to create a larger group!");
+            }
+        }
+    }
+
+   
+    function explain_service {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("You are on the human resource wing of the Town Hall."),
+            l("We offer party and guild certifications and we can also teach you how to use some basic communication skills."),
+            l("Do you know how to speak with people around you?");
+
+        if (askyesno() == 2)
+        {
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("You lack some very basic skills...");
+
+            if (compareandsetq(General_Janus, 0, 1))
+            {
+                speech S_LAST_NEXT | S_NO_NPC_NAME,
+                    l("This book contains everything you should know about it, take it!");
+
+                inventoryplace CommunicationTheory, 1;
+                getitem CommunicationTheory, 1;
+            }
+            else
+            {
+                speech S_LAST_NEXT | S_NO_NPC_NAME,
+                    l("You can read the book that I gave you earlier at the library if you lost it.");
+            }
+        }
+        else
+        {
+            if (compareandsetq(General_Janus, 0, 1))
+            {
+                speech S_LAST_NEXT | S_NO_NPC_NAME,
+                    l("Anyway."),
+                    l("This book contains everything you should know about it, take it!");
+
+                inventoryplace CommunicationTheory, 1;
+                getitem CommunicationTheory, 1;
+            }
+
+        }
+
+        return;
+    }
+
+
+    speech S_LAST_NEXT,
+        lg("Welcome miss.", "Good day sir.");
+
+    do
+    {
+        // Beta users by-pass check.
+        if (getskilllv(NV_BASIC) > 6 && getq(General_Janus) == 1)
+        {
+            setq General_Janus, 2;
+        }
+
+        select
+            rif(getq(General_Janus) == 1, l("I would like to create a party.")),
+            l("What service do you offer?"),
+            menuaction(l("Quit"));
+
+        switch (@menu)
+        {
+            case 1:
+                create_party;
+                break;
+            case 2:
+                explain_service;
+                break;
+        }
+    } while (@menu != 3);
+
+    closedialog;
+    goodbye;
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 3;
+    end;
+}
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 08601d0bf..1159841a8 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 005-1: Drasil Island
+// Map 005-1: Candor Island
 // 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",
diff --git a/npc/005-1/_mobs.txt b/npc/005-1/_mobs.txt
index 8c30dfb07..22191540a 100644
--- a/npc/005-1/_mobs.txt
+++ b/npc/005-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 005-1: Drasil Island mobs
+// Map 005-1: Candor Island mobs
 005-1,36,40,2,1	monster	CloverPatch	1028,1,35000,300000
 005-1,23,56,1,0	monster	IronFragments	1058,1,35000,300000
 005-1,63,84,7,6	monster	Maggot	1030,8,35000,300000
diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt
index 30a459eba..558d5242b 100644
--- a/npc/005-1/_warps.txt
+++ b/npc/005-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 005-1: Drasil Island warps
+// 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,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
diff --git a/npc/005-5/nylo.txt b/npc/005-5/nylo.txt
index 503824916..c60c0239a 100644
--- a/npc/005-5/nylo.txt
+++ b/npc/005-5/nylo.txt
@@ -3,6 +3,171 @@
 
 005-5,27,38,0	script	Nylo	NPC_PLAYER,{
 
+	function nylo_close {
+        close;
+    }
+
+    function nylo_thanks {
+    	speech S_LAST_BLANK_LINE,
+        l("[Nyle]"),
+        l("You are very welcome.");
+        close;
+    }
+
+    function nylo_items2 {
+    	speech S_LAST_BLANK_LINE,
+        	l("[Nyle]"),
+        	l("Let Cynric open your storage. You might also want to open your inventory."),
+        	l("Pick an item from either storage or inventory and choose what you want to do with it by clicking the right button."),
+        	l("You can also pick and drag items from one window into the other but this will move all items of this kind.");
+        next;
+        speech S_LAST_BLANK_LINE,
+        	l("Items in your storage are totally safe. Banking itself is totally safe.");
+        do
+    	{
+    		select
+    		   	l("Thanks!");
+
+        	switch (@menu)
+        	{
+            	case 1:
+                	nylo_thanks;
+                	break;
+        	}
+    	} while (@menu != 1);
+    }
+
+    function nylo_money2 {
+    	speech S_LAST_BLANK_LINE,
+        	l("[Nyle]"),
+        	l("That's easy. Cynric will save your money when you ask him to deposit. Or you pick up your money by asking to withdraw."),
+        	l("You only have to tell him how much you want to deposit or withdraw."),
+        	l("Also you can ask how much he already save for you by checking your balance.");
+        next;
+        speech S_LAST_BLANK_LINE,
+        	l("Money in your storage is totally safe. Banking itself is totally safe.");
+
+        do
+    	{
+    		select
+            	l("Thanks!");
+
+        	switch (@menu)
+        	{
+            	case 1:
+                	nylo_thanks;
+                	break;
+        	}
+    	} while (@menu != 1);
+    }
+
+    function nylo_items {
+    	speech S_LAST_BLANK_LINE,
+        	l("[Nyle]"),
+        	l("Let Cynric open your storage. You might also want to open your inventory."),
+        	l("Pick an item from either storage or inventory and choose what you want to do with it by clicking the right button."),
+        	l("You can also pick and drag items from one window into the other but this will move all items of this kind.");
+        next;
+        speech S_LAST_BLANK_LINE,
+        	l("Items in your storage are totally safe. Banking itself is totally safe.");
+        do
+    	{
+    		select
+            	l("And how do I save money?"),
+            	l("Thanks!");
+
+        	switch (@menu)
+        	{
+            	case 1:
+                	nylo_money2;
+                	break;
+            	case 2:
+                	nylo_thanks;
+                	break;
+        	}
+    	} while (@menu != 2);
+    }
+
+    function nylo_money {
+    	speech S_LAST_BLANK_LINE,
+        	l("[Nyle]"),
+        	l("That's easy. Cynric will save your money when you ask him to deposit. Or you pick up your money by asking to withdraw."),
+        	l("You only have to tell him how much you want to deposit or withdraw."),
+        	l("Also you can ask how much he already save for you by checking your balance.");
+        next;
+        speech S_LAST_BLANK_LINE,
+        	l("Money in your storage is totally safe. Banking itself is totally safe.");
+
+        do
+    	{
+    		select
+            	l("And how do I save items?"),
+            	l("Thanks!");
+
+        	switch (@menu)
+        	{
+            	case 1:
+                	nylo_items2;
+                	break;
+            	case 2:
+                	nylo_thanks;
+                	break;
+        	}
+    	} while (@menu != 2);
+    }
+
+	function nylo_eplain {
+		speech S_LAST_BLANK_LINE,
+        	l("[Nyle]"),
+        	l("There are banks all over the world. Usually every important village or city has one."),
+        	l("You can save both items and money at a bank.");
+
+        do
+    	{
+    		select
+            	l("How do I save items?"),
+            	l("How do I save money?"),
+            	l("Thanks!");
+
+        	switch (@menu)
+        	{
+            	case 1:
+                	nylo_items;
+                	break;
+            	case 2:
+                	nylo_money;
+                	break;
+                case 3:
+                	nylo_thanks;
+                	break;
+        	}
+    	} while (@menu != 3);
+	}
+
+	speech S_LAST_BLANK_LINE,
+        l("[Nyle]"),
+        l("Visiting the bank too right? We're only a small village but Cynric is the best bank guy I know.");
+
+    do
+    {
+    	select
+            l("Yeah, you're right."),
+            l("What is banking?");
+        switch (@menu)
+        {
+            case 1:
+                nylo_close;
+                break;
+            case 2:
+                nylo_eplain;
+                break;
+        }
+    } while (@menu != 2);
+
+    closedialog;
+    goodbye;
+    close;
+
 OnInit:
     .sex = G_MALE;
     .distance = 3;
diff --git a/npc/_import.txt b/npc/_import.txt
index fbebc881b..f784e93b3 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -64,6 +64,7 @@
 @include "npc/003-2-0/_import.txt"
 @include "npc/003-2-1/_import.txt"
 @include "npc/003-2-2/_import.txt"
+@include "npc/003-2/_import.txt"
 @include "npc/005-1/_import.txt"
 @include "npc/005-2/_import.txt"
 @include "npc/005-3/_import.txt"