Replaced some item IDs by their names in scripts.

Added missing commands when the NPC gives an item.
Fixed some language.

11 files changed, 83 insertions, 66 deletions

diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index 24e0073c..72fb0ab5 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -31,7 +31,8 @@
     mesq l("Hmm... Let's see, take this one.");
     next;
 
-    if (checkweight("AquadaBox", 1) == 0) goto l_CantGive;    
+    getinventorylist;
+    if ((checkweight("AquadaBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
     setq ShipQuests_Ale, 1;
     getitem "AquadaBox", 1;
 
@@ -64,12 +65,12 @@ l_CallFunc:
 
     close;
 
-l_CantGive:
+l_Inventory;
     mes "";

     mesn;

-    mesq l("It seems that you can't carry more box yet.");

+    mesq l("It looks like you can't carry anymore of these boxes for now.");

     next;

-    mesq lg("Just come back to me once you'll have some more free place.");

+    mesq l("You should come back when you'll have some free space.");

 
     close;
 
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index f47d5eac..1a853906 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -59,7 +59,8 @@
     mesq lg("You have been so nice to me. So please, take one.");

     next;

 
-    if (checkweight("CroconutBox", 1) == 0) goto l_CantGive;    

+    getinventorylist;
+    if ((checkweight("CroconutBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;

     setq ShipQuests_Astapolos, 1;

     getitem "CroconutBox", 1;

     

@@ -69,12 +70,12 @@
 
     close;

 

-l_CantGive:
+l_Inventory;
     mes "";

     mesn;

-    mesq l("It seems that you can't carry more box yet.");

+    mesq l("It looks like you can't carry anymore of these boxes for now.");

     next;

-    mesq lg("Just come back to me once you'll have some more free place.");

+    mesq l("You should come back when you'll have some free space.");

 
     close;
 

diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index 269eccf5..db08b998 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -27,9 +27,9 @@ l_Give:
     if (@q > 1) goto l_Close;
     setq ShipQuests_Darlin, 2;
     set zeny, zeny + 400;
-    getitem 508, 1;
-    getitem 509, 1;
-    getitem 514, 1;
+    getitem SeaDrops, 1;
+    getitem Aquada, 1;
+    getitem OldBook, 1;
     message strcharinfo(0), l("You open the treasure chest.");
     close;
 
diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt
index 8a39b584..5969fce1 100644
--- a/npc/000-1/couwan.txt
+++ b/npc/000-1/couwan.txt
@@ -44,6 +44,8 @@
     mesq l("Yeye ask too much but do too less. Take this box and stop talking.");
     next;
 
+    getinventorylist;
+    if ((checkweight("FishBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
     mesn "Narrator";
     mes col(l("Couwan hands you a box full of fish."), 9);
     getitem "FishBox", 1;
@@ -77,6 +79,15 @@ l_QuestGiven:
 
     close;
 
+l_Inventory;
+    mes "";

+    mesn;

+    mesq l("Yeye can't even carry one of these yoyoxes!");

+    next;

+    mesq l("Yeye should come back when yey'll have some free space.");

+
+    close;
+
 l_QuestDone:
     mesn;
     mesq l("What are you looking at?");
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index a0844355..2f402688 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -32,11 +32,11 @@ OnTalk:
     if (@nard > 1 || @gugli == 2) goto l_TaskCompleted;
     if (@gugli == 1) goto l_TaskGiven;
 
-    mesq l("Hi @@, I heard the captain sent you down here, uh?", strcharinfo(0));
+    mesq lg("Hi @@, I heard the captain sent you down here, uh?", strcharinfo(0));
     next;
     mesq l("An unexpected help is always welcome!");
     next;
-    mesq l("As you may know, we are long distance travellers and our whole crew needs to store enough food to survive. You don't know how dangerous the sea life can be.");
+    mesq l("As you may know, we are long distance travelers and our whole crew needs to store enough food to survive. You don't know how dangerous the sea life can be.");
     next;
 
     menu
@@ -81,7 +81,7 @@ 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,
-        l("Who should I search?"), l_SailorNames,
+        l("Who should I search for?"), l_SailorNames,
         l("Where can I find your crew?"), l_Location,
         l("See you!"), close;
 
@@ -94,7 +94,7 @@ l_MenuDone:
 l_SailorNames:
     mes "";
     mesn;
-    mesq l("Ale and Tibbo should bring 2 boxes of @@, Astapolos and Gulukan 2 of @@ and Jalad and Q'Muller were charged of the boxes of @@.", getitemlink("Aquada"), getitemlink("Croconut"), getitemlink("Plushroom"));
+    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?");
 
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index c6327b21..5feba413 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -22,8 +22,8 @@
 
     menu
         l("Wow, it seems everyone knows my name!"), -,
-        l("Well, it isn't a bad sensation to finally feel something beneath my feet."), l_Continue,
-        l("Not so good. I would feel better on Nard's ship."), close;
+        l("Well, it it's not bad to finally feel something beneath my feet."), l_Continue,
+        l("Not so good actually... I would feel better on Nard's ship."), close;
 
 l_Name:
 
@@ -53,7 +53,8 @@ l_Continue2:
     mesq l("Anyway I am glad I can give you some of these yoyoxs.");
     next;
 
-    if (checkweight("CroconutBox", 1) == 0) goto l_CantGive;    
+    getinventorylist;
+    if ((checkweight("CroconutBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
     setq ShipQuests_Gulukan, 1;
     getitem "CroconutBox", 1;
     
@@ -126,12 +127,12 @@ l_RandomC:
 
     close;
 
-l_CantGive:
+l_Inventory;
     mes "";

     mesn;

-    mesq l("It seems that you can't carry more yoyox yet.");

+    mesq l("It looks like you can't carry anymore of these yoyox for now.");

     next;

-    mesq lg("Yoiis should come back to me once yey'll have some more free place.");

+    mesq l("Yoiis should come back when yey'll have some free space.");

 
     close;
 
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index 28304e2e..44183c45 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -22,7 +22,7 @@
 
     menu
         l("I was going to ask you if you would need any help."), l_Continue,
-        l("What is exactly your real job?"), -;
+        l("What exactly is your real job?"), -;
 
     mes "";
     mesn;
@@ -39,7 +39,8 @@
     mesq l("Surely. Take this box full of @@s.", getitemlink("Plushroom"));
     next;
 
-    if (checkweight("PlushroomBox", 1) == 0) goto l_CantGive;    
+    getinventorylist;
+    if ((checkweight("PlushroomBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
     setq ShipQuests_Jalad, 1;
     getitem "PlushroomBox", 1;
 
@@ -72,12 +73,12 @@ l_CallFunc:
 
     close;
 
-l_CantGive:
+l_Inventory;
     mes "";

     mesn;

-    mesq l("It seems that you can't carry more box yet.");

+    mesq l("It looks like you can't carry anymore of these boxes for now.");

     next;

-    mesq lg("Just come back to me once you'll have some more free place.");

+    mesq l("You should come back when you'll have some free space.");

 
     close;
 
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 34e3e004..b8277783 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -43,7 +43,8 @@
     mesq l("Well then... Take this one!");
     next;
 
-    if (checkweight("PlushroomBox", 1) == 0) goto l_CantGive;    
+    getinventorylist;
+    if ((checkweight("PlushroomBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;   
     setq ShipQuests_QMuller, 1;
     getitem "PlushroomBox", 1;
 
@@ -76,12 +77,12 @@ l_CallFunc:
 
     close;
 
-l_CantGive:
+l_Inventory;
     mes "";

     mesn;

-    mesq l("It seems that you can't carry more box yet.");

+    mesq l("It looks like you can't carry anymore of these boxes for now.");

     next;

-    mesq lg("Just come back to me once you'll have some more free place.");

+    mesq l("You should come back when you'll have some free space.");

 
     close;
 
@@ -122,7 +123,7 @@ l_NoTask:
 l_TaskDone:
     mes "";
     mesn;
-    mesq l("That's good to hear!");
+    mesq l("Good to hear!");
 
     close;
 
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index 0e92cd75..43561501 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -13,9 +13,9 @@
     setcamnpc "Max";
 
     mesn "Max";
-    mesq l("@@? Welcome my dear!", strcharinfo(0));
+    mesq lg("@@? Welcome my dear!", strcharinfo(0));
     next;
-    mesq l("Last time I have seen you, you were lost in the sea on your raft.");
+    mesq lg("Last time I saw you, you were lost in the sea on your raft.");
     next;
 
     setcamnpc "Sapartan";
@@ -26,12 +26,12 @@
     next;
 
     menu
-        l("Thank you sir for you nice words, I'm feeling good."), -,
-        l("I'm still a bit weak at the moment. Better if we talk later."), close;
+        l("Thank you sir for you nice words. I am feeling better now."), -,
+        lg("I'm still a bit weak at the moment. We should probably talk later."), close;
 
     mes "";
     mesn;
-    mesq l("So now you can stay a bit here with your new friends enjoying the warm sands of this little island.");
+    mesq l("You can now stay with your new friends and enjoy the warm sand of this little island.");
     next;
     mesq l("But remember that not every place in this world is peaceful and safe nowadays. Even the white shores you are walking on can hide some dangerous beings.");
     next;
@@ -43,47 +43,47 @@
 
     mes "";
     mesn "Max";
-    mesq l("Come on Sap! You are scaring our guest with your stories.");
+    mesq lg("Come on Sap! You are scaring our guest with your stories.");
     next;
-    mesq g(l("I'm sure soon she will be able to fight creatures a way more dangerous of tortugas living in this island."),
-           l("I'm sure soon he will be able to fight creatures a way more dangerous of tortugas living in this island."));
+    mesq g(l("I'm sure she will soon be able to fight creatures living here a way more dangerous than tortugas do."),
+           l("I'm sure he will soon be able to fight creatures living here a way more dangerous than tortugas do"));
     next;
 
     setcamnpc "Sapartan";
 
     mes "";
     mesn;
-    mesq l("Maybe. But I prefer having well-trained people around me when it comes to deal with dangerous creatures. Do you feel already expert on how to fight enemies?");
+    mesq l("Maybe... But I prefer having well-trained people around me when it comes to fight against dangerous creatures. Do you already feel expert on how you fight enemies?");
     next;
 
     menu
-        l("No I don't and I would like to know somethingh more."), -,
-        l("No I've just killed some little Pious in the ship."), -,
-        l("Yes, I feel I'm trained enough for combat."), close;
+        l("No, I don't, but I would like to know more about that."), -,
+        l("Well... I've only killed some little pious in the ship, that's all."), -,
+        l("Yes, I feel strong enough for dangerous combats!"), close;
 
     mes "";
     mesn;
-    mesq l("Than I can give you some tips about it.");
+    mesq l("Then I can give you some tips about fights.");
     next;
-    mesq l("First rule in combat: evaluate your enemy.");
+    mesq l("The first thing you should do is to evaluate your enemy.");
     next;
-    mesq l("You can find monsters which are easy to kill and others that are just impossible to defeat. Do not dare to much with creatures are too powerful for you... You'll risk your life.");
+    mesq l("You can easily see if a monster is easy to kill or just impossible to defeat. Do not try against creatures that are way more powerful than you... You'd be risking your life for nothing.");
     next;
-    mesq l("Second. Choose the weapon is suited for you. Some people like to face their enemy closely with an heavy axe, others prefer to attack from the distance with a bow.");
+    mesq l("Secondly, choose wisely which weapon is suited for you. Some people like to face their enemies closely with a heavy axe, some others prefer to attack from a distance with a bow for example.");
     next;
 
     menu
-        l("What is the difference?"), -;
+        l("Yeah, well what's the difference?"), -;
 
     mes "";
     mesn;
-    mesq l("Ranged weapons are generally weaker than melee ones, but it obviously depends on the level of the weapon. On the other hand you attack from a safer position.");
+    mesq l("On one hand, ranged weapons are generally weaker than melee ones, but it obviously depends on the level of the weapon. On the other hand, you attack from a safer position.");
     next;
-    mesq l("After you have chosen the right weapon you need also to know how to use it.");
+    mesq l("After choosing your weapon, you also need to know how to use it.");
     next;
-    mesq l("You can attack a monster by clicking directly on it. Once selected you will notice a bar near your target that shows you how much health it has.");
+    mesq l("You can attack a monster by clicking directly on it. Once selected, you may notice a bar near your target showing you how much health it has left.");
     next;
-    mesq l("You can also attack an enemy from your keyboard pressing the 'A' key to select it, and the 'Ctrl' key to attack it.");
+    mesq l("You can also attack an enemy from your keyboard pressing the 'A' key to select it, and the 'Ctrl' key to attack it, this of course works if you didn't change your keyboard keys yet.");
     next;
 
     menu
@@ -92,7 +92,7 @@
 
     mes "";
     mesn;
-    mesq l("You're welcome. If you don't remember something, come back to us!");
+    mesq l("You're welcome. If you can't remember something, just come back here!");
     next;
 
     close;
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 96b5f7da..3f920fb5 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -15,7 +15,7 @@
 
     menu
         l("Hello... Do I know you?"), -,
-        l("Fine, could you tell me where I can find Gugli's sailors?"), l_Sailors,
+        l("Fine thank you. Could you please tell me where I can find Gugli's sailors?"), l_Sailors,
         l("Uhm, bye."), l_Quit;
 
     mes "";
@@ -117,7 +117,7 @@ l_Artis:
     mesn;
     mesq l("This is a nice place... There are some nice chicks...");
     next;
-    mesq l("The elven from the library has tilted on me a while ago, as well as Enora from the warrior guild.");
+    mesq l("The elven from the library has tilted on me a while ago, as well as Enora from the Warrior Guild.");
     next;
     mesq l("Oh, and Olga from the market place as well!");
     next;
@@ -140,25 +140,25 @@ l_Quit:
 l_Sailors:
     mes "";
     mesn;
-    mesq l("What? Why? They aren't more sexy than me, why do you want to see them?");
+    mesq l("What? Why? They aren't sexier than me, why do you want to see them?");
     next;
-    mesq l("And what do you give me against these informations?");
+    mesq l("And what do you give me in exchange for these informations?");
     next;
 
     setcamnpc "Gugli";
 
     mesn "Gugli";
-    mesq g(l("Don't bother her Silvio, or I'll need to tell her that you cry like a baby when you hear a thunder in the night."),
-           l("Don't bother him Silvio, or I'll need to tell him that you cry like a baby when you hear a thunder in the night."));
+    mesq g(l("Don't bother her Silvio, or I'll to tell her that you cry like a baby when you hear the thunder in the night."),
+           l("Don't bother him Silvio, or I'll to tell him that you cry like a baby when you hear the thunder in the night."));
     next;
     restorecam;
 
     mesn;
     mesq l("I...");
     next;
-    mesq l("How could you... We said that we won't talk about this again...");
+    mesq l("How could you... We said we wouldn't talk about this again...");
     next;
-    mesq l("Tibbo is gone to the east-south part of the island, others are gone to the north, and I think that Gulukan is not so far from here.");
+    mesq l("Tibbo went to the east-south of the island, others are gone to the north, and I think that Gulukan is not so far from here.");
     next;
     mesq l("But anyway, take the road which goes to the north to find everybody.");
     next;
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index 2459ab42..c601f364 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -40,7 +40,8 @@
     mesq l("Bring this box to Gugli. He will be extremely happy!");
     next;
 
-    if (checkweight("AquadaBox", 1) == 0) goto l_CantGive;    
+    getinventorylist;
+    if ((checkweight("AquadaBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
     setq ShipQuests_Tibbo, 1;
     getitem "AquadaBox", 1;
 
@@ -72,12 +73,12 @@ l_CallFunc:
 
     close;
 
-l_CantGive:
+l_Inventory;
     mes "";

     mesn;

-    mesq l("It seems that you can't carry more box yet.");

+    mesq l("It looks like you can't carry anymore of these boxes for now.");

     next;

-    mesq lg("Just come back to me once you'll have some more free place.");

+    mesq l("You should come back when you'll have some free space.");

 
     close;
 
@@ -110,7 +111,7 @@ l_NoTask:
 l_TaskDone:
     mes "";
     mesn;
-    mesq l("Perfect!");
+    mesq l("Awesome!");
 
     close;