Update wlk maps,

Add 000-0-0 map to resnametable.txt,
Change area script to sailors script (name change),
Correction on  alige script,
Correction on Poisoned Water function,
Added function importation on scripts.conf .

10 files changed, 13 insertions, 14 deletions

diff --git a/data/000-0.wlk b/data/000-0.wlk
index 01b2ff31..9c83ed45 100644
--- a/data/000-0.wlk
+++ b/data/000-0.wlk
diff --git a/data/000-1.wlk b/data/000-1.wlk
index 4e3c9492..463d7a9e 100644
--- a/data/000-1.wlk
+++ b/data/000-1.wlk
diff --git a/data/resnametable.txt b/data/resnametable.txt
index d299efc1..2568de79 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -1,5 +1,5 @@
 000-0.gat#000-0.wlk#
-000-0.gat#000-0-0.wlk#
+000-0-0.gat#000-0-0.wlk#
 000-1.gat#000-1.wlk#
 000-2-0.gat#000-2-0.wlk#
 000-2-1.gat#000-2-1.wlk#
diff --git a/db/item_db.txt b/db/item_db.txt
index dc0450c1..9bc94214 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -7,7 +7,7 @@
 505,	Piouslegs,		Pious legs,		0,	0,	50,	35,	8,	,	,	,	,	,	2,	,	,	0,	,	0,		{ itemheal 40, 0; },			{},					,
 506,	Lettuce,		Lettuce,		0,	0,	25,	12,	5,	,	,	,	,	,	2,	,	,	0,	,	0,		{ itemheal 15, 0; },			{},					,
 507,	Piberries,		Piberries,		0,	0,	40,	20,	3,	,	,	,	,	,	2,	,	,	0,	,	0,		{ itemheal 20, 0; },			{},					,
-508,	Seadrop,		Sea drop,		0,	0,	5,	1,	2,	,	,	,	,	,	2,	,	,	0,	,	0,		{ callfunc "usePoisonedWater"; },	{},					,
+508,	Seadrop,		Sea drop,		0,	0,	5,	1,	2,	,	,	,	,	,	2,	,	,	0,	,	0,		{callfunc "usePoisonedWater";},		{},					,
 700,	Three-leafclover,	Three-leaf clover,	0,	3,	10,	3,	5,	,	,	,	,	,	,	,	,	,	,	0,		{},					{},					,
 701,	Piousfeathers,		Pious feathers,		0,	3,	60,	35,	1,	,	,	,	,	,	,	,	,	,	,	0,		{},					{},					,
 702,	Tortugasshellfragment,	Tortugas shell fragment,0,	3,	40,	15,	15,	,	,	,	,	,	,	,	,	,	,	0,		{},					{},					,
@@ -25,5 +25,5 @@
 2000,	Bracelets		Bracelets,		0,	5,	2000,	500,	30,	,	2,	,	,	0,	2,	4,	,	0,	,	0,		{},					{},					,
 2200,	Usedshort,		Used short,		0,	5,	80,	20,	35,	,	2,	,	,	0,	2,	1,	,	0,	,	0,		{},					{},					,
 2900,	Bandana,		Bandana,		0,	5,	500,	100,	13,	,	1,	,	,	0,	2,	256,	,	0,	,	0,		{},					{},					,
-3500,	Knife,			Knife,			0,	4,	50,	25,	50,	10,	,	1,	,	0,	2,	2,	1,	1,	1,	0,		{},					{},					,
+3500,	Knife,			Knife,			0,	4,	50,	25,	50,	10,	,	,	,	0,	2,	2,	1,	1,	1,	0,		{},					{},					,
 #	<------ 23chars ------>	<------ 23chars ------>	
\ No newline at end of file
diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt
index 14d47ea4..79a1d1ec 100644
--- a/npc/000-0/_import.txt
+++ b/npc/000-0/_import.txt
@@ -1,4 +1,4 @@
 map: 000-0.gat
 npc: npc/000-0/_mobs.txt
 npc: npc/000-0/_warps.txt
-npc: npc/000-0/area.txt
\ No newline at end of file
+npc: npc/000-0/sailors.txt
\ No newline at end of file
diff --git a/npc/000-0/area.txt b/npc/000-0/sailors.txt
index 0af6d5ad..0af6d5ad 100644
--- a/npc/000-0/area.txt
+++ b/npc/000-0/sailors.txt
diff --git a/npc/000-2-1/_warps.txt b/npc/000-2-1/_warps.txt
index 4514344f..2eae0742 100644
--- a/npc/000-2-1/_warps.txt
+++ b/npc/000-2-1/_warps.txt
@@ -1,5 +1,4 @@
 // 000-2-1 warps
 
-000-2-1.gat,61,34	warp	ToLevel2	-1,-1,000-2-2.gat,27,31
-000-2-1.gat,61,30	warp	ToLevel0	-1,-1,000-2-0.gat,30,26
+000-2-1.gat,61,34	warp	ToLevel2	-1,-1,000-2-2.gat,31,27
 000-2-1.gat,61,30	warp	ToLevel0	-1,-1,000-2-0.gat,30,26
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 5cc9ae7c..f1301232 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -12,7 +12,7 @@
 //    0     first talking (before food)
 //    1     already talked
 
-000-2-1.gat,33,31,0	script	Alige	301,1,1{
+000-2-1.gat,33,31,0,1	script	Alige	301,1,1{
 
   if (geta2(ShipQuests, ShipQuests_Alige) == 1) goto l_AskForFood;
 
@@ -29,7 +29,7 @@
   l_NeedHelp:
 
     mesn l("Hidden person");
-    mesq l("Good, good!") + " " + l("Could you help me please?") + " " + l("I beg you, please, pleeeease...");
+    mesq l("Good, good! ") + " " + l("Could you help me please? ") + " " + l("I beg you, please, pleeeease... ");
     
     menu
         l("Why not... but, who are you?") + l("And what kind of help do you need?"), l_CanHelp;
@@ -117,7 +117,7 @@
     set @menulist$[@j], l("I don't have anything good for you today.");
     set @menureference[@j], -1;
 
-    menu @menulist$[0],-,@menulist$[1],-,....@menulist$[150],-;
+    menu @menulist$[0],-,@menulist$[1],-,@menulist$[150],-;
 
     set @id, @menureference[@menu-1];
     if (@id == -1) goto l_DamnYou;
diff --git a/npc/items/PoisonedWater.txt b/npc/items/PoisonedWater.txt
index 40e93093..93034ef8 100644
--- a/npc/items/PoisonedWater.txt
+++ b/npc/items/PoisonedWater.txt
@@ -4,7 +4,7 @@
 // Description:	
 //    Heal of 25hp and add 1/4 bad luck to be poisoned.
 
-function|script|usePoisonedWater|{
+function	script	usePoisonedWater	{
 	set @temp, rand(4);
 	if (!@temp) sc_start sc_poison, 1, 50;
 	if (!@temp) message strcharinfo(0), "Debug: Poisoned";
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 2bfd0bdd..e5db521f 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -1,7 +1,7 @@
 // This is the main script import file
 
-// NPC Functions
-// npc: npc/functions/.txt
-
-// maps
+// Maps
 import: npc/_import.txt
+
+// Item Functions
+npc: npc/items/PoisonedWater.txt
\ No newline at end of file