convert server data for using with hercules.

12 files changed, 79 insertions, 49 deletions

diff --git a/npc/000-2-1/_import.txt b/npc/000-2-1/_import.txt
index 5a6cf40b..d0dce865 100644
--- a/npc/000-2-1/_import.txt
+++ b/npc/000-2-1/_import.txt
@@ -1,5 +1,4 @@
 // Map 000-2-1: La Johanne, Second Deck
-map: 000-2-1.gat
 npc: npc/000-2-1/_mobs.txt
 npc: npc/000-2-1/_warps.txt
 npc: npc/000-2-1/alige.txt
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index bc235aa4..78526fa8 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -17,7 +17,8 @@
 //    2   Accept the task.
 //    3   Bring first food.
 
-000-2-1.gat,43,32,0,1	script	AligeTrigger	0,1,1,{
+// Gender = 1
+000-2-1,43,32,0	script	AligeTrigger	32767,1,1,{
 
 OnTouch:
     if (getq(ShipQuests_Alige) > 0) close;
@@ -47,7 +48,9 @@ OnTimer190:
     end;
 }
 
-000-2-1.gat,43,31,0,1	script	Alige	301;2,{
+// Size = 2
+// Gender = 1
+000-2-1,43,31,0	script	Alige	301,{
     set @q, getq(ShipQuests_Alige);
     if (@q > 1) goto L_AskForFood;
 
@@ -165,20 +168,20 @@ L_Accepted:
 L_GiveFood:
     mes "";
     menu
-        rif(countitem(501, 1), l(getitemname("Acorn"))), 0,
-        rif(countitem(502, 1), l(getitemname("Bread"))), 502,
-        rif(countitem(503, 1), l(getitemname("Fungus"))), 503,
-        rif(countitem(504, 1), l(getitemname("Cheese"))), 504,
-        rif(countitem(505, 1), l(getitemname("PiouLegs"))), 505,
-        rif(countitem(506, 1), l(getitemname("LettuceLeaf"))), 0,
-        rif(countitem(507, 1), l(getitemname("Piberries"))), 2,
-        rif(countitem(508, 1), l(getitemname("SeaDrops"))), 1,
-        rif(countitem(509, 1), l(getitemname("Aquada"))), 509,
-        rif(countitem(510, 1), l(getitemname("PinkBlobime"))), 1,
-        rif(countitem(512, 1), l(getitemname("HalfCroconut"))), 512,
-        rif(countitem(513, 1), l(getitemname("Croconut"))), 0,
-        rif(countitem(515, 1), l(getitemname("Plushroom"))), 515,
-        rif(countitem(516, 1), l(getitemname("PumpkinSeeds"))), 1,
+        rif(countitemcolor(501, 1), l(getitemname("Acorn"))), 0,
+        rif(countitemcolor(502, 1), l(getitemname("Bread"))), 502,
+        rif(countitemcolor(503, 1), l(getitemname("Fungus"))), 503,
+        rif(countitemcolor(504, 1), l(getitemname("Cheese"))), 504,
+        rif(countitemcolor(505, 1), l(getitemname("PiouLegs"))), 505,
+        rif(countitemcolor(506, 1), l(getitemname("LettuceLeaf"))), 0,
+        rif(countitemcolor(507, 1), l(getitemname("Piberries"))), 2,
+        rif(countitemcolor(508, 1), l(getitemname("SeaDrops"))), 1,
+        rif(countitemcolor(509, 1), l(getitemname("Aquada"))), 509,
+        rif(countitemcolor(510, 1), l(getitemname("PinkBlobime"))), 1,
+        rif(countitemcolor(512, 1), l(getitemname("HalfCroconut"))), 512,
+        rif(countitemcolor(513, 1), l(getitemname("Croconut"))), 0,
+        rif(countitemcolor(515, 1), l(getitemname("Plushroom"))), 515,
+        rif(countitemcolor(516, 1), l(getitemname("PumpkinSeeds"))), 1,
         l("I don't have anything good for you today."), -1;
 
     set @id, @menuret;
@@ -186,7 +189,7 @@ L_GiveFood:
     if (@id == 0) goto L_NoReward; // In case of wrong food.
     if (@id == 1) goto L_Poison; // In case of poisoned food.
     if (@id == 2) goto L_NoMore; // In case of Piberries.
-    if (countitem(@id) == 0) goto L_Quit;
+    if (countitemcolor(@id) == 0) goto L_Quit;
 //  if (@id == item's ID) then food is correct.
 // Do not put any other number than -1, 0, 1, 2 or the item's ID, that'll avoid confusion.
 
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 091f0e84..22c3f03e 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -16,21 +16,24 @@
 //    11   Need to see Julia
 //    12   Has been registered by Julia
 
-000-2-1.gat,49,36,0,1	script	LeftDoorCheck	0,0,0,{
+// Gender = 1
+000-2-1,49,36,0	script	LeftDoorCheck	32767,0,0,{
     set @q, getq(ShipQuests_Arpan);
     if (@q == 0) doevent "Magic Arpan::OnTalk";
 
     close;
 }
 
-000-2-1.gat,54,36,0,1	script	RightDoorCheck	0,0,0,{
+// Gender = 1
+000-2-1,54,36,0	script	RightDoorCheck	32767,0,0,{
     set @q, getq(ShipQuests_Arpan);
     if (@q == 0) doevent "Magic Arpan::OnTalk";
 
     close;
 }
 
-000-2-1.gat,47,32,0,1	script	LeftBarrierCheck	0,0,2,{
+// Gender = 1
+000-2-1,47,32,0	script	LeftBarrierCheck	32767,0,2,{
     set @q, getq(ShipQuests_Arpan);
     if (@q > 2) close;
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
@@ -57,7 +60,8 @@ L_EquipDone:
     close;
 }
 
-000-2-1.gat,56,32,0,1	script	RightBarrierCheck	0,0,2,{
+// Gender = 1
+000-2-1,56,32,0	script	RightBarrierCheck	32767,0,2,{
     set @q, getq(ShipQuests_Arpan);
     if (@q > 2) close;
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
@@ -84,7 +88,9 @@ L_EquipDone:
     close;
 }
 
-000-2-1.gat,49,33,0,1	script	Magic Arpan	307;5,{
+// Size = 5
+// Gender = 1
+000-2-1,49,33,0	script	Magic Arpan	307,{
     set @q, getq(ShipQuests_Arpan);
     set @q_julia, getq(ShipQuests_Julia);
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
@@ -198,7 +204,7 @@ L_WhereOldClothes:
 
     setq ShipQuests_ArpanMoney, 1;
     set @q, getq(ShipQuests_Arpan);
-    set zeny, zeny+10;
+    set Zeny, Zeny+10;
     message strcharinfo(0), l("You receive @@ E!", 10);
 
     goto L_BeforeMenu;
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index 53664db5..c1143557 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -16,14 +16,16 @@
 //    5   Quest complete. Julia wins (poison dish returned).
 //    6   Quest complete. Julia wins.
 
-000-2-1.gat,27,28,0,1	script	Chef Gado	318;2,{
+// Size = 2
+// Gender = 1
+000-2-1,27,28,0	script	Chef Gado	318,{
     set @q, getq(ShipQuests_ChefGado);
     set @n, getq(ShipQuests_Nard);
     if (@q == 1) goto L_QuestAccepted;
     if (@q == 2) goto L_PoisonAccepted;
     if (@q == 3) goto L_PoisonJulia;
     if (@q == 4) goto L_QuestComplete;
-    if (@q == 5 && countitem("PoisonedDish") > 0) goto L_Aborting;
+    if (@q == 5 && countitemcolor("PoisonedDish") > 0) goto L_Aborting;
     if (@q > 4) goto L_QuestAborted;
     if (@n == 3) goto L_QuestStart;
 
@@ -103,7 +105,7 @@ L_QuestAccepted:
     next;
 
     menu
-        rif(countitem("PiouLegs") > 1 && countitem("HalfCroconut") > 0 && countitem("Aquada") > 0 && countitem("SeaDrops") > 0, l("All your... Fresh ingredients are ready to be cooked.")), L_GotAll,
+        rif(countitemcolor("PiouLegs") > 1 && countitemcolor("HalfCroconut") > 0 && countitemcolor("Aquada") > 0 && countitemcolor("SeaDrops") > 0, l("All your... Fresh ingredients are ready to be cooked.")), L_GotAll,
         l("What are your needs?"), L_Need,
         l("Where can I find a half croconut?"), L_OpenCroconut,
         l("Not yet. I will be back soon."), L_Quit;
@@ -162,7 +164,7 @@ L_PoisonJulia:
     mesq l("The usurper has been punished! This is a great day! Take this reward as a prize for your loyalty to the old commander!");
 
     setq ShipQuests_ChefGado, 4;
-    set zeny, zeny + 200;
+    set Zeny, Zeny + 200;
     message strcharinfo(0), l("You receive @@ E!", 200);
     callfunc "InventoryPlace", 502, 2;
     getitem "Bread", 1;
@@ -190,7 +192,7 @@ L_Aborting:
     next;
     mesq lg("Give me back this dish, you dirty liar!");
 
-    if (countitem("PoisonedDish") > 0) delitem "PoisonedDish", 1;
+    if (countitemcolor("PoisonedDish") > 0) delitem "PoisonedDish", 1;
 
     next;
     mesq l("You're like the rest of this filthy crew, I can't trust you!");
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index 6071157f..21055aab 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -10,7 +10,8 @@
 //    1   Talked to Arpan and needs to get clothes.
 //    2   Has the clothes.
 
-000-2-1.gat,51,37,0	script	Chest	317;2,{
+// Size = 2
+000-2-1,51,37,0	script	Chest	317,{
     set @q, getq(ShipQuests_Arpan);
 
     if (@q == 0) goto L_Talk;
diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt
index 248c2761..e0aeb650 100644
--- a/npc/000-2-1/dan.txt
+++ b/npc/000-2-1/dan.txt
@@ -6,7 +6,9 @@
 //    There are two kinds of dialogues in this script.
 //    Dan will randomly choose between a useless sentence, and a quest in Artis.
 
-000-2-1.gat, 32,31,0,1	script	Dan	101;2,{
+// Size = 2
+// Gender = 1
+000-2-1,32,31,0	script	Dan	101,{
     mesn;
     set @q, rand(3);
     if (@q == 0) goto L_QuestStory;
diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt
index c6066f8d..a7b09fdb 100644
--- a/npc/000-2-1/devis.txt
+++ b/npc/000-2-1/devis.txt
@@ -6,7 +6,9 @@
 // Description:
 //    Sleeping and grumbling NPC.
 
-000-2-1.gat,32,38,0,1	script	Devis	310;2,{
+// Size = 2
+// Gender = 1
+000-2-1,32,38,0	script	Devis	310,{
 
     callfunc "Asleep";
 }
diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt
index 60463916..8b9e20fa 100644
--- a/npc/000-2-1/hammock.txt
+++ b/npc/000-2-1/hammock.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Animated hammock at the mid level of the ship.
 
-000-2-1.gat,32,27,0	script	#hammock1	904,1,0{
+000-2-1,32,27,0	script	#hammock1	904,1,0,{
 
 OnTouchFirst:
     setnpcdir 0;
@@ -21,7 +21,7 @@ OnTimer5440:
     end;
 }
 
-000-2-1.gat,32,25,0	script	#hammock2	904,1,0{
+000-2-1,32,25,0	script	#hammock2	904,1,0,{
 
 OnTouchFirst:
     setnpcdir 0;
@@ -38,7 +38,7 @@ OnTimer5440:
     end;
 }
 
-000-2-1.gat,37,25,0	script	#hammock3	905,1,0{
+000-2-1,37,25,0	script	#hammock3	905,1,0,{
 
 OnTouchFirst:
     setnpcdir 0;
@@ -55,7 +55,7 @@ OnTimer5440:
     end;
 }
 
-000-2-1.gat,37,27,0	script	#hammock4	905,1,0{
+000-2-1,37,27,0	script	#hammock4	905,1,0,{
 
 OnTouchFirst:
     setnpcdir 0;
@@ -72,7 +72,7 @@ OnTimer5440:
     end;
 }
 
-000-2-1.gat,37,29,0	script	#hammock5	905,1,0{
+000-2-1,37,29,0	script	#hammock5	905,1,0,{
 
 OnTouchFirst:
     setnpcdir 0;
@@ -89,7 +89,7 @@ OnTimer5440:
     end;
 }
 
-000-2-1.gat,37,34,0	script	#hammock6	905,1,0{
+000-2-1,37,34,0	script	#hammock6	905,1,0,{
 
 OnTouchFirst:
     setnpcdir 0;
@@ -106,7 +106,7 @@ OnTimer5440:
     end;
 }
 
-000-2-1.gat,37,36,0	script	#hammock7	905,1,0{
+000-2-1,37,36,0	script	#hammock7	905,1,0,{
 
 OnTouchFirst:
     setnpcdir 0;
@@ -123,7 +123,7 @@ OnTimer5440:
     end;
 }
 
-000-2-1.gat,37,38,0	script	#hammock8	905,1,0{
+000-2-1,37,38,0	script	#hammock8	905,1,0,{
 
 OnTouchFirst:
     setnpcdir 0;
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index 41bfab3b..2ed92c0b 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -10,7 +10,9 @@
 //    0   Default, not taken.
 //    1   Knife taken.
 
-000-2-1.gat,50,24,0,2	script	#knife	100;2,{
+// Size = 2
+// Gender = 2
+000-2-1,50,24,0	script	#knife	100,{
     set @q, getq(ShipQuests_Knife);
     if (@q) close;
 
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 741d670e..8266e5f1 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -39,7 +39,8 @@
 // [9] = Shows how many seconds passed since the player started the quest.
 // [10] = Shows how many seconds passed since the player done the quest.
 
-000-2-1.gat,72,34,0,1	script	AreaNPC	0,0,1,{
+// Gender = 1
+000-2-1,72,34,0	script	AreaNPC	32767,0,1,{
 
 OnTouch:
     if (BaseLevel < 5) goto L_Stop;
@@ -87,7 +88,9 @@ L_NoGoodTick:
     close;
 }
 
-000-2-1.gat,70,35,0,1	script	Peter	303;3,{
+// Size = 3
+// Gender = 1
+000-2-1,70,35,0	script	Peter	303,{
     if (BaseLevel < 5) goto OnTooWeak;
     if ($@RAT_SAILOR_COUNTDOWN == "") goto L_NoCountDown;
     if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick;
@@ -300,7 +303,7 @@ L_Reward:
     mesn;
     mesq l("Good job!") + " " + l("Here's your reward!");
     getexp 100, 0;
-    set zeny, zeny + 1000;
+    set Zeny, Zeny + 1000;
     message strcharinfo(0), l("You receive @@ E!", 1000);
 
     goto L_CleaningClose;
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
index 7f7f183d..bef1ecc5 100644
--- a/npc/000-2-1/q'onan.txt
+++ b/npc/000-2-1/q'onan.txt
@@ -5,7 +5,9 @@
 // Description:
 //    Sleeping and snoring NPC.
 
-000-2-1.gat,53,38,0,1	script	Q'Onan	302;2,{
+// Size = 2
+// Gender = 1
+000-2-1,53,38,0	script	Q'Onan	302,{
 
     callfunc "Asleep";
 }
diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt
index d9e30641..15b5e5d2 100644
--- a/npc/000-2-1/savepoint.txt
+++ b/npc/000-2-1/savepoint.txt
@@ -4,22 +4,30 @@
 // Description:
 //    Saves locations in 000-2-1 map.
 
-000-2-1.gat,40,37,0,2	script	#name	901;2,{
+// Size = 2
+// Gender = 2
+000-2-1,40,37,0	script	#name	901,{
     callfunc "SavePoint", "000-2-1.gat", 40, 37;
     close;
 }
 
-000-2-1.gat,46,37,0,2	script	#name	901;2,{
+// Size = 2
+// Gender = 2
+000-2-1,46,37,0	script	#name	901,{
     callfunc "SavePoint", "000-2-1.gat", 46, 37;
     close;
 }
 
-000-2-1.gat,50,38,0,2	script	#name	901;2,{
+// Size = 2
+// Gender = 2
+000-2-1,50,38,0	script	#name	901,{
     callfunc "SavePoint", "000-2-1.gat", 50, 38;
     close;
 }
 
-000-2-1.gat,55,40,0,2	script	#name	901;2,{
+// Size = 2
+// Gender = 2
+000-2-1,55,40,0	script	#name	901,{
     callfunc "SavePoint", "000-2-1.gat", 55, 40;
     close;
 }