convert server data for using with hercules.

20 files changed, 75 insertions, 39 deletions

diff --git a/npc/000-1/_import.txt b/npc/000-1/_import.txt
index 54e0c6a1b..6e6697eba 100644
--- a/npc/000-1/_import.txt
+++ b/npc/000-1/_import.txt
@@ -1,5 +1,4 @@
 // Map 000-1: Desert Island
-map: 000-1.gat
 npc: npc/000-1/_mobs.txt
 npc: npc/000-1/_warps.txt
 npc: npc/000-1/ale.txt
diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index 0ffeba31c..a8284797f 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -6,7 +6,9 @@
 //    Sailor part of the Gugli's quest.
 //    Aquada box.
 
-000-1.gat,55,23,0,1	script	Ale	105;2,{
+// Size = 2
+// Gender = 1
+000-1,55,23,0	script	Ale	105,{
     set @g, getq(ShipQuests_Gugli);
     if (@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index 1da7e0fa4..a05b404b7 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -7,7 +7,9 @@
 //    Sailor part of the Gugli's quest.
 //    Croconut box.
 
-000-1.gat,22,50,0,1	script	Astapolos	107;2,{
+// Size = 2
+// Gender = 1
+000-1,22,50,0	script	Astapolos	107,{
     set @g, getq(ShipQuests_Gugli);
     if (@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index dd1d3f88d..2edc5a26a 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -11,7 +11,8 @@
 //    0   Treasure Chest has not been opened yet.
 //    1   Treasure Chest has been opened.
 
-000-1.gat,83,70,0	script	#chest	316;2,{
+// Size = 2
+000-1,83,70,0	script	#chest	316,{
 
     set @q, getq(ShipQuests_TreasureChest);
     if (getnpcdir ("") == 4) goto L_Give;
@@ -28,7 +29,7 @@ L_Give:
 
     setq ShipQuests_TreasureChest, 1;
 
-    set zeny, zeny + 100;
+    set Zeny, Zeny + 100;
     getitem "OldBook", 1;
     npctalk3 l("You open the treasure chest.");
 
diff --git a/npc/000-1/cookiemaster.txt b/npc/000-1/cookiemaster.txt
index 242c9483c..6465ccddf 100644
--- a/npc/000-1/cookiemaster.txt
+++ b/npc/000-1/cookiemaster.txt
@@ -6,7 +6,9 @@
 // Description:
 //    Cookie NPC, beware, if you don't take your cookie, she'll keep it!
 
-000-1.gat,97,50,0,0	script	Cookie Master	319;2,{
+// Size = 2
+// Gender = 0
+000-1,97,50,0	script	Cookie Master	319,{
     if (getq(GeneraL_Cookies) == 1)
         goto L_GetCookie;
 
diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt
index 528279fab..1fad7c631 100644
--- a/npc/000-1/couwan.txt
+++ b/npc/000-1/couwan.txt
@@ -12,7 +12,9 @@
 //    1   Spoke, and received the quest scam.
 //    2   Done quest scam.
 
-000-1.gat,89,36,0,1	script	Couwan	111;2,{
+// Size = 2
+// Gender = 1
+000-1,89,36,0	script	Couwan	111,{
     set @q, getq(ShipQuests_Couwan);
     if (@q == 1) goto L_QuestGiven;
     if (@q > 1) goto L_QuestDone;
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index 04eff9d8a..ca8691e67 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -11,7 +11,9 @@
 //    1   Treasure Chest has been opened.
 
 
-000-1.gat,89,95,0,1	script	Darlin	103;14,{
+// Size = 14
+// Gender = 1
+000-1,89,95,0	script	Darlin	103,{
     set @q, getq(ShipQuests_TreasureChest);
 
     mesn;
diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt
index fdebe5605..825d6bc37 100644
--- a/npc/000-1/fexil.txt
+++ b/npc/000-1/fexil.txt
@@ -4,7 +4,9 @@
 // Description:
 //    Newbie merchant.
 
-000-1.gat,83,98,0,1	script	Fexil	108;2,{
+// Size = 2
+// Gender = 1
+000-1,83,98,0	script	Fexil	108,{
     mesn;
     mesq lg("Greetings traveler.");
     next;
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index 20b8c3586..fc2bda2b5 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -22,7 +22,9 @@
 //    21   Gugli gives you the task.
 //    22   Gave all of the box to Gugli.
 
-000-1.gat,85,108,0,1	script	Gugli	313;2,{
+// Size = 2
+// Gender = 1
+000-1,85,108,0	script	Gugli	313,{
 
 OnTalk:
     mesn;
@@ -82,7 +84,7 @@ L_TaskGiven:
 L_Menu:
     menu
         rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), L_Couwan,
-        rif(countitem("AquadaBox") > 0 || countitem("CroconutBox") > 0 || countitem("PlushroomBox") > 0, l("I have some food for you.")), L_CollectSmthing,
+        rif(countitemcolor("AquadaBox") > 0 || countitemcolor("CroconutBox") > 0 || countitemcolor("PlushroomBox") > 0, l("I have some food for you.")), L_CollectSmthing,
         rif(getq(ShipQuests_Gugli) < 2, l("Who should I search for?")), L_SailorNames,
         rif(getq(ShipQuests_Gugli) < 2, l("Where can I find your crew?")), L_Location,
         l("Bye!"), L_Quit;
@@ -109,12 +111,12 @@ L_CollectSmthing:
     mesq l("Good job!");
     next;
 
-    if (countitem("AquadaBox") == 2) delitem "AquadaBox", 2;
-    if (countitem("CroconutBox") == 2) delitem "CroconutBox", 2;
-    if (countitem("PlushroomBox") == 2) delitem "PlushroomBox", 2;
-    if (countitem("AquadaBox") == 1) delitem "AquadaBox", 1;
-    if (countitem("CroconutBox") == 1) delitem "CroconutBox", 1;
-    if (countitem("PlushroomBox") == 1) delitem "PlushroomBox", 1;
+    if (countitemcolor("AquadaBox") == 2) delitem "AquadaBox", 2;
+    if (countitemcolor("CroconutBox") == 2) delitem "CroconutBox", 2;
+    if (countitemcolor("PlushroomBox") == 2) delitem "PlushroomBox", 2;
+    if (countitemcolor("AquadaBox") == 1) delitem "AquadaBox", 1;
+    if (countitemcolor("CroconutBox") == 1) delitem "CroconutBox", 1;
+    if (countitemcolor("PlushroomBox") == 1) delitem "PlushroomBox", 1;
 
     mesq l("You still need to give me boxes from: ");
     if (getq(ShipQuests_Astapolos) == 0) mesq l("- Astapolos");
@@ -139,9 +141,9 @@ L_Couwan:
     next;
     mesq l("May this be a lesson for you.");
 
-    if (countitem("FishBox") > 0) delitem "FishBox", 1;
+    if (countitemcolor("FishBox") > 0) delitem "FishBox", 1;
     setq ShipQuests_Couwan, 2;
-    set zeny, zeny+10;
+    set Zeny, Zeny+10;
     getexp 40, 0;
     message strcharinfo(0), l("You receive @@ E!", 10);
 
@@ -185,15 +187,15 @@ L_Lean:
     close;
 
 L_TaskDone:
-    if (countitem("AquadaBox") == 2) delitem "AquadaBox", 2;
-    if (countitem("CroconutBox") == 2) delitem "CroconutBox", 2;
-    if (countitem("PlushroomBox") == 2) delitem "PlushroomBox", 2;
-    if (countitem("AquadaBox") == 1) delitem "AquadaBox", 1;
-    if (countitem("CroconutBox") == 1) delitem "CroconutBox", 1;
-    if (countitem("PlushroomBox") == 1) delitem "PlushroomBox", 1;
+    if (countitemcolor("AquadaBox") == 2) delitem "AquadaBox", 2;
+    if (countitemcolor("CroconutBox") == 2) delitem "CroconutBox", 2;
+    if (countitemcolor("PlushroomBox") == 2) delitem "PlushroomBox", 2;
+    if (countitemcolor("AquadaBox") == 1) delitem "AquadaBox", 1;
+    if (countitemcolor("CroconutBox") == 1) delitem "CroconutBox", 1;
+    if (countitemcolor("PlushroomBox") == 1) delitem "PlushroomBox", 1;
     setq ShipQuests_Gugli, 2;
 
-    set zeny, zeny+250;
+    set Zeny, Zeny+250;
     getexp 50, 0;
 
     mes "";
@@ -229,7 +231,8 @@ L_Quit:
 
 }
 
-000-1.gat,83,107,0,1	script	GugliBarrierCheck	0,2,0,{
+// Gender = 1
+000-1,83,107,0	script	GugliBarrierCheck	32767,2,0,{
     set @gugli, getq(ShipQuests_Gugli);
     if (@gugli > 0) close;
     doevent "Gugli::OnTalk";
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index 4bc85b522..c7c2d8c60 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -7,7 +7,9 @@
 //    Sailor part of the Gugli's quest.
 //    Croconut box.
 
-000-1.gat,54,90,0,1	script	Gulukan	113;2,{
+// Size = 2
+// Gender = 1
+000-1,54,90,0	script	Gulukan	113,{
     set @g, getq(ShipQuests_Gugli);
     if (@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index 60a6340ea..31145c984 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -7,7 +7,9 @@
 //    Sailor part of the Gugli quest.
 //    Plushroom box.
 
-000-1.gat,46,35,0,1	script	Jalad	112;2,{
+// Size = 2
+// Gender = 1
+000-1,46,35,0	script	Jalad	112,{
     set @g, getq(ShipQuests_Gugli);
     if (@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index b1510b09e..deeb73738 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -6,7 +6,9 @@
 // Description:
 //    Sailor who gives some informations to the player.
 
-000-1.gat,79,108,0,1	script	Lean	106;2,{
+// Size = 2
+// Gender = 1
+000-1,79,108,0	script	Lean	106,{
     set @gugli, getq(ShipQuests_Gugli);
 
     mesn;
diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt
index 9037776d5..3659e82d7 100644
--- a/npc/000-1/max.txt
+++ b/npc/000-1/max.txt
@@ -6,7 +6,9 @@
 // Description:
 //    Friend of Sapartan, he gives some information on how to find Gulukan, Astapolos and Q-Muller.
 
-000-1.gat,72,110,0,1	script	Max	115;2,{
+// Size = 2
+// Gender = 1
+000-1,72,110,0	script	Max	115,{
     set @gugli, getq(ShipQuests_Gugli);
     set @knife, getq(ShipQuests_Knife);
 
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 09cbac776..55c3199bc 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -6,7 +6,9 @@
 //    Sailor part of the Gugli's quest.
 //    Plushroom box.
 
-000-1.gat,35,69,0,1	script	Q'Muller	104;2,{
+// Size = 2
+// Gender = 1
+000-1,35,69,0	script	Q'Muller	104,{
     set @g, getq(ShipQuests_Gugli);
     if (@g == 0) goto L_NoTask;
 
diff --git a/npc/000-1/panels.txt b/npc/000-1/panels.txt
index 4ea7488ac..151e39d09 100644
--- a/npc/000-1/panels.txt
+++ b/npc/000-1/panels.txt
@@ -5,7 +5,8 @@
 // Description:
 //    Panels to give advice to the players.
 
-000-1.gat,65,93,0	script	#panel	999;2,{
+// Size = 2
+000-1,65,93,0	script	#panel	999,{
 
     mesn "Narrator";
     mes col(l("Your heart quickens as your gaze focuses upon a small wooden panel, partly obscured under a layer of wind-blown sand."), 9);
@@ -23,7 +24,8 @@
     close;
 }
 
-000-1.gat,89,51,0	script	#panel	999;2,{
+// Size = 2
+000-1,89,51,0	script	#panel	999,{
 
     mesn "Narrator";
     mes col(l("This panel looks in rather good shape, as though some people take care of it regularly. Maybe it has important information."), 9);
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index d13537bb9..cf89fa22b 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -5,7 +5,9 @@
 // Description:
 //    Friend of Max, he gives some information on combat system.
 
-000-1.gat,74,111,0,1	script	Sapartan	314;2,{
+// Size = 2
+// Gender = 1
+000-1,74,111,0	script	Sapartan	314,{
     mesn;
     mesq l("Hey Max, it's @@!", strcharinfo(0));
     next;
diff --git a/npc/000-1/shop.txt b/npc/000-1/shop.txt
index eb301e943..a161788e6 100644
--- a/npc/000-1/shop.txt
+++ b/npc/000-1/shop.txt
@@ -4,4 +4,5 @@
 // Description:
 //    Fexil's shop bag.
 
-000-1.gat,84,98,0,1	shop	Bag	109,PiouLegs :-1,Bread :-1,Croconut :-1,Aquada :-1,Armbands :-1,LousyMoccasins :-1,PiouSlayer :-1
+// Gender = 1
+000-1,84,98,0	shop	Bag	109,PiouLegs :-1,Bread :-1,Croconut :-1,Aquada :-1,Armbands :-1,LousyMoccasins :-1,PiouSlayer :-1
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 47c7c05f5..a482aa68b 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -5,7 +5,9 @@
 // Description:
 //    Pervert and arrogant sailor.
 
-000-1.gat,86,99,0,1	script	Silvio	312;2,{
+// Size = 2
+// Gender = 1
+000-1,86,99,0	script	Silvio	312,{
     mesn;
     mesq l("Hey!");
     next;
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index be0c2c926..ee1db32cf 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -4,7 +4,9 @@
 // Description:
 //    Sailor hitting a crocotree, then being struck by a falling croconut.
 
-000-1.gat,33,37,0,1	script	Tarlan	315;2,{
+// Size = 2
+// Gender = 1
+000-1,33,37,0	script	Tarlan	315,{
     setnpcdir 2;
 
     mesn;
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index 62731f417..96bd91be0 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -7,7 +7,9 @@
 //    Sailor part of the Gugli's quest.
 //    Aquada box.
 
-000-1.gat,34,111,0,1	script	Tibbo	110;2,{
+// Size = 2
+// Gender = 1
+000-1,34,111,0	script	Tibbo	110,{
     set @g, getq(ShipQuests_Gugli);
     if (@g == 0) goto L_NoTask;