Rename Julia to Juliet, and progress prologue. Less relevant changes to rules.

This commit does not causes a big divergence from Evol, apart some rules and the
new name for Julia. You do not need to confirm your language at Julia/Juliet anymore.

6 files changed, 54 insertions, 31 deletions

diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt
index be8eb6e3b..f5a945e7d 100644
--- a/npc/002-1/arpan.txt
+++ b/npc/002-1/arpan.txt
@@ -133,7 +133,7 @@ L_OhWell:
 
 L_Story:
     mes "";
-    mesq lg("You were yaying sleeping for quite some time there. Our shipkeeper, Julia, was here with you, and she did her best to heal your injuries.");
+    mesq lg("You were yaying sleeping for quite some time there. Our shipkeeper, Juliet, was here with you, and she did her best to heal your injuries.");
     next;
     if (.@q_julia == 0) setq ShipQuests_Julia, 1;
     mesq lg("Yaya, you should go see her! She'll be happy to see you.");
@@ -151,7 +151,7 @@ L_Menu:
     menu
         rif(.@q_nard == 5 && getq(General_Narrator) < 1, l("What can I do now?")), L_GotoSleep,
         lg("Could you tell me where I am?"), L_Where,
-        lg("Where can I find Julia?"), L_Julia,
+        lg("Where can I find Juliet?"), L_Julia,
         l("Who are you?"), L_Who,
         rif(getq(ShipQuests_ArpanMoney) == 1, lg("Do you know what happened to the gold I had when you guys saved me?")), L_WhereMoney,
         rif(getq(ShipQuests_ArpanMoney) < 2, l("Where are my old clothes?")), L_WhereOldClothes,
@@ -181,7 +181,7 @@ L_Julia:
     next;
 
     mesn "Narrator";
-    mes col(l("Julia is on the upper level of the ship, use the arrow keys to walk to the stairs or click on the stairs at the top right of your screen."), 9);
+    mes col(l("Juliet is on the upper level of the ship, use the arrow keys to walk to the stairs or click on the stairs at the top right of your screen."), 9);
     next;
 
     goto L_Menu;
diff --git a/npc/002-1/knife.txt b/npc/002-1/knife.txt
index 1280d0bed..0754648ab 100644
--- a/npc/002-1/knife.txt
+++ b/npc/002-1/knife.txt
@@ -20,8 +20,8 @@
     next;
 
     menu
-        l("Yeah !."), L_Give,
-        l("Na."), -;
+        l("Yeah!"), L_Give,
+        l("Nah."), -;
  
     closedialog;
     close;
diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt
index 77541ce13..9a31365db 100644
--- a/npc/002-3/_import.txt
+++ b/npc/002-3/_import.txt
@@ -3,6 +3,6 @@
 "npc/002-3/_warps.txt",
 "npc/002-3/billybons.txt",
 "npc/002-3/doors.txt",
-"npc/002-3/julia.txt",
+"npc/002-3/juliet.txt",
 "npc/002-3/mapflags.txt",
 "npc/002-3/note.txt",
diff --git a/npc/002-3/julia.txt b/npc/002-3/juliet.txt
index f2c2f83ba..24b6a0e21 100644
--- a/npc/002-3/julia.txt
+++ b/npc/002-3/juliet.txt
@@ -3,8 +3,10 @@
 //    4144
 //    Qwerty Dragon
 //    Vasily_Makarov
+//    Jesusalva
 // Description:
 //    Allows to change language and talks about what happened to him.
+//    Modified by Jesusalva for TMW2
 //    2 Bits Array:
 //    ShipQuests
 // Variables:
@@ -32,7 +34,7 @@
 //    24   ChefGado Quest completed and "Introduction" chapter finalized.
 //    25   Reward taken from the box.
 
-002-3,27,24,0	script	Julia#TMW2	NPC_JULIA,2,10,{
+002-3,27,24,0	script	Juliet#TMW2	NPC_JULIA,2,10,{
 
     function ynMenu {
         if (select(l("Yes, I do."), l("No, none.")) == 1) {
@@ -97,7 +99,7 @@
 
         setq ShipQuests_ChefGado, 6;
         Zeny += 100;
-        message strcharinfo(0), l("You receive @@ E!", 100);
+        message strcharinfo(0), l("You receive @@ GP!", 100);
         getexp 8, 0;
         close;
     }
@@ -119,7 +121,7 @@
 
         setq ShipQuests_ChefGado, 5;
         Zeny += 200;
-        message strcharinfo(0), l("You receive @@ E!", 200);
+        message strcharinfo(0), l("You receive @@ GP!", 200);
         getexp 15, 0;
         close;
     }
@@ -188,11 +190,9 @@
     function whereAmI {
         mes "";
         mesn;
-        mesq l("You're on a ship, we're on our way to the commercial capital of Artis.");
+        mesq l("You're on a ship, we're on our way to the oldest human city, Tulishmar.");
         next;
-        mesq l("We should be there in a few days, once we arrive, I will warn the Legion of Aemil 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.");
+        mesq l("We should be there in a few days. 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;
         mesq l("Do you have any other questions for me?");
         next;
@@ -207,16 +207,14 @@
         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, one of the four main guilds of Gasaron. Does that help you remember anything, anything at all?");
-        next;
 
-        select
-            l("Sorry, but I can't tell you anything about that."),
-            l("Nothing, sorry.");
+        //select
+        //    l("Sorry, but I can't tell you anything about that."),
+        //    l("Nothing, sorry.");
 
         mes "";
         mesn;
-        mesq l("No problem, do you have any other questions for me?");
+        mesq l("Did you have any other questions for me?");
         next;
         ynMenu;
         return;
@@ -285,13 +283,37 @@ OnTouch:
     mesn;
     mesq l("Hi, nice to see you!");
     next;
-    mesq l("My name is Julia, it is me who took care of you after we found you in the sea.");
+    mesq l("My name is Juliet, it is me who took care of you after we found you in the sea.");
     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 passenger list just after that.");
-    next;
-    chooseLang;
+    if (getq(ShipQuests_Julia) < 2)
+    {
+        mesq l("I'm sure that you've got some questions for me, feel free to ask them, but first I need to tell you the rules of proper social conduct on board.");
+
+        mesq l("Here they are.");
+        next;
+
+        narrator S_LAST_NEXT,
+            l("There is a paper with some rules written on it.");
+
+        GameRules 8 | 4;
+
+        mesn;
+        mesq l("Oh, and I almost forgot! Do not give the password of your room to anybody! I am the only one who has the other key and I won't ask for yours so keep it secret and try not to use the same password for any other room in the future.");
+        next;
+        mesq l("If you want to read this page again, there is a copy up on the left wall.");
+        next;
+        mesq l("You can also read The Book of Laws at any time to see the rules.");
+        next;
+        mesq l("I think I'm done with that now. Do you have any questions?");
+        next;
+
+        setq ShipQuests_Julia, 2;
+    }
+    //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;
     end;
 
diff --git a/npc/002-3/note.txt b/npc/002-3/note.txt
index 31b395541..9bdbb8692 100644
--- a/npc/002-3/note.txt
+++ b/npc/002-3/note.txt
@@ -15,8 +15,8 @@
 
     narrator S_NO_NPC_NAME,
         l("Following these lines are some other writings on this paper."),
-        l("Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Julia"),
-        l("Does anyone know a good place to hang out in Esperia? - M. Arpan"),
+        l("Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Juliet"),
+        l("Does anyone know a good place to hang out in Esperia or Artis? - M. Arpan"),
         l("Other things are written but are not legible anymore.");
 
     close;
diff --git a/npc/functions/game-rules.txt b/npc/functions/game-rules.txt
index f633ee5f3..97395d568 100644
--- a/npc/functions/game-rules.txt
+++ b/npc/functions/game-rules.txt
@@ -4,21 +4,22 @@
 //    Qwerty Dragon
 //    Reid
 //    WildX
+//    Jesusalva
 // Description:
-//    7 main rules of Evol Online.
+//    Main Rules of TMW2.
 
 function	script	GameRules	{
     if (checkweight(BookOfLaws, 1) == true && countitem(BookOfLaws) < 1)
         getitem BookOfLaws, 1; // give the book if the player lost it
 
     narrator getarg(0, 0),
-        l("1. ##BDo not bot##b, this means you are not allowed to perform any AFK (away from keyboard) activity, apart from standing idle."),
+        l("1. ##BDo not bot nor multibox##b, this means you are not allowed to perform any AFK (away from keyboard) activity, apart from standing idle. And you are not allowed to engage in combat while controlling more than one character at a time, either."),
         l("2. ##BDo not use offensive/rude language##b in the chats or in your character(s) name(s)."),
         l("3. ##BDo not spam/flood other players.##b This includes chat spam and spam by trade requests."),
-        l("4. ##BSpeak only English in public areas.##b You can speak whatever language you want through whispers or whenever everyone in the area can speak said language."),
+        l("4. ##BPrefer English in public areas.##b You can speak whatever language you want through whispers or whenever everyone in the area can speak said language. But otherwise, prefer english."),
         l("5. ##BDo not beg others##b for money, items or favours of any kind. If you want to ask for something, do it politely and only once. Try not to annoy other players."),
         l("6. ##BFollow the [@@http://wiki.evolonline.org/rules/esc|ESC@@]##b (Evol Social Convention)."),
-        l("7. ##BDo not multibox.##b You are not allowed to engage in combat while controlling more than one character at a time.");
+        l("7. ##BAs long as you have an account, you agree with the [@@https://gitlab.com/TMW2/TheManaWorld_Wiki/wikis/Rules|Terms Of Service@@]##b. Shall any rule conflict with these terms, the Terms Of Service provided on that link shall prevail.");
     return;
 }
 
@@ -28,13 +29,13 @@ function	script	GameRules	{
 
     function read_book {
         narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("This book outlines the laws of every city and holding in Gasaron."),
+            l("This book outlines the laws which applies everywhere in the World Of Mana."),
             l("The first page contains the universal rules that have been agreed upon throughout the land.");
 
         GameRules S_NO_NPC_NAME | S_LAST_NEXT;
 
         narrator S_NO_NPC_NAME,
-            l("The next page begins to list the complex trading laws of the City of Esperia"),
+            l("The next page begins to list the complex trading laws and political rules."),
             l("All this seems unimportant to you right now.");
         close;
     }