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, 51 insertions, 0 deletions

diff --git a/npc/029-1/tutorial.txt b/npc/029-1/tutorial.txt
new file mode 100644
index 00000000..77ebf3e5
--- /dev/null
+++ b/npc/029-1/tutorial.txt
@@ -0,0 +1,51 @@
+-	script	#TutorialConfig	NPC32767,{
+    end;
+
+OnInit:
+    $@ScorpionFighter = 0;
+    $@ScorpionTimer = 0;
+    set $@ScorpDeath, 0; 
+    end;
+}
+029-2,21,26,0	script	TutDebug	NPC154,{
+    mes "[TutDebug]";
+    mes "Reset?";
+    menu
+        "Reset Kaan/Hasan",L_Kaan,
+        "Yes.",L_Reset,
+        "No.",L_close;
+
+L_Kaan:
+    QL_BEGIN = 8;
+    setq CandorQuest_Harasser, 0;
+    mes "Reset!";
+    goto L_close;
+
+L_Reset:
+    TUT_var = 0;
+    QL_BEGIN = 0;
+    setq CandorQuest_Harasser, 0;
+    mes "Reset!";
+    goto L_close;
+
+L_close:
+    close;
+
+OnInit:
+    if(!debug)
+        disablenpc "TutDebug";
+    end;
+}
+029-1,32,99,0	script	#tutorialoutside	NPC45,0,0,{
+    if (QL_BEGIN >= 8)
+        goto L_Warp;
+    goto L_ResetTutorial;
+
+L_ResetTutorial:
+    QL_BEGIN = 8;
+    goto L_Warp;
+
+L_Warp:
+    warp "029-2", 114, 92;
+    end;
+}