Merge branch 'master' into magicv2008.12.25

1 files changed, 19 insertions, 18 deletions

diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index ef17ba18..b0412517 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -1,32 +1,33 @@
 //
 
 001-1.gat,135,42,0	script	Vincent	113,{
-	if(Bugleg == 1) goto L_Reas;
 	if(Bugleg == 2) goto L_Done;
+	if(Bugleg == 1) goto L_Progress;
+
 	set @TEMP, rand(4);
-	if(@TEMP == 0) goto L_1;
-	if(@TEMP == 1) goto L_2;
-	if(@TEMP == 2) goto L_3;
-	if(@TEMP == 3) goto L_4;
+	if(@TEMP == 0) goto L_Opening1;
+	if(@TEMP == 1) goto L_Opening2;
+	if(@TEMP == 2) goto L_Opening3;
+	if(@TEMP == 3) goto L_Opening4;
 
-L_1:
+L_Opening1:
 	mes "[Vincent]";
 	mes "\"I just need 30 more [Bug Legs] to finish my action figure!\"";
 	next;
 	goto L_Ask;
 
-L_2:
+L_Opening2:
 	mes "[Vincent]";
 	mes "\"This maggot action figure is awesome! I just need to attach [30 Part A{Bug Leg}]\"";
 	next;
 	goto L_Ask;
 
-L_3:
+L_Opening3:
 	mes "[Vincent]";
 	mes "\"This is a great action figure! A must have! All I need is a few parts...\"";
 	goto L_Ask;
 
-L_4:
+L_Opening4:
 	mes "[Vincent]";
 	mes "\"Can you get me 30 [Bug Legs]? I need them to replace the action figure parts.\"";
 	next;
@@ -44,30 +45,30 @@ L_Ask:
 L_Sure:
 	set Bugleg, 1;
 	set @TEMP,rand(4);
-	if(@TEMP == 0) goto J_1;
-	if(@TEMP == 1) goto J_2;
-	if(@TEMP == 2) goto J_3;
-	if(@TEMP == 3) goto J_4;
+	if(@TEMP == 0) goto L_Req1;
+	if(@TEMP == 1) goto L_Req2;
+	if(@TEMP == 2) goto L_Req3;
+	if(@TEMP == 3) goto L_Req4;
 
-J_1:
+L_Req1:
 	mes "[Vincent]";
 	mes "\"Thank you!\"";
 	next;
 	goto L_Wait;
 
-J_2:
+L_Req2:
 	mes "[Vincent]";
 	mes "\"I don't know how to thank you enough!\"";
 	next;
 	goto L_Wait;
 
-J_3:
+L_Req3:
 	mes "[Vincent]";
 	mes "\"I will thank you when I get them!\"";
 	next;
 	goto L_Wait;
 
-J_4:
+L_Req4:
 	mes "[Vincent]";
 	mes "\"I'm sure I will give a small reward. :D\"";
 	next;
@@ -78,7 +79,7 @@ L_Wait:
 	mes "\"Now please go get me 30 [Bug Legs]\"";
 	close;
 
-L_Reas:
+L_Progress:
 	if(countitem(518) >= 30) goto L_Have;
 	mes "[Vincent]";
 	mes "\"Please help me collect 30 [Bug Legs]!\"";