Add Silvio NPC,

Add script on hammock, they are now stopping to move when a player sit on it,
Change savepoint script.

5 files changed, 297 insertions, 5 deletions

diff --git a/npc/000-1/_import.txt b/npc/000-1/_import.txt
index c0e756d9..880f3e1a 100644
--- a/npc/000-1/_import.txt
+++ b/npc/000-1/_import.txt
@@ -1,3 +1,4 @@
 map: 000-1.gat
 npc: npc/000-1/_mobs.txt
-npc: npc/000-1/_warps.txt
\ No newline at end of file
+npc: npc/000-1/_warps.txt
+npc: npc/000-1/silvio.txt
\ No newline at end of file
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
new file mode 100644
index 00000000..47d418bf
--- /dev/null
+++ b/npc/000-1/silvio.txt
@@ -0,0 +1,128 @@
+// Evol scripts.
+// Authors:
+//    Reid
+
+000-1.gat,42,42,0,1	script	Silvio	314,{
+
+    mesn;
+    mesq l("Hey hey");
+    next;
+    mesq g(l("How is it going cutty?"),
+           l("How is it going dude?"));
+    next;
+
+    menu
+        l("Hello... Should I know you?"), -,
+        l("Bye."), l_Quit;
+
+    mes "";
+    mesn;
+    mesq g(l("Hehe, no. But I'm sure that a lady like you wish to meet a charmer of my kind!"),
+           l("Hehe, no. But I'm sure that a dude like you wish to meet a gentleman of my kind"));
+    next;
+    mesq g(l("So, which good wind bring you here? Were you on your raft to meet me? Or because you heard of my feats on Artis?"),
+           l("So, which good wind bring you here? Were you on your raft to meet my Julia? Or because you want to see these beauty waitress at Artis?"));
+    next;
+
+    menu
+        g(l("You see right, it's about Julia."),
+          l("You are right, it's about you.")), l_Julia,
+        l("Oh look, there is a piou behind you."), l_Piou,        
+        l("What is Artis?"), l_Artis,
+        l("None of them?"), -;
+
+    mes "";
+    mesn;
+    mesq g(l("My beauty, I was not always a sailor, you know, I was an important person!"),
+           l("My friend, I was not always a sailor, you know, I was an important person!"));
+    next;
+    mesq l("Before...");
+    next;
+
+    mesn "Gugli";
+    mesq l("Hey, don't worry about him, it's one of the first day since a long time where we can decompress.");
+    next;
+    mesq "Maybe he abused too much his bottle today for celebrate that!";
+    next;
+
+    menu
+        l("He's funny, it's not a problem."), -,
+        l("Ok, I will leave him alone."), l_ForeverAlone;
+
+    mes "";
+    mesn "Gugli";
+    mesq l("Oh ok, I said nothing then.");
+    next;
+
+    mesn;
+    mesq l("Ah... Gugli Gugli... He's too young to understand our conversation");
+    next;
+    mesq l("So, what was I saying?");
+    next;
+
+    menu
+        l("You told me that you 'were' important."), l_VeryImportantNoob,
+        l("We discussed about the quality of your wine"), -;
+
+    mes "";
+    mesn;
+    mesq l("Oh really? How could I forgot a topic as important as this one?");
+    next;
+    mesq l("I think that my wine is in a very good quality then! I'm just at my second bottle and I already... What was we talking about again?");
+    close;
+
+l_VeryImportantNoob:
+    mes "";
+    mesn;
+    mesq l("It's right!");
+    next;
+    mesq l("But I can't tell you anything about it I'm sorry.") ;
+    next;
+
+    mesn "Gugli";
+    mesq l("Hey Silvio, it's your turn to carry about the package, go ahead!");
+    next;
+
+    mesn;
+    mesq g(l("Duty is calling me, *hips*, see you later honey."),
+           l("Duty is calling me, *hips*, see you later dude."));
+    close;
+
+l_Julia:
+    mes "";
+    mesn;
+    mesq g(l("You honore me beauty, but I'm already taken by Julia!"),
+           l("It's not to kill your dream but... Julia is mine!"));
+    next;
+    mesq l("She said me that she will accept my application when Piou will have teeth. It's just a meaning of time, you see?");
+    close;
+
+l_Piou:
+    mes "";
+    mesn;
+    mesq "Seriously?!";
+    next;
+    mesq "Hurry hurry! Need to verify his teeth!";
+    close;
+
+l_Artis:
+    mes "";
+    mesn;
+    mesq l("It's a nice place... There is some nice chicks...");
+    next;
+    mesq l("The elven from the library has tilted on me a while ago, as well as Enora from the warrior guild.");
+    next;
+    mesq l("Oh, and Olga from the market place as well!");
+    next;
+    mesq l("You should look at them once we arrive at the port, they worth it, eheh.");
+    close;
+
+l_ForeverAlone:
+    mes "";
+    mesn "Narrator";
+    mes col(l("Silvio start to speak with his bottle, you leave the conversation."), 9);
+
+l_Quit:
+    close;
+
+}
diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt
index 3de878f8..1d851359 100644
--- a/npc/000-2-1/hammock.txt
+++ b/npc/000-2-1/hammock.txt
@@ -2,18 +2,166 @@
 // Authors:
 //    Reid
 // Description:
-//    Animated hammock.
+//    Animated hammock of Ship middle level of the ship.
 
-000-2-1.gat,22,36,0,2	script	#name	904,{
+000-2-1.gat,22,27,0	script	#hammock1	904,1,0{
 
 OnTouchFirst:
+    setnpcdir 4;
+    close;
+
+OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
+
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
+    end;
+
+}
+
+000-2-1.gat,22,25,0	script	#hammock2	904,1,0{
+
+OnTouchFirst:
+    setnpcdir 4;
+    close;
+
+OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
+
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
+    end;
+
+}
+
+000-2-1.gat,22,36,0	script	#hammock3	904,1,0{
+
+OnTouchFirst:
+    setnpcdir 4;
+    close;
+
+OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
+
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
+    end;
+
+}
+
+000-2-1.gat,27,25,0	script	#hammock4	905,1,0{
+
+OnTouchFirst:
+    setnpcdir 4;
+    close;
+
+OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
+
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
+    end;
+
+}
+
+000-2-1.gat,27,27,0	script	#hammock5	905,1,0{
+
+OnTouchFirst:
+    setnpcdir 4;
+    close;
+
+OnUnTouchAll:
     setnpcdir 2;
+    initnpctimer;
+    close;
 
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
     end;
 
+}
+
+000-2-1.gat,27,29,0	script	#hammock6	905,1,0{
+
+OnTouchFirst:
+    setnpcdir 4;
+    close;
+
 OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
+
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
+    end;
+
+}
+
+000-2-1.gat,27,34,0	script	#hammock7	905,1,0{
+
+OnTouchFirst:
     setnpcdir 4;
+    close;
+
+OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
 
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
     end;
 
 }
+
+000-2-1.gat,27,36,0	script	#hammock8	905,1,0{
+
+OnTouchFirst:
+    setnpcdir 4;
+    close;
+
+OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
+
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
+    end;
+
+}
+
+000-2-1.gat,27,38,0	script	#hammock9	905,1,0{
+
+OnTouchFirst:
+    setnpcdir 4;
+    close;
+
+OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
+
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
+    end;
+
+}
\ No newline at end of file
diff --git a/npc/000-2-3/savepoint.txt b/npc/000-2-3/savepoint.txt
index 96a601b7..4f70bcfe 100644
--- a/npc/000-2-3/savepoint.txt
+++ b/npc/000-2-3/savepoint.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Fake save point in nard's room.
 
-000-2-3.gat,28,24,0,2	script	#name	900,{
+000-2-3.gat,28,24,0,2	script	#name	906,0,0{
 
     mesn "Narrator";
     mes col(l("There is a nice place to stay beside you."), 9);
@@ -29,4 +29,18 @@
 L_Return:
     close;
 
-}
+OnTouchFirst:
+    setnpcdir 4;
+    close;
+
+OnUnTouchAll:
+    setnpcdir 2;
+    initnpctimer;
+    close;
+
+OnTimer5440:
+    setnpcdir 4;
+    stopnpctimer;
+    end;
+
+}
\ No newline at end of file
diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt
index cf1a2db5..486f9675 100644
--- a/npc/functions/savepoint.txt
+++ b/npc/functions/savepoint.txt
@@ -5,6 +5,7 @@
 //    Add new save point localisation
 
 function	script	SavePoint	{
+
     mesn "Narrator";
     mes col(l("There is a nice place to stay beside you."), 9);
     next;