Fixed few bugs in NPC scripts:

Changed item IDs to their aegisname
Added missing 's' after @@ when needed
Few other fixes in english

9 files changed, 33 insertions, 46 deletions

diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index 54ab33fc..0a37eb02 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -26,7 +26,6 @@
 
     menu
         lg("Gugli sent me down here to help you."), -,
-        l("What's that?"), L_Plushroom,
         l("See you aboard."), L_Quit;
 
     mes "";
@@ -52,8 +51,7 @@ L_CallFunc:
 
     menu
         rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone,
-        rif(getq(ShipQuests_Ale) == 1 && (getq(ShipQuests_Astapolos) == 0 || getq(ShipQuests_Gulukan) == 0 || getq(ShipQuests_Jalad) == 0 || getq(ShipQuests_QMuller) == 0 || getq(ShipQuests_Tibbo) == 0), l("I'm still busy, I need to find the other sailors.")), -,
-        l("What's that purple thing?"), L_Plushroom;
+        rif(getq(ShipQuests_Ale) == 1 && (getq(ShipQuests_Astapolos) == 0 || getq(ShipQuests_Gulukan) == 0 || getq(ShipQuests_Jalad) == 0 || getq(ShipQuests_QMuller) == 0 || getq(ShipQuests_Tibbo) == 0), l("I'm still busy, I need to find the other sailors.")), -;
 
     mes "";
     mesn;
@@ -87,17 +85,6 @@ L_Jalad:
 
     close;
 
-L_Plushroom:
-    mes "";
-    mesn;
-    mesq l("'That', as you call it, is a @@. There are plenty of 'em here!", getitemlink(515));
-    next;
-    mesq l("It's a kind of mushroom that tastes like a marshmallow and looks like a plush! @@, get it?", getitemlink(515));
-    next;
-    mesq l("These funny fungi are mushrooming all around this island. Just pick some @@s and have a try.", getitemlink(515));
-
-    close;
-
 L_NoTask:
     mes "";
     mesn;
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index 855d8f42..dc9d13c7 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -64,7 +64,7 @@ OnTalk:
     next;
     mesq l("We usually dock around these small isles because they provide us some of the best food of all the archipelago.");
     next;
-    mesq l("At the moment, our crew is busy collecting @@s, @@s and @@s.", getitemlink(513), getitemlink(515), getitemlink(509));
+    mesq l("At the moment, our crew is busy collecting @@s, @@s and @@s.", getitemlink(Croconut), getitemlink(Plushroom), getitemlink(Aquada));
     next;
 
     select
@@ -75,9 +75,9 @@ OnTalk:
     mesq l("Right! Ours is an earthsea realm. You see, sailors are swift at their tasks when out of sight of land, but docked by this verdant jewel, they have it so good, they are just taking too much time bringing all the food back to the ship. Maybe you can help them.");
     next;
     mesq l("The captain wants:");
-    mesq l("- 2 @@", getitemlink(714));
-    mesq l("- 2 @@", getitemlink(715));
-    mesq l("- 2 @@", getitemlink(716));
+    mesq l("- 2 @@es", getitemlink(AquadaBox));
+    mesq l("- 2 @@es", getitemlink(CroconutBox));
+    mesq l("- 2 @@es", getitemlink(PlushroomBox));
     next;
     mesq l("Ask sailors around here they shouldn't be so far away.");
     next;
@@ -94,7 +94,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(714) > 0 || countitem(715) > 0 || countitem(716) > 0, l("I have some food for you.")), L_CollectSmthing,
+        rif(countitem(AquadaBox) > 0 || countitem(CroconutBox) > 0 || countitem(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;
@@ -108,7 +108,7 @@ L_MenuDone:
 L_SailorNames:
     mes "";
     mesn;
-    mesq l("Ale and Tibbo should bring 2 boxes of @@s, Astapolos and Gulukan 2 of @@s and Jalad and Q'Muller were charged of the boxes of @@s.", getitemlink(509), getitemlink(513), getitemlink(515));
+    mesq l("Ale and Tibbo should bring 2 boxes of @@s, Astapolos and Gulukan 2 of @@s and Jalad and Q'Muller were charged of the boxes of @@s.", getitemlink(Aquada), getitemlink(Croconut), getitemlink(Plushroom));
     next;
     mesq l("Do you need any other information?");
     next;
@@ -121,9 +121,9 @@ L_CollectSmthing:
     mesq l("Good job!");
     next;
 
-    delitem 714, countitem(714);
-    delitem 715, countitem(715);
-    delitem 716, countitem(716);
+    delitem AquadaBox, countitem(AquadaBox);
+    delitem CroconutBox, countitem(CroconutBox);
+    delitem PlushroomBox, countitem(PlushroomBox);
 
     mesq l("You still need to give me boxes from: ");
     if (getq(ShipQuests_Astapolos) == 0) mesq l("- Astapolos");
@@ -148,7 +148,7 @@ L_Couwan:
     next;
     mesq l("May this be a lesson for you.");
 
-    if (countitem(713) > 0) delitem 713, 1;
+    if (countitem(FishBox) > 0) delitem FishBox, 1;
     setq ShipQuests_Couwan, 2;
     Zeny = Zeny + 10;
     getexp 40, 0;
@@ -194,12 +194,12 @@ L_Lean:
     close;
 
 L_TaskDone:
-    if (countitem(714) == 2) delitem 714, 2;
-    if (countitem(715) == 2) delitem 715, 2;
-    if (countitem(716) == 2) delitem 716, 2;
-    if (countitem(714) == 1) delitem 714, 1;
-    if (countitem(715) == 1) delitem 715, 1;
-    if (countitem(716) == 1) delitem 716, 1;
+    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;
     setq ShipQuests_Gugli, 2;
 
     Zeny = Zeny + 250;
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index e14b9f9b..7b277fdf 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -107,7 +107,7 @@ L_RandomB:
     close;
 
 L_RandomC:
-    mesq l("I think that yeye's soon be done. Yeye'll soon have a full box of @@s!", getitemlink(706));
+    mesq l("I think that yeye's soon be done. Yeye'll soon have a full box of @@s!", getitemlink(CrocClaw));
     next;
     mesq l("And you? How's it yaying on your side?");
     next;
@@ -148,7 +148,7 @@ L_Top:
 L_NoTask:
     mes "";
     mesn;
-    mesq l("*Uff*... And another box of @@s for our starving colleagues is ready.", getitemlink(513));
+    mesq l("*Uff*... And another box of @@s for our starving colleagues is ready.", getitemlink(Croconut));
 
     close;
 
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index 1319d906..997791bd 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -42,7 +42,7 @@
 L_Continue:
     mes "";
     mesn;
-    mesq l("Surely. Take this box full of @@s.", getitemlink(515));
+    mesq l("Surely. Take this box full of @@s.", getitemlink(Plushroom));
     next;
 
     inventoryplace PlushroomBox, 1;
@@ -52,7 +52,7 @@ L_Continue:
 
     mes "";
     mesn;
-    mesq l("They are so tasty when cooked together with some @@. Don't drop any of them!", getitemlink(505));
+    mesq l("They are so tasty when cooked with some @@. Don't drop any of them!", getitemlink(PiouLegs));
 
     goto L_Close;
 
@@ -101,11 +101,11 @@ L_Ale:
 L_Plushroom:
     mes "";
     mesn;
-    mesq l("'That', as you call it, is a @@. There're plenty on this island!", getitemlink(515));
+    mesq l("'That', as you call it, is a @@. There're plenty on this island!", getitemlink(Plushroom));
     next;
     mesq l("It's a kind of mushroom. We call it like that because of it's taste, just like a marshmallow. It also has this name because of it's appearance. It looks like a plush!");
     next;
-    mesq l("There are some groups of these @@s all around this island. Just pick some and have a try.", getitemlink(515));
+    mesq l("There are some groups of these @@s all around this island. Just pick some and have a try.", getitemlink(Plushroom));
 
     close;
 
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index 3772eac9..a4ac7467 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -44,7 +44,7 @@ L_Sailors:
     mesn;
     mesq l("They are all around the island.");
     next;
-    mesq l("I'm sure Tibbo is alone in the south-west corner of the island. He believes it's the best place to collect @@s.", getitemlink(509));
+    mesq l("I'm sure Tibbo is alone in the south-west corner of the island. He believes it's the best place to collect @@s.", getitemlink(Aquada));
     next;
     mesq l("While Jalad and Ale like to work together, as they use to do on the ship, last time I've seen them, they were near the big lake, north from here.");
     next;
diff --git a/npc/000-1/maxe.txt b/npc/000-1/maxe.txt
index 79dacbbb..d02e9b62 100644
--- a/npc/000-1/maxe.txt
+++ b/npc/000-1/maxe.txt
@@ -79,7 +79,7 @@ L_Qmuller:
     mesn;
     mesq l("You need to cross the crocojungle heading north.");
     next;
-    mesq l("You can spot Q'Muller on a cliff off toward the west, busy collecting @@s.", getitemlink(515));
+    mesq l("You can spot Q'Muller on a cliff off toward the west, busy collecting @@s.", getitemlink(Plushroom));
     next;
 
     goto L_MenuSailors;
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index ebaf70c7..f41d0dd0 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -98,11 +98,11 @@ L_Top:
 L_Plushroom:
     mes "";
     mesn;
-    mesq l("'That', as you call it, is a @@. There're plenty on this island!", getitemlink(515));
+    mesq l("'That', as you call it, is a @@. There're plenty on this island!", getitemlink(Plushroom));
     next;
     mesq l("It's a kind of mushroom. We call it like that because of it's taste, just like a marshmallow. It also has this name because of it's appearance, it looks like a plush!");
     next;
-    mesq l("There are few groups of these @@s all around this island. Just pick some and have a try.", getitemlink(515));
+    mesq l("There are few groups of these @@s all around this island. Just pick some and have a try.", getitemlink(Plushroom));
 
     close;
 
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index fb5cec58..57914478 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -29,28 +29,28 @@
 L_Food:
     mes " ";
     mesn;
-    mesq l("You can yaye some @@s by hitting these crocotrees.", getitemlink(513));
+    mesq l("You can yaye some @@s by hitting these crocotrees.", getitemlink(Croconut));
     next;
     mesq l("Yeye be careful with wild animal's food, some of them are yeyery dangerous, especially the crocs.");
 
     goto L_Quit;
 
 L_HardToHit:
-    mesq l("These crocotrees are full of yaying @@, but they are so hard to hit...", getitemlink(513));
+    mesq l("These crocotrees are full of yaying @@s, but they are so hard to hit...", getitemlink(Croconut));
 
     goto L_Quit;
 
 L_Aouch:
     mesq l("Ayouyouch! My head...");
     next;
-    mesq l("Damn @@.", getitemlink(513));
+    mesq l("Damn @@.", getitemlink(Croconut));
 
     goto L_Quit;
 
 L_DoYou:
     mesq l("Do you want to try?");
     next;
-    mesq l("Just hit the trunk, and it will yeye a @@.", getitemlink(513));
+    mesq l("Just hit the trunk, and it will yeye a @@.", getitemlink(Croconut));
 
     goto L_Quit;
 
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index 78ea9c0c..5bfe3cee 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -91,11 +91,11 @@ L_Top:
 L_Aquada:
     mes "";
     mesn;
-    mesq l("This is an @@, a light blue sea fruit. They're highly desired in the archipelago.", getitemlink(509));
+    mesq l("This is an @@, a light blue sea fruit. They're highly desired in the archipelago.", getitemlink(Aquada));
     next;
     mesq l("You can find them in the ocean, near corals and other sea beings. But the sea is too heavy today, you shouldn't try swimming for now.");
     next;
-    mesq l("Otherwise, if you really want one, and if you feel capable, you can try killing tortugas or crocs if you're strong enough. I'm sure they could drop one or two @@s.", getitemlink(509));
+    mesq l("Otherwise, if you really want one, and if you feel capable, you can try killing tortugas or crocs if you're strong enough. I'm sure they could drop one or two @@s.", getitemlink(Aquada));
 
     close;