Merge pull request #281 from wushin/bug-fix

Bug fix

4 files changed, 6 insertions, 6 deletions

diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index cf5298f5..1cded616 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -65,7 +65,7 @@ L_Main:
     mes "[Unfriendly Guy]";
     mes "\"What are you looking at?\"";
     menu
-        "What ever you call maggot slime scrapped off a boat after a walk through the sewers.\"", L_Fight,
+        "What ever you call maggot slime scrapped off a boat after a walk through the sewers.", L_Fight,
         "Who me? I saw nothing, just passing by.", L_Close;
 
 L_FightAgain:
@@ -156,7 +156,7 @@ OnTouch:
         end;
     goto L_Main;
 }
-029-1,0,0,0|script|#ScorpionTrigger|35
+029-1,0,0,0|script|#ScorpionTrigger|32767
 {
     end;
 
diff --git a/world/map/npc/029-1/hideandseek.txt b/world/map/npc/029-1/hideandseek.txt
index 31653f95..51280978 100644
--- a/world/map/npc/029-1/hideandseek.txt
+++ b/world/map/npc/029-1/hideandseek.txt
@@ -116,7 +116,7 @@ L_Doing:
     callfunc "CountHideNSeek";
     mes "[Ayasha]";
     mes "\"You still need to find some of my friends. You have found " + @hidden_kid_cnt + " out of 5 of my friends.\"";
-    mes "Remember, they're hiding somewhere on the island, you will have to explore to find them. They could be hiding anywhere.\"";
+    mes "\"Remember, they're hiding somewhere on the island, you will have to explore to find them. They could be hiding anywhere.\"";
     goto L_Close;
 
 L_Reward:
diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt
index c0eacba6..4e4a78a6 100644
--- a/world/map/npc/029-1/liana.txt
+++ b/world/map/npc/029-1/liana.txt
@@ -24,7 +24,7 @@ L_Hasan:
 L_Next:
     mes "\"Ah, Hasan. He's causing trouble again?\"";
     mes "She shakes her head.";
-    mes "\This guy has been a plague ever since he could walk. He's always causing trouble.\"";
+    mes "\"This guy has been a plague ever since he could walk. He's always causing trouble.\"";
     mes "\"And his father... Well, one day his father thought he should teach Hasan a lesson.\"";
     mes "\"He took him into the desert and then left him there!";
     mes "Hasan was only seven years old!\"";
diff --git a/world/map/npc/029-1/vincent.txt b/world/map/npc/029-1/vincent.txt
index a9cf7291..2d70b6de 100644
--- a/world/map/npc/029-1/vincent.txt
+++ b/world/map/npc/029-1/vincent.txt
@@ -32,9 +32,9 @@ OnInit:
 
     if (@state >= 2) goto L_Done;
     if (@state == 1) goto L_Progress;
-    goto L_Convince_Vincent_First;
+    goto L_Con_Vin_First;
 
-L_Convince_Vincent_First:
+L_Con_Vin_First:
     mes "[Vincent]";
     mes "\"I'm making an action figure. I'm almost done with it.\"";
     next;