summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlige <aligetmw@hotmail.fr>2012-11-30 10:21:53 +0400
committerAlige <aligetmw@hotmail.fr>2012-11-30 10:21:53 +0400
commite5e41bd924b45d2d15b3175413a3a7a520396dee (patch)
treeb98143b49bd16e9ce32afe95d6b37d4c1667142b
parentecf8da4a5520496e6c678ee600a85b63a7e62a02 (diff)
downloadserverdata-e5e41bd924b45d2d15b3175413a3a7a520396dee.tar.gz
serverdata-e5e41bd924b45d2d15b3175413a3a7a520396dee.tar.bz2
serverdata-e5e41bd924b45d2d15b3175413a3a7a520396dee.tar.xz
serverdata-e5e41bd924b45d2d15b3175413a3a7a520396dee.zip
Replaced some item IDs by their names in scripts.
Added missing commands when the NPC gives an item. Fixed some language.
-rw-r--r--npc/000-0-0/sailors.txt12
-rw-r--r--npc/000-0/sailors.txt8
-rw-r--r--npc/000-1/ale.txt9
-rw-r--r--npc/000-1/astapolos.txt9
-rw-r--r--npc/000-1/chest.txt6
-rw-r--r--npc/000-1/couwan.txt11
-rw-r--r--npc/000-1/gugli.txt8
-rw-r--r--npc/000-1/gulukan.txt13
-rw-r--r--npc/000-1/jalad.txt11
-rw-r--r--npc/000-1/muller.txt11
-rw-r--r--npc/000-1/sapartan.txt44
-rw-r--r--npc/000-1/silvio.txt16
-rw-r--r--npc/000-1/tibbo.txt11
-rw-r--r--npc/000-2-0/billybons.txt4
-rw-r--r--npc/000-2-0/julia.txt6
-rw-r--r--npc/000-2-0/note.txt2
-rw-r--r--npc/000-2-1/alige.txt13
-rw-r--r--npc/000-2-1/arpan.txt14
-rw-r--r--npc/000-2-1/knife.txt17
-rw-r--r--npc/000-2-3/box.txt13
-rw-r--r--npc/000-2-3/nard.txt13
-rw-r--r--npc/000-2-3/sailors.txt2
-rw-r--r--npc/items/croconut.txt8
23 files changed, 163 insertions, 98 deletions
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 84fbdccb..817be0d7 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -15,7 +15,7 @@ OnTalk:
next;
mesn "Magic Arpan";
- mesq lg("Yeye, it's the logo of the warrior guild of Esperia, I wonder what this yoiis was doing so far away from the coast.");
+ mesq lg("Yeye, it's the logo of the Warrior Guild of Esperia! I wonder what this yoiis was doing so far away from the coast.");
next;
mesn "Elmo";
@@ -23,8 +23,8 @@ OnTalk:
next;
mesn "Magic Arpan";
- mesq g(l("Maybe she was one of those who got lost last month? The yoiis from Esperia that got a secret quest from the Warrior guild!"),
- l("Maybe he was one of those who got lost last month? The yoiis from Esperia that got a secret quest from the Warrior guild!"));
+ mesq g(l("Maybe she was one of those who got lost last month? The yoiis from Esperia that got a secret quest from the Warrior Guild!"),
+ l("Maybe he was one of those who got lost last month? The yoiis from Esperia that got a secret quest from the Warrior Guild!"));
next;
mesn "Elmo";
@@ -45,8 +45,8 @@ OnTalk:
next;
mesn "Elmo";
- mesq g(l("Oh, and give her some basic clothes, the poor girl, the one she had were in even worse condition that the ones we have!"),
- l("Oh, and give him some basic clothes, the poor guy, the one he had were in even worse condition that the ones we have!"));
+ mesq g(l("Oh, and give her some clothes, the poor girl, the ones she had were in even worse condition that the ones we have!"),
+ l("Oh, and give him some clothes, the poor guy, the ones he had were in even worse condition that the ones we have!"));
next;
mesn "Magic Arpan";
@@ -54,7 +54,7 @@ OnTalk:
next;
mesn "Elmo";
- mesq l("Hehe... Ok, I'm going to inform the captain up there.");
+ mesq l("Hehe... Ok, I'm going to inform the capt'n up there.");
next;
mesn "Magic Arpan";
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index dcf89f31..a17c1ccb 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -18,11 +18,11 @@ OnTouch:
next;
mes col(l("You realize you can't remember anything."), 9);
next;
- mes col(l("Suddenly, you hear a voice from the sky."), 9);
+ mes col(l("Suddenly, you hear a voice up in the sky."), 9);
next;
mes col(l("As you open your eyes, you see a large ship before you."), 9);
next;
- mes col(l("Aboard stand sailors trying to talk to you."), 9);
+ mes col(l("Aboard stand sailors trying to communicate with you."), 9);
next;
mesn "Orc Voice";
@@ -38,8 +38,8 @@ OnTouch:
next;
mesn "Raijin Voice";
- mesq g(l("You stupid, she's english, look at the shape of the head."),
- l("You stupid, he's english, look at the shape of the head."));
+ mesq g(l("You stupid, she's english, look at the shape of her head."),
+ l("You stupid, he's english, look at the shape of his head."));
next;
mesq l("Hey you! Can you hear us? Are you okay?");
next;
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;
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 3aa4c3d6..3e4ba406 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -62,7 +62,7 @@
l_Secret:
mes "";
mesn;
- mesq l("Hear me *hic* well, what ever, whatididever you will *hic* said ab... uhm... out what?! You saw there, the Guild of Esperia won't let it get public.");
+ mesq l("Hear me *hic* well, what ever, whatididever you will *hic* said ab... uhm... out what?! You saw there, the Warrior Guild of Esperia won't let it get public.");
next;
mesq l("Nobody will know about the existence of the Mercurians.");
next;
@@ -80,7 +80,7 @@ l_Quit:
mesn;
mesq l("Yeah you're all like *hic* that in Esperia, but you won't get me! *burp*");
next;
- mesq l("I'm not that numb eeh *hic* what did ever you disco... *hic* ...vered there, the warrior guild won't get me!");
+ mesq l("I'm not that numb eeh *hic* what did ever you disco... *hic* ...vered there, the Warrior Guild won't get me!");
next;
mesn "Narrator";
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 60d5e141..0b0e5170 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -141,7 +141,7 @@ l_WhereIam:
mesn;
mesq l("You're on a ship, we're on our way to the commercial capital of Artis.");
next;
- mesq l("We should be there in a few days, once we arrive, I will warn the warrior guild about what happened, I'm sure they can help.");
+ mesq l("We should be there in a few days, once we arrive, I will warn the Warrior Guild about what happened, I'm sure they can help.");
next;
mesq l("But for now, you can relax on the ship, or visit the island we're docked at! Its a small island, but a good place to get some exercise and stretch your legs.");
next;
@@ -157,7 +157,7 @@ l_What:
next;
mesq lg("You were in bad shape, you should be happy we found you before the sea killed you.");
next;
- mesq l("Oh, and there was this inscription on your raft. It represents one of the warrior guild of Esperia, the largest and biggest guild of the whole new world. Does that make you remember anything, anything at all?");
+ mesq l("Oh, and there was this inscription on your raft. It represents the Warrior Guild of Esperia, the largest and biggest guild of the whole new world. Does that make you remember anything, anything at all?");
next;
goto l_EsperiaMenu;
@@ -209,7 +209,7 @@ l_Regret:
next;
menu
- l("Ehm... He was really upset for some past stories."), -;
+ l("Ehm... He was really upset because of some past stories."), -;
mes "";
mesq l("Gado! That coward lives in the past, I will ask Nard to punish him, again!");
diff --git a/npc/000-2-0/note.txt b/npc/000-2-0/note.txt
index ee8b5acf..cc6fde64 100644
--- a/npc/000-2-0/note.txt
+++ b/npc/000-2-0/note.txt
@@ -28,7 +28,7 @@
next;
mesq col(l("Does somebody know a good place to hang out in Esperia? - M. Arpan"), 9);
next;
- mes col(l("Some more things are written down but it's not legible."), 9);
+ mes col(l("Other things are written down but are not legible."), 9);
close;
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 571070e6..8267f997 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -169,6 +169,8 @@ l_GiveFood:
l_GiveReward:
if (countitem(@id) < 1) close;
+ getinventorylist;
+ if ((checkweight("Piberries", 3) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
delitem @id, 1;
mes "";
@@ -179,6 +181,15 @@ l_GiveReward:
getitem "Piberries", rand(1,3);
close;
+l_Inventory;
+ mes "";
+ mesn;
+ mesq l("It looks like you can't carry anything else for now.");
+ next;
+ mesq l("You should come back when you'll have some free space.");
+
+ close;
+
l_NoReward:
mes "";
mesn;
@@ -230,7 +241,7 @@ l_IntroMenu:
mesn "Narrator";
mes col(l("You can attack a monster by clicking on it or from your keyboard you can press the A key to select the monster followed by 'Ctrl' to attack it."), 9);
next;
- mes col(l("Once the monster is dead, click with your mouse on the dropped item to add it to your inventory or you can use the Z key to claim the drop as well."), 9);
+ mes col(l("Once the monster is dead, click on the dropped items to add them to your inventory. You can also use the Z key to claim the drops."), 9);
close;
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 81d52382..a0122913 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -108,11 +108,11 @@ OnClothNotTaken:
OnEquip:
mesn "Narrator";
- mes col(l("If you would like to open your inventory use the F3 key or use your mouse to select it in the above menu in your client."), 9);
+ mes col(l("To open your inventory, use the F3 key or use your mouse to select it in the above menu in your client."), 9);
next;
- mes col(l("Once you're inside of your inventory, you may equip the item by selecting it and clicking 'Equip'. Alternately, you can unequip an item by clicking on 'unequip'."), 9);
+ mes col(l("When your inventory is open, you can equip an item by selecting it and clicking 'Equip'. You can do the same to unequip an item by clicking on 'Unequip'."), 9);
next;
- mes col(l("Certain items perform different effects. Some will heal you, some you may use as weapons or armor, and some can be sold for gold."), 9);
+ mes col(l("Items have different effects. Some will heal you, some can be used as weapons or armor, and some can be sold for gold."), 9);
close;
@@ -153,7 +153,7 @@ l_Where:
next;
mesq l("We will be yaying there in a few days, so we will drop you off there.");
next;
- mesq l("You will see, citizens are polite and you can still ask for help in the warrior guild. They can help find a job for you or maybe help you find out what happened to you out at sea!");
+ mesq l("You will see, citizens are polite and you can still ask for help in the Warrior Guild. They can help find a job for you or maybe help you find out what happened to you out at sea!");
next;
goto l_Menu;
@@ -200,11 +200,11 @@ l_WhatCloth:
next;
mesn "Narrator";
- mes col(lg("To open your inventory, use the F3 key or use your mouse in the above menu of your client."), 9);
+ mes col(l("To open your inventory, use the F3 key or use your mouse to select it in the above menu in your client."), 9);
next;
- mes col(lg("When your inventory will be opened, you may equip the item by selecting it and clicking 'Equip'. Alternately, you can unequip an item by selecting 'Unequip' to remove it."), 9);
+ mes col(l("When your inventory is open, you can equip an item by selecting it and clicking 'Equip'. You can do the same to unequip an item by clicking on 'Unequip'."), 9);
next;
- mes col(lg("Items perform different effects. Some will heal you, some you may use as weapons or armor and some can be sold for gold."), 9);
+ mes col(l("Items have different effects. Some will heal you, some can be used as weapons or armor, and some can be sold for gold."), 9);
next;
l_BeforeMenu:
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index 8f570042..71138fac 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -25,16 +25,27 @@
close;
l_Give:
+ getinventorylist;
+ if ((checkweight("Knife", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
setq ShipQuests_Knife, 1;
getitem "Knife", 1;
mes "";
mesn "Narrator";
- mes col(l("If you would like to open your inventory use the F3 key or use your mouse to select it in the above menu in your client."), 9);
+ mes col(l("To open your inventory, use the F3 key or use your mouse to select it in the above menu in your client."), 9);
next;
- mes col(l("Once you're inside of your inventory, you may equip the item by selecting it and clicking 'Equip'. Alternately, you can unequip an item by clicking on 'unequip'."), 9);
+ mes col(l("When your inventory is open, you can equip an item by selecting it and clicking 'Equip'. You can do the same to unequip an item by clicking on 'Unequip'."), 9);
next;
- mes col(l("Items have different effects. Some will heal you, some you may use as weapons or armor, and some can be sold for gold."), 9);
+ mes col(l("Items have different effects. Some will heal you, some can be used as weapons or armor, and some can be sold for gold."), 9);
+
+ close;
+
+l_Inventory;
+ mes "";
+ mesn;
+ mesq l("It looks like you can't carry anything else for now.");
+ next;
+ mesq l("You should come back when you'll have some free space.");
close;
diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt
index 6236f6c1..12f5b10b 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -63,6 +63,8 @@
mesq l("Now go outside and talk with Gugli, he'll tell you what we need.");
next;
+ getinventorylist;
+ if ((checkweight("JohanneKey", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
setq ShipQuests_Nard, 1;
getitem "JohanneKey", 1;
@@ -84,12 +86,23 @@ l_Give:
mesn "Nard";
mesq l("You are now part of the crew. Thanks again for your help.");
+ getinventorylist;
+ if ((checkweight("Bandana", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
setq ShipQuests_Nard, 3;
getitem "Bandana", 1;
// Need to add a skill for the crew at this line.
close;
+l_Inventory;
+ mes "";
+ mesn;
+ mesq l("It looks like you can't carry anything else for now.");
+ next;
+ mesq l("You should come back when you'll have some free space.");
+
+ close;
+
l_Already:
mes "";
mesn "Nard";
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index eed938fb..6f0ceaf4 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -96,6 +96,8 @@ l_NeedContent:
mesq l("Now go outside and talk with Gugli, he'll tell you what we need.");
next;
+ getinventorylist;
+ if ((checkweight("JohanneKey", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
setq ShipQuests_Nard, 1;
getitem "JohanneKey", 1;
@@ -180,6 +182,8 @@ l_ChefQuestComplete:
mesq l("You are now officially part of my crew! Thanks again for your help.");
next;
+ getinventorylist;
+ if ((checkweight("Bandana", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory;
setq ShipQuests_Nard, 4;
getitem "Bandana", 1;
// Need to add a skill for the crew at this line.
@@ -193,6 +197,15 @@ l_ChefQuestComplete:
close;
+l_Inventory;
+ mes "";
+ mesn;
+ mesq l("It looks like you can't carry anything else for now.");
+ next;
+ mesq l("You should come back when you'll have some free space.");
+
+ close;
+
l_Already:
mesn;
mesq l("Sorry, I don't need any help right now. Come back later.");
diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt
index b1eef576..e17e7bc1 100644
--- a/npc/000-2-3/sailors.txt
+++ b/npc/000-2-3/sailors.txt
@@ -24,7 +24,7 @@ OnTouch:
mesn "Elmo";
mesq l("I will.");
next;
- mesq l("About this Esperia's Guild, I'm not sure about them, frankly.");
+ mesq l("About this Esperia's Warrior Guild, I'm not sure about them, frankly.");
next;
mesq l("There are rumors going around that they did some monstrous things and that they are hiding quite a lot from us.");
next;
diff --git a/npc/items/croconut.txt b/npc/items/croconut.txt
index 1092b051..d4f3a729 100644
--- a/npc/items/croconut.txt
+++ b/npc/items/croconut.txt
@@ -13,24 +13,24 @@
OnUse:
mesn "Narrator";
- mes col(l("Do you want to cut this @@?", getitemlink(513)), 9);
+ mes col(l("Do you want to cut this @@?", getitemlink(Croconut)), 9);
next;
menu
l("Yes."), L_Weapon,
l("No."), -;
- getitem 513, 1, 1;
+ getitem Croconut, 1, 1;
close;
L_Weapon:
mes "";
mesn "Narrator";
- mes col(l("Which of your weapons do you want to use in order to cut this @@?", getitemlink(513)), 9);
+ mes col(l("Which of your weapons do you want to use in order to cut this @@?", getitemlink(Croconut)), 9);
next;
menu
- rif(countitem(3500, 1), l(getitemname("Knife"))), L_Weak,
+ rif(countitem(Knife, 1), l(getitemname("Knife"))), L_Weak,
l("Bare Hands"), -;
L_TooWeak: