Merge branch 'master' into testserver

Conflicts solved with -X theirs

3 files changed, 65 insertions, 1 deletions

diff --git a/npc/017-1/_import.txt b/npc/017-1/_import.txt
index 51b49f981..42925f9bb 100644
--- a/npc/017-1/_import.txt
+++ b/npc/017-1/_import.txt
@@ -20,4 +20,5 @@
 "npc/017-1/soul-menhir.txt",
 "npc/017-1/stranger.txt",
 "npc/017-1/town.txt",
+"npc/017-1/townhall.txt",
 "npc/017-1/wateranimation.txt",
diff --git a/npc/017-1/misc.txt b/npc/017-1/misc.txt
index c49665201..32cdbfac5 100644
--- a/npc/017-1/misc.txt
+++ b/npc/017-1/misc.txt
@@ -262,7 +262,7 @@ OnInit:
 	sellitem CrystallizedMaggot, 6000;
 	sellitem Sunglasses,         6000;
 	sellitem BunnyEars,           800;
-	sellitem StrangeCoin,          10;
+	sellitem StrangeCoin,          30;
 
     // Gamble
 	sellitem SupremeGift,30000;
diff --git a/npc/017-1/townhall.txt b/npc/017-1/townhall.txt
new file mode 100644
index 000000000..35482d5ed
--- /dev/null
+++ b/npc/017-1/townhall.txt
@@ -0,0 +1,63 @@
+// TMW2/LoF scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    LoF Townhall Access Control
+
+017-1,180,20,0	script	#LoF_Townhall01	NPC_HIDDEN,{
+    end;
+OnTouch:
+    // Sponsor and Main Quest 17+ - access granted
+    .@q=getq(General_Narrator);
+    if (.@q >= 17 || getgmlevel()) {
+        warp "017-10", 56, 78;
+    }
+    end;
+OnInit:
+    .distance=1;
+    end;
+
+}
+
+017-1,182,20,0	script	#LoF_Townhall02	NPC_HIDDEN,{
+    end;
+OnTouch:
+    // Sponsor and Main Quest 17+ - access granted
+    .@q=getq(General_Narrator);
+    if (.@q >= 17 || getgmlevel()) {
+        warp "017-10", 60, 78;
+    }
+    end;
+OnInit:
+    .distance=1;
+    end;
+}
+
+017-1,171,20,0	script	#LoF_Townhall03	NPC_HIDDEN,{
+    end;
+OnTouch:
+    // Sponsor and Main Quest 17+ - access granted
+    .@q=getq(General_Narrator);
+    if (.@q >= 17 || getgmlevel()) {
+        warp "017-10", 36, 78;
+    }
+    end;
+OnInit:
+    .distance=1;
+    end;
+}
+
+017-1,190,20,0	script	#LoF_Townhall04	NPC_HIDDEN,{
+    end;
+OnTouch:
+    // Sponsor and Main Quest 17+ - access granted
+    .@q=getq(General_Narrator);
+    if (.@q >= 17 || getgmlevel()) {
+        warp "017-10", 80, 78;
+    }
+    end;
+OnInit:
+    .distance=1;
+    end;
+}
+