Merge branch 'master' into 'master'

Lore edits

Lore updates to match the game's story and grammatical fixes.

See merge request !43

9 files changed, 33 insertions, 36 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index b89aced0..5e8f3867 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -23,7 +23,7 @@ OnTalk:
     next;
 
     mesn "Magic Arpan";
-    mesq lg("Maybe she was one of those who got lost last month. She could be the yoiis from Esperia who got a secret quest from the Legion of Aemil!", "Maybe he was one of those who got lost last month? He could be the yoiis from Esperia who got a secret quest from the Legion of Aemil!");
+    mesq lg("Maybe she was one of those who got lost last month. She could be the yoiis from Esperia who got a secret diplomatic mission from the Legion of Aemil!", "Maybe he was one of those who got lost last month? He could be the yoiis from Esperia who got a secret diplomatic mission from the Legion of Aemil!");
     next;
 
     mesn "Elmo";
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 55588ace..5d66a28c 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -29,12 +29,12 @@ OnTouch:
     next;
 
     setcamnpc "Sailors", -64, -32;
-    mesn "Orc Voice";
+    mesn "Kralog Voice";
     mesq lg("Hey Frenchy!");
     next;
 
     setcamnpc "Sailors", 0, -32;
-    mesn "Elven Voice";
+    mesn "Human Voice";
     mesq lg("Why Frenchy? It's a Russian!");
     next;
 
@@ -45,7 +45,7 @@ OnTouch:
 
     setcamnpc;
     mesn "Raijin Voice";
-    mesq lg("You stupid, she's english, look at the shape of her head.", "You stupid, he's english, look at the shape of his head.");
+    mesq lg("You stupid, she's English, look at the shape of her head.", "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/fexil.txt b/npc/000-1/fexil.txt
index f404cf44..de72aec2 100644
--- a/npc/000-1/fexil.txt
+++ b/npc/000-1/fexil.txt
@@ -10,7 +10,7 @@
     next;
     mesq l("I have some clothes and other things for you at a fine price!");
     next;
-    mesq l("What I sell comes from every corner of this archipelago.");
+    mesq l("What I sell comes from every corner of Gasaron. From Esperia to the Land of Fire!");
     next;
     mesq lg("Interested?");
     next;
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index a4ac7467..93cfeb7f 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -46,7 +46,7 @@ L_Sailors:
     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(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.");
+    mesq l("While Jalad and Ale like to work together, as they usually do on the ship, last time I've seen them, they were near the big lake, north from here.");
     next;
     mesq l("They shouldn't be too far from each other.");
     next;
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index db2b76db..7cc3c32b 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -21,7 +21,7 @@
     mesn;
     mesq lg("Hehe, no. But I'm sure a fox like you would love to meet a catch like me!", "Hehe, no. But I'm sure a noob like you would like to meet an idol like me.");
     next;
-    mesq lg("So, which good wind brought you here? Were you on your raft to meet me? Or is it because you've heard of my feats at Artis?", "So, which good wind brought you here? Were you on your raft to meet my Julia? Or is it because you wanted to see the beautiful waitress' at Artis?");
+    mesq lg("So, what good wind brought you here? Were you on your raft to meet me? Or is it because you've heard of my feats in Artis?", "So, what good wind brought you here? Were you on your raft to meet my Julia? Or is it because you wanted to see the beautiful waitresses of Artis?");
     next;
 
     menu
@@ -31,7 +31,7 @@
 
     mes "";
     mesn;
-    mesq lg("My beauty, I was not always a sailor, you know, I was once an important individual!", "My friend, I was not always a sailor, you know, I was once an important individual!");
+    mesq lg("My beauty. I was not always a sailor, you know, I was once an important individual!", "My friend. I was not always a sailor, you know, I was once an important individual!");
     next;
     mesq l("Before...");
     next;
@@ -70,7 +70,7 @@
     mesn;
     mesq l("Oh really? How could I forget something as important as that?!");
     next;
-    mesq l("I think that my wine has a great quality! I'm on my second bottle and I already... What were we talking about again?");
+    mesq l("I think that my wine is of great quality! I'm on my second bottle and I already... What were we talking about again?");
 
     close;
 
@@ -111,7 +111,7 @@ L_Piou:
     mesn;
     mesq l("Seriously?!");
     next;
-    mesq l("Hurry, hurry! We need to check it's teeth!");
+    mesq l("Hurry, hurry! We need to check its teeth!");
 
     close;
 
@@ -120,9 +120,9 @@ L_Artis:
     mesn;
     mesq l("Artis is a very nice place. There are some hot chicks...");
     next;
-    mesq l("The elven from the library flirted with me a while ago, so has Enora from the Legion.");
+    mesq l("The Raijin from the library flirted with me a while ago, so has Enora from the Legion.");
     next;
-    mesq l("Oh, and Olga from the market place as well!");
+    mesq l("Oh, and Olga from the marketplace as well!");
     next;
     mesq l("You should look for them when we arrive at the port. You won't regret it! Ehehe...");
 
@@ -138,7 +138,7 @@ L_ForeverAlone:
 L_Sailors:
     mes "";
     mesn;
-    mesq l("What? Why? They aren't sexier than me, why do you want to see them?");
+    mesq l("What? Why? They aren't more attractive than me, why do you want to see them?");
     next;
     mesq l("And what would you give me in exchange for that information?");
     next;
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 8206a0b9..641727ec 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -142,7 +142,7 @@
     function	chooseLang	{
         mes "";
         mesn;
-        mesq l("Of course! Tell me which language you speak and I will change the note on the ship board list.");
+        mesq l("Of course! Tell me which language you speak and I will change the note on the ship passenger list.");
         next;
 
         select
@@ -234,7 +234,7 @@
         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 the Legion of Aemil, 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 Legion of Aemil, one of the four main guilds of Gasaron. Does that help you remember anything, anything at all?");
         next;
 
         select
@@ -318,7 +318,7 @@ OnTouch:
     next;
     mesq lg("I'm glad to see you're okay.");
     next;
-    mesq lg("Could I ask you what your native language is? A sailor told me you're russian, but another one told me you're french... I'm a bit lost. I will register you on the ship boarding list just after that.");
+    mesq lg("Could I ask you what your native language is? A sailor told me you're Russian, but another one told me you're French... I'm a bit lost. I will register you on the ship passenger list just after that.");
     next;
     chooseLang "";
     mainMenu;
diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt
index 199f3f91..968d8c92 100644
--- a/npc/000-2-3/sailors.txt
+++ b/npc/000-2-3/sailors.txt
@@ -26,7 +26,7 @@ OnTouch:
     mesn "Elmo";
     mesq l("I will.");
     next;
-    mesq l("About the Legion of Aemil in Esperia, I'm not sure about them, frankly.");
+    mesq l("About the Legion of Aemil, 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/001-2-5/books.txt b/npc/001-2-5/books.txt
index 7e361ec6..a06c36e7 100644
--- a/npc/001-2-5/books.txt
+++ b/npc/001-2-5/books.txt
@@ -2,18 +2,18 @@
 // Authors:
 //    Reid
 // Description:
-//    Aemil
+//    Gasaron
 
 001-2-5,30,32,0	script	#001-2-5-Book1	NPC_NO_SPRITE,{
 
     function read_book {
         narrator 1,
-            l("There are two kinds of dialogue, the one with citizen, and the one with other adventurer."),
-            l("When you go near a villager, you can see a speech bubble ahead of him, you can then talk to him by pressing the [T] key."),
+            l("There are two kinds of dialogue, the ones with regular citizens, and the ones with other adventurers."),
+            l("When you go near villagers, you can see a speech bubble above them, you can then talk to them by pressing the [T] key."),
             l("You can select a specific person with the [N] key, and then, press the [T] key when you are surrounded by more than one person."),
             l("You can also simply talk to any citizen around you by clicking on them."),
-            l("Nevertheless, you can talk with another adventurer by pressing the [Enter] key and then type what you want say!"),
-            l("If you have to say something to a specific player, you can type \"\\query Playername\" or \"\\whisper Playername message\", this will create a new tab on your chat window.");
+            l("Nevertheless, you can talk with another adventurer by pressing the [Enter] key and then type what you want to say!"),
+            l("If you want to say something to a specific player, you can type \"\\query Playername\" or \"\\whisper Playername message\", this will create a new tab on your chat window.");
     }
 
 OnShelfUse:
diff --git a/npc/001-2-6/books.txt b/npc/001-2-6/books.txt
index d1842323..231785d6 100644
--- a/npc/001-2-6/books.txt
+++ b/npc/001-2-6/books.txt
@@ -1,6 +1,7 @@
 // Evol scripts.
 // Authors:
 //    Reid
+//    WildX
 // Description:
 //    Aemil
 
@@ -146,22 +147,18 @@ OnInit:
 
     function read_book {
         narrator 1,
-            l("Aemil is a magnificent world unknown to us all."),
-            l("Its inhabitants did not know any kind of horror and in peace they lived as the earth gave them everything they needed to live."),
-            l("However, drought came with summers while winters became colder than ever."),
-            l("Therefore, starvation stalked the people of Aemil."),
-            l("Authorities began to control in order to have a peaceful society. This did not work well for long."),
-            l("People started to steal from each other to survive. As cities grew, needs did too. Wars for fertile lands then rose."),
-            l("New technologies assisted the slaughter instead of establishing peace. At some point, two different rivals were formed."),
+            l("Aemil was once a magnificent land unknown to us all."),
+            l("Before the end of the Mana War, a band of adventurers formed in the Ancean region of Argaes from those who had lost their homes and families."),
+            l("They sailed from Hurnscald to Tulimshar and then Nivalis, the last permanent settlements of humans."),
+            l("There, they gathered merchants and warriors to join them in a journey to find a new land on which to live."),
+            l("The group found the support of Tulimshar's merchant lords and was given ships to sail east."),
+            l("They sailed past the Clear Sea and towards the Long Ocean which nobody had explored before.."),
+            l("The newly created Fleet of Ancea travelled so far that they were never heard from again."),
             l("Their leaders then came to the conclusion that an alliance was the only way they could survive."),
-            l("The great people of Aemil split up into three groups when they reached the coast."),
-            l("Each of the groups was ordered to sail in a different direction to find a new, suitable land where to live."),
-            l("As they sailed on Oceania, great waters of Aemil, one of the alliances found a land."),
-            ("Even though they did not hear anything about the other groups, they decided to start a new life on this land, full of harmful animals."),
-            l("This new continent, in fact an archipelago, was called Andorra."),
-            l("A great city, now the capital of these islands, called Esperia, rose on the single island, Aurora, where everyone lived."),
+            l("They eventually found a new land after much hardship and named it Aurora, after its beautiful sunrise."),
+            l("A great city, eventually to become larger than the cities of Ancea, rose on the coast of Aemil. This city was named Esperia."),
             l("However..."),
-            l("The end of the story got erased, probably because of the sea water. Some pages are still missing. Thus much is left obscure, including the author's name.");
+            l("The end of the story got erased, probably because of the sea water. Some pages are still missing. Thus much is lost to time, including the author's name.");
     }
 
 OnUse: