Fixed few bugs in NPC scripts:

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

26 files changed, 83 insertions, 98 deletions

diff --git a/npc/000-0-1/narrator.txt b/npc/000-0-1/narrator.txt
index 528e7e56..dcf54086 100644
--- a/npc/000-0-1/narrator.txt
+++ b/npc/000-0-1/narrator.txt
@@ -23,7 +23,7 @@
         l("..."),
         l("Wake-up!");
 
-    if (countitem(718) == 1) delitem 718, 1;
+    if (countitem(JohanneKey) == 1) delitem JohanneKey, 1;
     setq General_Narrator, 1;
     setq ShipQuests_Nard, 6;
     savepoint "001-2-22.gat", 50, 38;
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;
 
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index a4e8bcc8..0b8d8ff4 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -23,7 +23,7 @@
     if (.@q == 2) goto L_PoisonAccepted;
     if (.@q == 3) goto L_PoisonJulia;
     if (.@q == 4) goto L_QuestComplete;
-    if (.@q == 5 && countitem(717) > 0) goto L_Aborting;
+    if (.@q == 5 && countitem(PoisonedDish) > 0) goto L_Aborting;
     if (.@q > 4) goto L_QuestAborted;
     if (.@n == 3) goto L_QuestStart;
 
@@ -79,9 +79,9 @@ L_Rude:
     next;
     mesq l("I just realized I am lacking some common things, and one key ingredient, to prepare a... A special recipe.");
     next;
-    mesq l("I only need 2 @@, 2 @@s, 1 @@...", getitemlink(505), getitemlink(512), getitemlink(509));
+    mesq l("I only need 2 @@, 2 @@s, 1 @@...", getitemlink(PiouLegs), getitemlink(HalfCroconut), getitemlink(Aquada));
     next;
-    mesq l("... and 1 @@.", getitemlink(508));
+    mesq l("... and 1 @@.", getitemlink(SeaDrops));
     next;
 
     menu
@@ -93,7 +93,7 @@ L_Rude:
     mesn;
     mesq l("Well done! Collect all the ingredients and then come back here. You will be rewarded, once I am satisfied that they understand who rules this ship!");
     next;
-    mesq l("Before you go, let me tell you how to get @@s, because you don't look very smart.", getitemlink(512));
+    mesq l("Before you go, let me tell you how to get @@s, because you don't look very smart.", getitemlink(HalfCroconut));
 
     goto L_OpenCroconut;
 
@@ -103,7 +103,7 @@ L_QuestAccepted:
     next;
 
     menu
-        rif(countitem(505) > 1 && countitem(512) > 0 && countitem(509) > 0 && countitem(508) > 0, l("All your... Fresh ingredients are ready to be cooked.")), L_GotAll,
+        rif(countitem(PiouLegs) > 1 && countitem(HalfCroconut) > 1 && countitem(Aquada) > 0 && countitem(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;
@@ -111,7 +111,7 @@ L_QuestAccepted:
 L_OpenCroconut:
     mes "";
     mesn;
-    mesq l("Take a @@ and try opening it using something like a sharp knife! I doubt you'll succeed though, you're being so weak in all.", getitemlink(513));
+    mesq l("Take a @@ and try opening it using something like a sharp knife! I doubt you'll succeed though, you're being so weak in all.", getitemlink(Croconut));
     next;
     mesq l("Now move!");
 
@@ -135,7 +135,7 @@ L_GotAll:
     mesq l("Done. Here, take it! Now, here is the plan. Go talk to her and offer our beautiful lady a bite of her arrogance!");
 
     setq ShipQuests_ChefGado, 2;
-    getitem 717, 1;
+    getitem PoisonedDish, 1;
     close;
 
 L_Need:
@@ -143,9 +143,9 @@ L_Need:
     mesn;
     mesq l("Shhht, don't say it that loud...");
     next;
-    mesq l("I only need 2 @@, 2 @@, 1 @@ and...", getitemlink(505), getitemlink(512), getitemlink(509));
+    mesq l("I only need 2 @@, 2 @@s, 1 @@...", getitemlink(PiouLegs), getitemlink(HalfCroconut), getitemlink(Aquada));
     next;
-    mesq l("... And 1 @@.", getitemlink(508));
+    mesq l("... and 1 @@.", getitemlink(SeaDrops));
 
     close;
 
@@ -162,7 +162,7 @@ L_PoisonJulia:
     setq ShipQuests_ChefGado, 4;
     Zeny = Zeny + 200;
     message strcharinfo(0), l("You receive @@ E!", 200);
-    inventoryplace Bread, 2;
+    inventoryplace Bread, 1;
     getitem Bread, 1;
     getexp 15, 0;
 
@@ -188,7 +188,7 @@ L_Aborting:
     next;
     mesq lg("Give me back this dish, you dirty liar!");
 
-    if (countitem(717) > 0) delitem 717, 1;
+    if (countitem(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-3/box.txt b/npc/000-2-3/box.txt
index 7f53806c..7aafb9af 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -98,7 +98,7 @@ L_Already:
     setcamnpc "Nard";
     mes "";
     mesn "Nard";
-    mesq l("You already took a Bandana, please put this one back in the box.");
+    mesq l("You already took a @@, please put this one back in the box.", getitemlink (Bandana));
 
     close;
 
diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index 1fb8ba10..d597e30e 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -28,8 +28,7 @@
             l("3: Which colorants can dye it."),
             l("4: How many cards your item can contain."),
             l("Exemple for yoiis:"),
-            l("Take a @@ and a @@, yeye obtains a @@.",
-                getitemlink(ArtisTankTop), getitemlink(RedCottonDye), getitemlink(ArtisTankTop, RedCottonDye)),
+            l("Take an @@ and a @@, yeye obtains a @@.", getitemlink(ArtisTankTop), getitemlink(RedCottonDye), getitemlink(ArtisTankTop, RedCottonDye)),
             l("If yoiis wants to see a different use for the cards he can yeye for Resa at the light armor shop for a description of the styling cards.");
     }
 
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index ab8ddee5..c3498028 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -180,7 +180,7 @@ L_Reward:
 
     setq General_Cookies, 1;
     getnameditem DeliciousCookie, strcharinfo(0);
-    npctalk3 l("You receive a @@!", getitemlink(517));
+    npctalk3 l("You receive a @@!", getitemlink(DeliciousCookie));
 
     next;
     mesq lg("I'm sure you'll appreciate its effect, but be careful, these cookies are rare, and you'll need to help the community again before being able to receive another one.");
@@ -242,7 +242,7 @@ L_LostCookie:
     inventoryplace DeliciousCookie, 1;
     getnameditem DeliciousCookie, strcharinfo(0);
 
-    npctalk3 l("You receive a @@!", getitemlink(517));
+    npctalk3 l("You receive a @@!", getitemlink(DeliciousCookie));
 
 L_Bye:
     closedialog;
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index f76c0ec2..60dd1b5c 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -126,7 +126,7 @@
         Zeny = Zeny + .@zeny_reward;
 
         narrator 4,
-            l("You received @@ exp and @@E.", .@exp_reward, .@zeny_reward);
+            l("You received @@ EXP and @@ E.", .@exp_reward, .@zeny_reward);
 
         return;
     }
@@ -230,7 +230,7 @@
 
         speech 5,
             l("Oh yes, I have one last errand for you, Q'Pid in the market sells potions."),
-            l("It has been some days now since I asked her for a box of @@, but she hasn't delivered anything yet.", getitemlink (PibberiesInfusion)),
+            l("It has been some days now since I asked her for a box of @@s, but she hasn't delivered anything yet.", getitemlink (PibberiesInfusion)),
             l("Please try to figure out what went wrong with this order and bring me these potions."),
             l("You will be able to find her in the market on the south-east of Artis.");
 
diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt
index 80b33ef3..6d64a61d 100644
--- a/npc/001-1/fexil.txt
+++ b/npc/001-1/fexil.txt
@@ -17,8 +17,8 @@
         speech 4,
             l("You know, the life of merchant is hard. I really hope that Artis and the Merchant Guild will help me to succeed."),
             l("Maybe you too you could help me?"),
-            l("I want to be the first merchant of this square to sell @@'s clothes!", getitemlink(729)),
-            l("I will buy all of the fur that you will bring me at a good price, let's say, 15E piece."),
+            l("I want to be the first merchant of this square to sell clothes made from @@s!", getitemlink(FluffyFur)),
+            l("I will buy all of the fur that you will bring me at a good price, let's say, 15 E piece."),
             l("Do we have a deal?");
 
         switch (select (l("Ok."), l("I don't want to be part of this joke.")))
@@ -79,7 +79,7 @@
     menuint
         l("OK, let's trade."), 1,
         rif(.@fexil == 2, l("Do you still need help?")), 2,
-        rif(.@fexil > 2 && countitem(729) > 0, l("I have some fur for you.")), 3,
+        rif(.@fexil > 2 && countitem(FluffyFur) > 0, l("I have some fur for you.")), 3,
         l("No. Sorry."), 4;
 
     switch (@menuret)
@@ -107,10 +107,10 @@
                         l("Please enter a valid amount.");
                     continue;
                 }
-                if (.@amount > countitem(729))
+                if (.@amount > countitem(FluffyFur))
                 {
                     speech 5,
-                        l("You don't have enough @@ on you.", getitemlink(729));
+                        l("You don't have enough @@s on you.", getitemlink(FluffyFur));
                     continue;
                 }
 
@@ -119,9 +119,9 @@
 
             .@price = 15 * .@amount;
             speech 5,
-                l("Deal, I offer you @@E!", .@price);
+                l("Deal, I offer you @@ E!", .@price);
 
-            delitem 729, .@amount;
+            delitem FluffyFur, .@amount;
             Zeny = Zeny + .@price;
 
             break;
diff --git a/npc/001-1/katja.txt b/npc/001-1/katja.txt
index 8213b466..a60dcef1 100644
--- a/npc/001-1/katja.txt
+++ b/npc/001-1/katja.txt
@@ -58,7 +58,7 @@
             next;
             mesq l("Please take this lollypop for your help. Mum says they are bad for my teeth anyway (FIXME)");
             setq ArtisQuests_LazyBrother, 4;
-            getitem 509, 1;
+            getitem Aquada, 1;
             getexp 500, 0;
             close;
         case 4:
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index 17a76ecc..74dc1f75 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -16,7 +16,7 @@
 
     function BuyPiou {
         .@price = getarg(0);
-        mesq l("The piou costs @@E.", .@price);
+        mesq l("The piou costs @@ E.", .@price);
         next;
         menuint l("Alright, I'll take one."), 1,
                 l("I changed my mind."), 2;
@@ -27,12 +27,12 @@
             return 4;
         if (Zeny < .@price)
         {
-            mesq l("Don't you try to cheat an old merchant! You don't have enough money, you need @@E.", .@price);
+            mesq l("Don't you try to cheat an old merchant! You don't have enough money, you need @@ E.", .@price);
             next;
 
             return 1;
         }
-        if (!checkweight(4000, 1))
+        if (!checkweight(PiouEgg, 1))
         {
             mesq l("You can't carry another @@? What a shame.", PiouEgg);
             next;
@@ -48,7 +48,7 @@
             return 3;
         }
         Zeny = Zeny - .@price;
-        getitem 4000, 1;
+        getitem PiouEgg, 1;
         ArtisQuests_PiousBought += 1;
         mesq l("You take good care of your piou. Remember to feed it every day.");
 
@@ -71,7 +71,7 @@
         speech 0,
             l("Look who is back..."),
             l("And with my piou. That's wonderful. I can only imagine how hard that little bugger was to catch!"),
-            l("Great, and as I promised, I give you a 90% discount on the @@ of your choice.", getitemlink (4000));
+            l("Great, and as I promised, I give you a 90% discount on the @@ of your choice.", getitemlink (PiouEgg));
             next;
 
             @ArtisQuests_PiouPrice = 3000;
diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt
index d34a55b2..cbd82b94 100644
--- a/npc/001-2-19/lloyd.txt
+++ b/npc/001-2-19/lloyd.txt
@@ -96,7 +96,7 @@
 
         .@price = 500;
         speech 4,
-            l("The fee is of @@E. So, do you want to register?", .@price);
+            l("The fee is of @@ E. So, do you want to register?", .@price);
 
         switch (select (l("Yes."),
                         l("I don't have the time now.")))
@@ -190,7 +190,7 @@
                     set #MerchantBank, #MerchantBank + .@amount;
 
                     speech 5,
-                        l("You made a cash deposit of @@E.", .@amount);
+                        l("You made a cash deposit of @@ E.", .@amount);
 
                     break;
                 case 2:
@@ -215,7 +215,7 @@
                     set Zeny, Zeny + .@amount;
 
                     speech 5,
-                        l("You withdrawn a total of @@E.", .@amount);
+                        l("You withdrawn a total of @@ E.", .@amount);
 
                     break;
                 case 3:
diff --git a/npc/001-2-2/moon.txt b/npc/001-2-2/moon.txt
index 42fb137a..f0597f04 100644
--- a/npc/001-2-2/moon.txt
+++ b/npc/001-2-2/moon.txt
@@ -74,7 +74,7 @@
         }
         else
         {
-            mesq l("You don't have a @@, are you mocking me?", getitemlink("CrocClaw"));
+            mesq l("You don't have any @@, are you mocking me?", getitemlink("CrocClaw"));
             close2;
             return 1;
         }
@@ -112,7 +112,7 @@ L_Story:
     next;
     mesq l("Luckily the beach is nearby, and somehow I made my way home.");
     next;
-    mesq l("Please bring me some @@ so I can pull out these spikes from my foot.", getitemlink("CrocClaw"));
+    mesq l("Please bring me @@s so I can pull out these spikes from my foot.", getitemlink("CrocClaw"));
     next;
 
     switch (select(l("Stay here, I'll hurry back as soon as I get some."),
diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt
index 00552225..ae559b99 100644
--- a/npc/001-2-26/ivan.txt
+++ b/npc/001-2-26/ivan.txt
@@ -1,4 +1,3 @@
-
 // Evol scripts.
 // Author:
 //    Reid
@@ -19,7 +18,7 @@
     function enora_quest {
         speech 5, l("How many? What kind? I can produce two dozen boxes per day.");
 
-        select (l("5 Pibberies Infusion."));
+        select (l("5 @@s.", getitemlink(PibberiesInfusion)));
 
         speech 5,
             l("5 boxes... Alright, @@ are my speciality!", getitemlink (PibberiesInfusion)),
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index cbc2ebd5..77161d0a 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -22,7 +22,7 @@
         .@price = getarg (0);
         if (Zeny < .@price)
         {
-            speech 5, l("You don't have enough money, bring @@E.", .@price);
+            speech 5, l("You don't have enough money, bring @@ E.", .@price);
         }
         else
         {
@@ -61,7 +61,7 @@
         .@price = calculate_inn_tax;
 
         speech 5,
-            l("That will be @@E to set your respawn point", .@price),
+            l("That will be @@ E to set your respawn point", .@price),
             l("This will remain your respawn point until set elsewhere."),
             l("Is that okay?");
 
diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt
index 01985c2a..f97f0be8 100644
--- a/npc/001-2-9/janus.txt
+++ b/npc/001-2-9/janus.txt
@@ -20,13 +20,13 @@
             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."),
-            l("The cost to create a party is of @@E, are you interested?", .@party_price);
+            l("The cost to create a party is of @@ E, are you interested?", .@party_price);
 
         if (askyesno () == 1)
         {
             if (Zeny < .@party_price)
             {
-                speech 5, l("You don't have enough money, bring @@E.", .@party_price);
+                speech 5, l("You don't have enough money, bring @@ E.", .@party_price);
             }
             else
             {
@@ -47,13 +47,13 @@
             l("Or, do you want to keep your friendship and your adventure in different groups?"),
             l("Anyway, the guild creation is perfect for both case! You can keep your current party as is while having a guild to talk and share different items with all of your friends!"),
             l("The @@ is a one time item, you can use it as many time as you want, but you can only have one!", getitemlink (GuildCertification)),
-            l("The cost to create a guild is of @@E, are you interested?", .@guild_price);
+            l("The cost to create a guild is of @@ E, are you interested?", .@guild_price);
 
         if (askyesno () == 1)
         {
             if (Zeny < .@guild_price)
             {
-                speech 5, l("You don't have enough money, bring @@E.", .@guild_price);
+                speech 5, l("You don't have enough money, bring @@ E.", .@guild_price);
             }
             else
             {
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index d36e9ed1..93a1d2c7 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -71,7 +71,7 @@ L_ChooseBait:
     delitem .@bait, 1;
 
     narrator 3,
-        l("You use a @@ as a bait.", getitemname(.@bait)),
+        l("You use a @@ as bait.", getitemname(.@bait)),
         l("You patiently wait...");
 
 L_Wait:
diff --git a/npc/functions/sailordialogue.txt b/npc/functions/sailordialogue.txt
index 4db1a3b0..281246f7 100644
--- a/npc/functions/sailordialogue.txt
+++ b/npc/functions/sailordialogue.txt
@@ -3,7 +3,7 @@
 //    Qwerty Dragon
 //    Reid
 // Description:
-//    Random some sailors's dialogues between two categories of NPCs.
+//    Random sailor dialogues between two categories of NPCs.
 
 function	script	sailorfood	{
     mesn;
@@ -39,12 +39,12 @@ L_Fine:
 L_RandomB:
     mesq l("Thanks for the help!");
     next;
-    mesq l("These boxes are much too heavy to be lifted by one, all the way onto the ship.");
+    mesq l("These boxes are way too heavy to be lifted by only one person, all the way onto the ship.");
 
     close;
 
 L_RandomC:
-    mesq l("I think I'll be done soon, since I almost have a box full of @@s!", getitemlink(706));
+    mesq l("I think I'll be done soon, since I almost have a box full of @@s!", getitemlink(CrocClaw));
     next;
     mesq l("And you? How's it going on your side?");
     next;
diff --git a/npc/functions/sailortalk.txt b/npc/functions/sailortalk.txt
index 363f7c6b..38225d4e 100644
--- a/npc/functions/sailortalk.txt
+++ b/npc/functions/sailortalk.txt
@@ -13,9 +13,9 @@ function	script	sailortalk	{
     if (.@rand == 1)
     {
         speech 4,
-            l("These purple mushrooms, are called @@. There are plenty of 'em on this island!", getitemlink(515)),
-            l("It's a kind of mushroom that tastes like a marshmallow and looks like a plush! @@, get it?", getitemlink(515)),
-            l("These funny fungi are mushrooming all around this island. Just pick some @@s and have a try.", getitemlink(515));
+            l("These purple mushrooms are called @@s. There are plenty of 'em on this island!", getitemlink(Plushroom)),
+            l("It's a kind of mushroom that tastes like a marshmallow and looks like a plush! @@, get it?", getitemlink(Plushroom)),
+            l("These funny fungi are mushrooming all around this island. Just pick some @@s and have a try.", getitemlink(Plushroom));
     }
     if (.@rand == 2) npctalk3 l("Good to hear from you!");
     if (.@rand == 3) npctalk3 l("So finally someone has came to visit me?");