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

diff --git a/npc/010-2/doug.txt b/npc/010-2/doug.txt
new file mode 100644
index 00000000..e16a2997
--- /dev/null
+++ b/npc/010-2/doug.txt
@@ -0,0 +1,21 @@
+
+010-2,68,87,0	script	Doug	NPC113,{
+    mes "[Doug]";
+    mes "\"This room is too dark. I want to brighten it up.\"";
+    next;
+
+    @dq_level = 15;
+    @dq_cost = 10;
+    @dq_count = 5;
+    @dq_name$ = "CaveSnakeLamp";
+    @dq_friendly_name$ = "Cave Snake Lamps";
+    @dq_money = 1000;
+    @dq_exp = 1500;
+
+    callfunc "DailyQuest";
+
+    next;
+    mes "[Doug]";
+    mes "\"Too bad these lamps wear off after a while...\"";
+    close;
+}