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

diff --git a/npc/002-5/chest.txt b/npc/002-5/chest.txt
new file mode 100644
index 00000000..12508350
--- /dev/null
+++ b/npc/002-5/chest.txt
@@ -0,0 +1,37 @@
+002-5,93,37,0	script	Supply Chest	NPC378,{
+    if (QL_MINEALL >= 26) goto L_Finished;
+
+    mes "Hrmm... A supply chest.";
+    mes "Do you want to try to open it?";
+    next;
+    menu
+        "Yes.", L_Yes,
+        "No.", L_close;
+
+L_Yes:
+    if (countitem("TreasureKey") < 3)
+        goto L_Not_Enough;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("TreasureKey") > 3)
+        goto L_TooMany;
+    mes "You opened the chest and found a short bow!";
+    delitem "TreasureKey", 3;
+    getitem "ShortBow", 1;
+    QL_MINEALL = 26;
+    goto L_close;
+
+L_Not_Enough:
+    mes "It seems that you do not have the right key for this chest yet...";
+    goto L_close;
+
+L_Finished:
+    mes "You have already opened this chest.";
+    goto L_close;
+
+L_TooMany:
+    mes "You do not have enough room to loot this chest. Maybe you should try again later.";
+    goto L_close;
+
+L_close:
+    close;
+}