Merge branch 'master' of gitlab.com:TMW2/serverdata

3 files changed, 33 insertions, 25 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 853369237..c8f3b095a 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -2,32 +2,33 @@
 // Authors:
 //    Ablu
 //    Qwerty Dragon
+//    Jesusalva
 // Description:
 //    Introduction scene where two sailors talk about how the player was found on his raft.
-//    Elmo will handle dialogs between both NPCs.
+//    Elmo will handle dialogs between both NPCs. Modified for TMW2 by Jesusalva
 
 000-0-0,26,23,0	script	Elmo#sailors	NPC_ELMO,{
 
 OnTalk:
     setcamnpc;
     mesn "Elmo";
-    mesq lg("This girl is lucky we found her before a shark did. I have no idea where she comes from. By the way, did you see the logo on her raft?", "This guy is lucky we found him before a shark did. I have no idea where he comes from. By the way, did you see the logo on his raft?");
+    mesq lg("This girl is lucky we found her before a shark did. I have no idea where she comes from. By the way, did you recognised the logo on her raft?", "This guy is lucky we found him before a shark did. I have no idea where he comes from. By the way, did you recognised the logo on his raft?");
     next;
 
     mesn "Magic Arpan";
-    mesq lg("Yeye, it's the logo of the Legion of Aemil in Esperia! I wonder what this yoiis was doing so far away from the coast.");
+    mesq lg("Yaya, it certainly is not from a trade ship, but it doesn't looks like it was from a pirate ship either.");
     next;
 
     mesn "Elmo";
-    mesq l("I wonder too...");
+    mesq l("I wonder where that raft came from...");
     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 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!");
+    mesq l("In the worst scenario possible, the Monster King finally decided to attack warships.");
     next;
 
     mesn "Elmo";
-    mesq l("Makes sense. Do you think we should inform the capt'n about it?");
+    mesq l("It's probably nothing so dramatic. But a warship? Makes sense. Do you think we should inform the capt'n about it?");
     next;
 
     mesn "Magic Arpan";
@@ -58,8 +59,12 @@ OnTalk:
     mesq lg("I'll give her everything she needs, don't worry.", "I'll give him everything he needs, don't worry.");
     next;
 
-    mesn "Elmo";
-    mesq lg("Ok, I think she's waking up, go see her.", "Ok, I think he's waking up, go see him.");
+    //mesn "Elmo";
+    //mesq lg("Ok, I think she's waking up, go see her.", "Ok, I think he's waking up, go see him.");
+    //next;
+
+    mesn "Narrator";
+    mes col(l("It seems like you're finally safe. You shut your eyes and fall asleep."), 9);
     next;
 
     restorecam;
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index d31c84391..daf149a72 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -4,8 +4,9 @@
 //    Qwerty Dragon
 //    Reid
 //    Vasily_Makarov
+//    Jesusalva
 // Description:
-//    Starting script of Evol Online.
+//    Starting script of Evol Online, modified for TMW2.
 
 000-0,23,20,0	script	Sailors	NPC_SAILORS,6,6,{
 
@@ -15,38 +16,34 @@ OnTouch:
     if (.@lang >= 0 && .@lang <= 9) Lang = .@lang;
 
     mesn "Narrator";
-    mes col(l("You are on a raft, adrift in the sea."), 9);
+    mes col(l("You open your eyes. The salt water is not helping your vision."), 9);
     next;
-    mes col(l("With hunger, thirst, and sleep as your only companions, you have the disturbing realization that you can't remember anything of your former life or identity."), 9);
+    mes col(l("A blur shape forms in your front. It seems to be a large ship."), 9);
     next;
-    mes col(l("All of a sudden, you hear voices from above."), 9);
+    mes col(l("Wait. A ship? Where are you, after all?"), 9);
     next;
-    mes col(l("Your body aches, even your hair hurts, and the bright daylight is painful."), 9);
+    mes col(l("Your body aches. You can't remember what happened."), 9);
     next;
-    mes col(l("But still, you open your eyes and see a large ship before you!"), 9);
-    next;
-    mes col(l("Aboard stand sailors trying to communicate with you."), 9);
+    mes col(l("But this is not important now. The ships sailors are shouting at you!"), 9);
     next;
 
     setcamnpc "Sailors", -64, -32;
     mesn "Kralog Voice";
-    mesq lg("Hey Frenchy!");
+    mesq lg("Hey kid! Can you hear me?");
     next;
 
     setcamnpc "Sailors", 0, -32;
     mesn "Human Voice";
-    mesq lg("Why Frenchy? It's a Russian!");
+    mesq lg("Hear you? How do you even know she can understand you?!", "Hear you? How do you even know he can understand you?!");
     next;
 
     setcamnpc "Sailors", 144, -80;
     mesn "Tritan Voice";
-    mesq lg("What are you guys saying ? It's a Yoiis!");
+    mesq lg("We speak various languages on this world. Let's try gesturing!");
     next;
 
     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.");
-    next;
     mesq l("Hey you! Can you hear us? Are you okay?");
     next;
     restorecam;
@@ -66,6 +63,8 @@ OnTouch:
     mesn "Narrator";
     mes col(l("The sailors take you aboard their ship."), 9);
     next;
+    mes col(l("You faint from the pain. At least now, you are in good hands."), 9);
+    next;
     mes col(l("Click on the NPCs (Non-Player Characters) around you to continue the introduction."), 9);
     next;
 
diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt
index 61662fcea..be8eb6e3b 100644
--- a/npc/002-1/arpan.txt
+++ b/npc/002-1/arpan.txt
@@ -4,6 +4,7 @@
 //    Qwerty Dragon
 // Description:
 //    Explains to the player how he got here.
+//    Modified for TMW2 by Jesusalva.
 // Variable:
 //    0 ShipQuests_Arpan
 //    1 ShipQuests_Julia
@@ -106,6 +107,9 @@ OnTalk:
 OnClothNotTaken:
     mesn;
     mesq lg("Yeye, you still did not get your new clothes from the chest next to your bed!");
+    next;
+    mesn;
+    mesq lg("It will be a problem if you run around naked!");
 
     close;
 
@@ -161,11 +165,11 @@ L_Menu:
 L_Where:
     mes "";
     mesn;
-    mesq lg("You're on our ship, we made port to a little island and we're actually yeyending our long merchant traveling adventure at the city of Artis.");
+    mesq lg("You're on our ship, we made port to a little island and we're actually yeyending our long merchant traveling adventure at the city of Tulishmar.");
     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 Legion of Aemil. 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 around for help. 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;
@@ -201,7 +205,7 @@ L_WhereOldClothes:
     setq ShipQuests_ArpanMoney, 2;
     .@q = getq(ShipQuests_Arpan);
     Zeny = Zeny + 10;
-    message strcharinfo(0), l("You receive @@ E!", 10);
+    message strcharinfo(0), l("You receive @@ GP!", 10);
 
     goto L_BeforeMenu;
 
@@ -214,7 +218,7 @@ L_WhereMoney:
     setq ShipQuests_ArpanMoney, 2;
     .@q = getq(ShipQuests_Arpan);
     Zeny = Zeny + 10;
-    message strcharinfo(0), l("You receive @@ E!", 10);
+    message strcharinfo(0), l("You receive @@ GP!", 10);
 
     goto L_BeforeMenu;