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

7 files changed, 103 insertions, 24 deletions

diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index c125f0dd8..17d8d4f2a 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -4,7 +4,7 @@
 003-1,46,72,0	warp	#003-1_46_72	0,0,003-2,32,40
 003-1,52,72,0	warp	#003-1_52_72	0,0,003-2,38,40
 003-1,56,99,0	warp	#003-1_56_99	0,0,003-3,39,40
-003-1,54,137,0	warp	#003-1_54_137	0,0,003-4,35,40
+//003-1,54,137,0	warp	#003-1_54_137	0,0,003-4,35,40
 003-1,51,119,0	warp	#003-1_51_119	0,0,003-1,82,119
 003-1,81,119,0	warp	#003-1_81_119	0,0,003-1,52,119
 003-1,96,144,0	warp	#003-1_96_144	0,0,003-5,38,40
@@ -13,6 +13,6 @@
 003-1,111,137,0	warp	#003-1_111_137	0,0,003-7,39,40
 003-1,107,132,0	warp	#003-1_107_132	0,0,003-7,29,31
 003-1,112,100,0	warp	#003-1_112_100	0,0,003-8,31,43
-003-1,82,68,0	warp	#003-1_82_68	0,0,003-9,35,40
+//003-1,82,68,0	warp	#003-1_82_68	0,0,003-9,35,40
 003-1,51,65,0	warp	#003-1_51_65	0,0,003-2,42,34
 003-1,115,93,0	warp	#003-1_115_93	0,0,003-8,41,28
diff --git a/npc/003-1/eomie.txt b/npc/003-1/eomie.txt
index b566af4f5..d3f406139 100644
--- a/npc/003-1/eomie.txt
+++ b/npc/003-1/eomie.txt
@@ -1,5 +1,6 @@
 // Author:
 //    Saulc
+// Notes: Eomie did the bug bomb at Candor
 
 003-1,68,24,0	script	Eomie	NPC_MONA,{
 
diff --git a/npc/003-1/eugene.txt b/npc/003-1/eugene.txt
index 8c6b6fc38..c02b279a9 100644
--- a/npc/003-1/eugene.txt
+++ b/npc/003-1/eugene.txt
@@ -80,7 +80,7 @@ L_QuestDone:
 
 OnInit:
     .sex = G_MALE;
-    .distance = 2;
+    .distance = 12;
     end;
 }
 
diff --git a/npc/003-1/mariusthebard.txt b/npc/003-1/mariusthebard.txt
index fe7169084..3bddc1331 100644
--- a/npc/003-1/mariusthebard.txt
+++ b/npc/003-1/mariusthebard.txt
@@ -1,13 +1,91 @@
+// The Mana World 2 Project
+// This file is part of TMW2 Project.
+
 // Author:
 //    Saulc
+//    Jesusalva
+
+// Description:
+//    Marius the Bard is a bard. Helps player with the world's background story.
+
+003-1,88,135,0	script	Marius The Bard	NPC_ELVEN_MAN_TRADER,{
+
+//hello;
+    mesn;
+    mesq l("Hello adventurer, what may this humble minstrel do for you today?");
+    next;
+
+    menu
+        "Who, or what are you?",       L_Who,
+        "Where exactly am I?",         L_Where,
+        "Can you sing me a song?",     L_Music,
+        "Actually, nothing. Bye!",     L_Bye;
+
+L_Who:
+    mes "";
+    mesn;
+    mesq l("I am a bard! I used to be an elf trader, but music got me for good.");
+    next;
+    mesq l("Now I travel by the world, composing songs about the things I see.");
+    next;
+    mesq l("I try to improve my skills every day. One day, I will sing a song no one will ever forget.");
+    close();
 
-003-1,88,135,0	script	Marius The Bard	NPC_WATER_SPLASH,{
+L_Where:
+    mes "";
+    mesn;
+    mesq l("This is Tulishmar, the oldest of human cities.");
+    next;
+    mesq l("It is a port city at the south of the continent. Main economic activities are mining and spices trade.");
+    next;
+    mesq l("The biggest mine, where you could find Mana Stones in the past, is now entirely depleted. Not a single stone left.");
+    next;
+    mesq l("The magic council have only a handful set of them, and they let only the most skilled ones get it.");
+    next;
+    mesq l("If you want, you can ask there for one. They are at the big building at northwest.");
+    close();
 
+// NOTE: Rewriting this song is always OK.
+// The last line is always bigger than the previous ones.
+L_Music:
+    mes "";
+    mesn;
+    mesq l("I will sing a song about the Mana War and current times.");
+    next;
+    mes l("In times of famine, magic came to save us.");
+    mes l("But we took every stone, and restricted the magic.");
+    mes l("Ah! Greedy humans! Why had we to desire?");
+    mes l("Ah! Greedy humans! How ignorant were we, to ever do that?");
+    next;
+    mes l("Saul and Fefe did a great revolution,");
+    mes l("They wanted magic to be once again free!");
+    mes l("Ah! Greedy humans! Why did we had to fight?");
+    mes l("Ah! Greedy humans! Couldn't we happy with little?");
+    next;
+    mes l("The mana war stroke, and many people died,");
+    mes l("The Mana Stones were stolen, in evil hands have fallen!");
+    mes l("Ah! Greedy humans! Just how big is our greed?");
+    mes l("Ah! Greedy humans! Things will never be as they used to be!");
+    next;
+    mes l("The mage thief tried to all power absorb,");
+    mes l("But instead of dying a Monster King he became!");
+    mes l("Ah! Greedy humans! We pay the price for our actions,");
+    mes l("Ah! Greedy humans! The Monster War will now rage the globe!");
+    next;
+    mes l("But hope is not lost, said the Sages of Fate!");
+    mes l("Because heroes are not born, rather, they are made!");
+    mes l("Ah! Greedy humans! Stand up to save our world!");
+    mes l("Ah! Greedy humans! End this war which our greed has stroke!");
+    close();
 
-hello;
+L_Bye:
+    mes "";
+    mesn;
+    mesq lg("Good bye my friend, and safe travels!");
+    close();
 
 OnInit:
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt
index 31180615d..921344691 100644
--- a/npc/003-1/ninathetraveler.txt
+++ b/npc/003-1/ninathetraveler.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,56,143,0	script	Nina The Traveler	NPC_GUARD1,{
+003-1,56,143,0	script	Nina The Traveler	NPC_MONA,{
 
     .cake = CherryCake;
     .reward = FancyHat;
@@ -25,20 +25,20 @@
         else 
         {
             speech S_FIRST_BLANK_LINE,
-                l("Sorry it's not the cake i love.");
+                l("Sorry, that is not the cake I love.");
             close;
         }
     }
 
     function quest_started {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Oh Welcoem then.");
+            l("Oh, Welcome then.");
         speech S_LAST_NEXT,
-            l("Can you bring me a piece of Cherry Cake? Pretty please?.");
+            l("Can you bring me a piece of Cherry Cake? Pretty please?");
         do
         {
         select
-            l("Here is it !"),
+            l("Here is it!"),
             menuaction(l("Quit"));
 
         switch (@menu)
@@ -56,8 +56,8 @@
         if (.@chest == 1)
             goto quest_completed;
         select
-            rif(.@chest == 0,  
-            l("Hello i'm new there, can i help you ?")),
+            rif(.@chest == 0,
+            l("Hello, I'm new here! Can I help you?")),
             menuaction(l("Quit"));
 
         switch (@menu)
@@ -73,7 +73,7 @@
     close;
 
 OnInit:
-    .sex = G_MALE;
+    .sex = G_FEMALE;
     .distance = 3;
     end;
 }
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
index 6cfeeb60a..c5c6e7def 100644
--- a/npc/003-1/sarah.txt
+++ b/npc/003-1/sarah.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,90,144,0	script	Sarah	NPC_PLAYER,{
+003-1,90,144,0	script	Sarah	NPC_MONA,{
 
     .cake = CherryCake;
     .reward = FancyHat;
@@ -25,20 +25,20 @@
         else 
         {
             speech S_FIRST_BLANK_LINE,
-                l("Sorry it's not the cake i love.");
+                l("Sorry, that is not the cake I love.");
             close;
         }
     }
 
     function quest_started {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Oh Welcoem then.");
+            l("Oh, Welcome then.");
         speech S_LAST_NEXT,
-            l("Can you bring me a piece of Cherry Cake? Pretty please?.");
+            l("Can you bring me a piece of Cherry Cake? Pretty please?");
         do
         {
         select
-            l("Here is it !"),
+            l("Here is it!"),
             menuaction(l("Quit"));
 
         switch (@menu)
@@ -56,8 +56,8 @@
         if (.@chest == 1)
             goto quest_completed;
         select
-            rif(.@chest == 0,  
-            l("Hello i'm new there, can i help you ?")),
+            rif(.@chest == 0,
+            l("Hello, I'm new here! Can I help you?")),
             menuaction(l("Quit"));
 
         switch (@menu)
@@ -73,7 +73,7 @@
     close;
 
 OnInit:
-    .sex = G_MALE;
+    .sex = G_FEMALE;
     .distance = 3;
     end;
 }
diff --git a/npc/003-1/well.txt b/npc/003-1/well.txt
index 695dae536..c7e272213 100644
--- a/npc/003-1/well.txt
+++ b/npc/003-1/well.txt
@@ -20,13 +20,13 @@
             close;
         }
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                l("You don't have enought quantity.");
+                l("You don't have enough ore.");
         close;
         
     }
 
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        l("Hello do you want to craft @@, for that i will need 7 @@,and @@ gp.", getitemlink(.ItemCreate),getitemlink(.Item1),.GP);
+        l("Hello! Do you want to craft @@? For that I will need 7 @@, and @@ gp.", getitemlink(.ItemCreate),getitemlink(.Item1),.GP);
 
     do
     {