7 files changed, 68 insertions, 39 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 79a291940..89c3b408a 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -48,6 +48,7 @@ map_list: (
     "006-1",
     "007-1",
     "008-0",
+    "008-1",
     "009-1",
     "009-2",
     "009-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index a6be13808..62c3eb382 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -45,36 +45,37 @@
 006-1 45
 007-1 46
 008-0 47
-009-1 48
-009-2 49
-009-3 50
-009-4 51
-009-5 52
-010-1-1 53
-010-1 54
-010-2 55
-011-1 56
-011-2 57
-012-1 58
-012-2 59
-012-3 60
-012-4 61
-012-5 62
-012-6 63
-012-7 64
-014-1 65
-014-2 66
-014-3 67
-015-1 68
-015-2 69
-015-3 70
-016-1 71
-016-6 72
-016-7 73
-boss 74
-botcheck 75
-sec_pri 76
-soren-2 77
-soren 78
-test 79
-testbg 80
+008-1 48
+009-1 49
+009-2 50
+009-3 51
+009-4 52
+009-5 53
+010-1-1 54
+010-1 55
+010-2 56
+011-1 57
+011-2 58
+012-1 59
+012-2 60
+012-3 61
+012-4 62
+012-5 63
+012-6 64
+012-7 65
+014-1 66
+014-2 67
+014-3 68
+015-1 69
+015-2 70
+015-3 71
+016-1 72
+016-6 73
+016-7 74
+boss 75
+botcheck 76
+sec_pri 77
+soren-2 78
+soren 79
+test 80
+testbg 81
diff --git a/maps/re/008-1.mcache b/maps/re/008-1.mcache
new file mode 100644
index 000000000..029af0c09
--- /dev/null
+++ b/maps/re/008-1.mcache
diff --git a/npc/008-0/master.txt b/npc/008-0/master.txt
index 94aeb148d..be216f8d5 100644
--- a/npc/008-0/master.txt
+++ b/npc/008-0/master.txt
@@ -2,7 +2,7 @@
 // Author:
 //  Jesusalva
 // Description:
-//  This NPC serves no purpose currently. She is here to make Tulimshar more crowded.
+//  This NPC is a work on progress. It measures all players equal.
 
 008-0,47,63,0	script	Party Master	NPC_BRGUARD_SWORD,{
     mesn;
@@ -17,6 +17,7 @@
     mesn;
     mesq l("I protect a very dangerous dungeon, and it is so dangerous, that only parties can go in.");
     next;
+    // TODO allow to go there if party leader is inside
     if (strcharinfo(0) != getpartyleader(getcharid(1))) goto L_NotYou;
     mesn;
     mesq l("There are five floors, and they're all very dangerous. But there are riches to be found.");
@@ -52,9 +53,15 @@
     // How many are logged in and here?
     if (.@count_online < 3 && !$@GM_OVERRIDE) goto L_TooSmall;
 
+    // TODO: Query if exp sharing is enabled
+    // TODO: Instance for party
+
     // Warp everyone and add timers
     partytimer("008-0", 1000, "Party Master::OnStart", getcharid(1));
-    warpparty("003-1", 41, 48, getcharid(1), "008-0", true);
+    warpparty("008-1", 176, 20, getcharid(1), "008-0", true);
+
+    // TODO: Monsters
+    monster("008-1", 90, 69, "Time Bonus", Scorpion, 1, "Party Master::OnAddTime");
     close;
 
 L_NotYou:
@@ -70,10 +77,23 @@ L_TooSmall:
 OnStart:
     @pmloop=0;
 OnLoop:
-    @pmloop+=1;
-    if (@pmloop < 1500)
-        addtimer(1000, "Party Master::OnLoop");
-    close;
+    if (getmapname() ~= "008-*") {
+        @pmloop+=1;
+        if (@pmloop < 1500) {
+            addtimer(1000, "Party Master::OnLoop");
+        } else {
+            warp "008-0", 47, 64;
+            dispbottom l("You ran out of time...");
+        }
+    } else {
+        @pmloop=0;
+    }
+    end;
+
+// TODO: We must use areatimer() and grant time bonus to everyone who killed it
+OnAddTime:
+    @pmloop=60;
+    end;
 
 OnInit:
     .sex = G_MALE;
diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt
new file mode 100644
index 000000000..804ef4a31
--- /dev/null
+++ b/npc/008-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-1: 1st Floor - Party Dungeon
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-1/_warps.txt",
diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt
new file mode 100644
index 000000000..9ed20493f
--- /dev/null
+++ b/npc/008-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-1: 1st Floor - Party Dungeon warps
+008-1,176,19,0	warp	#008-1_176_19	0,0,008-0,47,64
diff --git a/npc/_import.txt b/npc/_import.txt
index f72bfc293..52dca225c 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -47,6 +47,7 @@
 @include "npc/006-1/_import.txt"
 @include "npc/007-1/_import.txt"
 @include "npc/008-0/_import.txt"
+@include "npc/008-1/_import.txt"
 @include "npc/009-1/_import.txt"
 @include "npc/009-2/_import.txt"
 @include "npc/009-3/_import.txt"