Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 134 insertions, 0 deletions

diff --git a/npc/029-1/vincent.txt b/npc/029-1/vincent.txt
new file mode 100644
index 00000000..c0f66644
--- /dev/null
+++ b/npc/029-1/vincent.txt
@@ -0,0 +1,134 @@
+029-1,108,108,0	script	Vincent Debug	NPC113,{
+    mes "[Vincent Debug]";
+    mes "Reset?";
+    menu
+        "Yes.", L_Reset,
+        "No.", L_close;
+
+L_Reset:
+    QL_VINCENT = 0;
+    mes "Reset!";
+    goto L_close;
+
+L_close:
+    close;
+
+OnInit:
+    if (!debug)
+        disablenpc "Vincent Debug";
+    end;
+}
+029-1,107,110,0	script	Vincent	NPC113,{
+    @halloween_npc_id = $@halloween_npc_vincent;
+    callfunc "TrickOrTreat";
+
+    if (QL_VINCENT >= 2) goto L_Done;
+    if (QL_VINCENT == 1) goto L_Progress;
+    goto L_Con_Vin_First;
+
+L_Con_Vin_First:
+    mes "[Vincent]";
+    mes "\"I'm making an action figure. I'm almost done with it.\"";
+    next;
+
+    @temp = rand(4);
+    if(@temp == 1) goto L_Opening2;
+    if(@temp == 2) goto L_Opening3;
+    if(@temp == 3) goto L_Opening4;
+    goto L_Opening1;
+
+L_Opening1:
+    mes "\"I just need 5 more Bug Legs to finish my action figure!\"";
+    next;
+    goto L_Ask;
+
+L_Opening2:
+    mes "\"This maggot action figure is awesome! I just need to attach 5 Bug Legs.\"";
+    next;
+    goto L_Ask;
+
+L_Opening3:
+    mes "\"This is a great action figure! A must have! All I need is a few parts...\"";
+    next;
+    goto L_Ask;
+
+L_Opening4:
+    mes "\"Can you get me 5 Bug Legs? I need them to replace the action figure parts.\"";
+    next;
+    goto L_Ask;
+
+L_Ask:
+    mes "\"Will you help me find 5 Bug Legs?\"";
+    next;
+    menu
+        "Yes.", L_Sure,
+        "No.", L_close;
+
+L_Sure:
+    QL_VINCENT = 1;
+    @temp = rand(4);
+    if(@temp == 1) goto L_Req2;
+    if(@temp == 2) goto L_Req3;
+    if(@temp == 3) goto L_Req4;
+    goto L_Req1;
+
+L_Req1:
+    mes "[Vincent]";
+    mes "\"Thank you!\"";
+    next;
+    goto L_Wait;
+
+L_Req2:
+    mes "[Vincent]";
+    mes "\"I don't know how to thank you enough!\"";
+    next;
+    goto L_Wait;
+
+L_Req3:
+    mes "[Vincent]";
+    mes "\"I will thank you when I get them!\"";
+    next;
+    goto L_Wait;
+
+L_Req4:
+    mes "[Vincent]";
+    mes "\"I'm sure I will give a small reward.\"";
+    next;
+    goto L_Wait;
+
+L_Wait:
+    mes "\"Now please go get me 5 Bug Legs.\"";
+    goto L_close;
+
+L_Progress:
+    if(countitem("BugLeg") >= 5)
+        goto L_Have;
+    mes "[Vincent]";
+    mes "\"Please help me collect 5 Bug Legs! I need them to complete my action figure.\"";
+    goto L_close;
+
+L_Have:
+    mes "[Vincent]";
+    mes "\"Excellent! Finally I can complete the model!!\"";
+    next;
+    if(countitem("BugLeg") < 5)
+        goto L_Progress;
+    delitem "BugLeg", 5;
+    getexp 50, 0;
+    Zeny = Zeny + 1000;
+    QL_VINCENT = 2;
+
+    mes "[Vincent]";
+    mes "\"Here you go, a little of my appreciation!\"";
+    mes "";
+    mes "[1000 gold]";
+    goto L_close;
+
+L_Done:
+    mes "[Vincent]";
+    mes "\"Thanks for your help!\"";
+    goto L_close;
+
+L_close:
+    close;
+}