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

diff --git a/npc/018-3/evil-obelisk.txt b/npc/018-3/evil-obelisk.txt
new file mode 100644
index 00000000..071936d2
--- /dev/null
+++ b/npc/018-3/evil-obelisk.txt
@@ -0,0 +1,30 @@
+
+018-3,67,28,0	script	Evil Obelisk	NPC185,{
+    if (getq(Quest_Reapercry) == 3) {
+        mesc l("We've already seen such obelisk before... Do you want to sacrifice %d %s?", .souls, getitemlink(Soul));
+        if (countitem(Soul) >= .souls) {
+            next;
+            if (askyesno() == ASK_YES) {
+                delitem Soul, .souls;
+                warp "099-7", 95, 31;
+                closeclientdialog;
+                close;
+            }
+        }
+    }
+    @map$ = "018-3";
+    @x0 = 56;
+    @y0 = 22;
+    @x1 = 77;
+    @y1 = 37;
+    callfunc "EvilObelisk";
+    @map$ = "";
+    @x0 = 0;
+    @y0 = 0;
+    @x1 = 0;
+    @y1 = 0;
+    close;
+OnInit:
+    .souls=25;
+    end;
+}