Clean up main scripts

3 files changed, 14 insertions, 7 deletions

diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 138cdbfb..60e156f0 100644
--- a/world/map/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
@@ -28,7 +28,6 @@
     menu
         "\"Please calm down and tell me what happened.\"", L_Whining,
         "Leave", L_Close;
-    goto L_Close;
 
 L_Whining:
     mes "[Angela]";
@@ -58,7 +57,6 @@ L_Menu_Potion:
         "\"Please calm down and tell me what happened.\"", L_Whining,
         "Give her a concentration potion.", L_Calm_Down,
         "Leave", L_Close;
-    goto L_Close;
 
 L_Calm_Down:
     if (countitem("ConcentrationPotion") == 0)
diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt
index d566c600..304d2068 100644
--- a/world/map/npc/031-1/dock.txt
+++ b/world/map/npc/031-1/dock.txt
@@ -4,4 +4,5 @@
 {
     set @loc, DOCK_nivalis;
     callfunc "Ferry";
+    end;
 }
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index 19ad560d..0dabaeb0 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -7,7 +7,7 @@
 //            "I need to find a way to go back home, can you help me?", L_Frozenbeard_Default,
 //            "I heard you know pirates from all around the world, is it true?", L_Frozenbeard_Easter2012;
 
-L_Frozenbeard_Default:
+//L_Frozenbeard_Default:
     mes "[Frozenbeard]";
     mes "\"Arrr mate! I'm glad there's a dock here, so I don't have to row boat from my ship anymore!  I pioneered the trade routes between Nivalis and the rest of the World, so now merchants and adventurers can travel to and fro without any hassle other than the harsh weather up here, yarr.\"";
     close;
@@ -19,7 +19,9 @@ L_Frozenbeard_Easter2012:
     mes "\"Arrrrh mate! Ye be right! I know every single pirate in this world. But not all of them are to be trusted, I must say.\"";
     next;
     menu
-        "I need information about the Easter Bunny. I heard some pirates kidnapped him.", -;
+        "I need information about the Easter Bunny. I heard some pirates kidnapped him.", L_Next;
+
+L_Next:
     mes "[Frozenbeard]";
     mes "\"Arrrrh! Ye shouldn't do this to me. Those pirates are dangerous, I can't put myself in such a situation!\"";
     next;
@@ -27,18 +29,24 @@ L_Frozenbeard_Easter2012:
     mes "You take a black pearl from your backpack and starts to play with it.";
     next;
     menu
-        "Hmm, too bad, because I was willing to pay well for information, you know?", -;
+        "Hmm, too bad, because I was willing to pay well for information, you know?", L_Continue;
+
+L_Continue:
     mes "[Frozenbeard]";
     mes "\"Arrh eh... Did I say dangerous? These pirates are criminals and a shame to our kind. So, if ye give me this pearl I can tell ye all I know about them. It is not much, but maybe it can help.\"";
     menu
-        "Ok, keep going.", -;
+        "Ok, keep going.", L_More;
+
+L_More:
     mes "[Frozenbeard]";
     mes "\"Well I heard they took him to a small house around this area, where they have their base. But then they brought him to another place. It might be hot there, judging the way they dressed up. The bunny seemed to show no resistance at all when they kidnapped him. It looked as if he did not know what was happening.\"";
     next;
     mes "\"But the most important thing is, the leader of the kidnappers is an old friend of George, the treasure hunter. George is very clever, I am sure he knows how the kidnapper thinks and all, maybe he can give ye a more specific information about this.\"";
     next;
     menu
-        "Well, that was useful, take your pearl.", -;
+        "Well, that was useful, take your pearl.", L_TakePearl;
+
+L_TakePearl:
     if (countitem("BlackPearl") < 1)
         goto L_Frozenbeard_Nopearl;
     delitem "BlackPearl", 1;