Add Frederico (drunken) NPC on 000-2-1,

Change some Julia and knife's dialogs.

5 files changed, 72 insertions, 6 deletions

diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index f0652eab..d22f8f54 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -55,7 +55,7 @@ start_weapon: 0
 start_armor: 0
 
 // Starting zeny for new characters
-start_zeny: 5
+start_zeny: 0
 
 min_hair_style: 0
 max_hair_style: 30
diff --git a/npc/000-2-0/_import.txt b/npc/000-2-0/_import.txt
index ea67d491..37e20224 100644
--- a/npc/000-2-0/_import.txt
+++ b/npc/000-2-0/_import.txt
@@ -2,4 +2,5 @@ map: 000-2-0.gat
 npc: npc/000-2-0/_mobs.txt
 npc: npc/000-2-0/_warps.txt
 npc: npc/000-2-0/julia.txt
-npc: npc/000-2-0/doors.txt
\ No newline at end of file
+npc: npc/000-2-0/doors.txt
+npc: npc/000-2-0/frederico.txt
\ No newline at end of file
diff --git a/npc/000-2-0/frederico.txt b/npc/000-2-0/frederico.txt
new file mode 100644
index 00000000..921726c2
--- /dev/null
+++ b/npc/000-2-0/frederico.txt
@@ -0,0 +1,64 @@
+// Evol scripts.
+// Authors:
+//    Reid
+// Description:
+//    Drunken easteregg about player's past activity
+
+000-2-0.gat,20,23,0,0	script	Frederico	311,{
+  mesn;
+  mesq l("You?? Here??");
+  mesq l("How is *hips* possible??");
+  next;
+  mesn l("The sailor is drinking his beer in one shoot");
+
+  menu
+    g(l("Excuse me? Do you know who I am?#0"), l("Excuse me? Do you know who I am?#1")), -;
+
+  mesn;
+  mesq l("Don't do do theee... *hips* with me eh!");
+
+  menu
+    l("Are you ok?"), l_Quit,
+    l("Alright, bye!"), -;
+
+  mesn;
+  mesq g(l("NO and *hips* NO, you and you and your... *hurps* stupi*hips* guild!#0"), l("NO and *hips* NO, you and you and your... *hurps* stupi*hips* guild!#1"));
+  mesq l("You tried to get ride of me eeh?? But suprise! I'm still here...*hips* Or there....");
+  next;
+  mesn;
+  mesq l("But you won't *hips* me this time...");
+
+  menu
+    l("What are you talking about? Which guild?"), l_Quit,
+    l("You are full of wine my friend..."), -,
+    l("You should go and get some sleep."), l_Quit;
+
+  mesn;
+  mesq l("If I saw *hips* who you wereee.... *hips* Would not had help you! ");
+
+  menu
+    l("But who am I?"), -,
+    l("What am I suposed to say?"), l_Quit,
+    l("You should go and get some sleep."), l_Secret;
+
+  mesn;
+  mesq l("The giant bogeyman!");
+  next;
+  goto l_Quit;
+
+	l_Secret:
+    mesn;
+	 mesq l("Hear  me *hips* well, what ever, whatididever you will*hips*said  ab...euh..out wha?! You saw there, the Guild of Esperia won't let it go to public.");
+	 mesq l("Nobody will know about the existence of the Mercurians");
+    next;
+	 mesq l("Nobody! *hurps*");
+    next; 
+
+	l_Quit:
+    mesn;
+	 mesq l("Yeah you're all like *hips* that in Esperia, but you won't get me! *hurps*");
+	 mesq l("I'm not that numb eeh *hips* what did ever you disco*hips*veeered there, the warrior guild won't get me!");
+    next;
+	 mesn l("The sailor is turning his back to you");
+	 close;
+}
\ No newline at end of file
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 797a92b1..76b4c6ed 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -94,7 +94,8 @@
 
   l_EsperiaMenu:
   menu
-    l("Sorry but I can't say you anything about it.") + " " + l("Nothing, sorry."), l_NoChanges;
+    l("Sorry but I can't say you anything about it."), l_NoChanges,
+    l("Nothing, sorry."), l_NoChanges;
 
   l_Close:
     close;
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index 152ae2a6..2df2bfb4 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -9,11 +9,11 @@
 //    0   default -> not taken
 //    1   knife taken
 
-000-2-1.gat,39,25,0,2	script	#name	100,{
+000-2-1.gat,40,24,0,2	script	#name	100,{
     set @q, geta(ShipQuests, ShipQuests_Knife);
     if (@q) close;
-    mesn l("Knife on the table");
-    mes l("Take the knife?");
+    mesn l("Knifes on the table");
+    mes l("There is some knifes on the table, do you want to take one?");
     menu
         l("Yes."), l_Give,
         l("No."), -;