diff --git a/unlinked/mlab-devel.tar.gz b/unlinked/mlab-devel.tar.gz index 3c593e48d..011282d41 100644 Binary files a/unlinked/mlab-devel.tar.gz and b/unlinked/mlab-devel.tar.gz differ diff --git a/unlinked/mlab-devel/mlab/citydeclouds2 b/unlinked/mlab-devel/mlab/citydeclouds2 index eb18dde88..12b11c0f4 100644 --- a/unlinked/mlab-devel/mlab/citydeclouds2 +++ b/unlinked/mlab-devel/mlab/citydeclouds2 @@ -14461,6 +14461,20 @@ x 12 y 40 end arch guildmaster +msg +@match hi|hello +I wonder what ever happened to the +Marquis... + +@match marquis|Marquis +Yes, there has been no word from him +for some time. Dark clouds clutter +they skys of his castle to the +south... + + + +endmsg x 12 y 40 end @@ -15552,6 +15566,17 @@ x 13 y 45 end arch sage +msg +@match * +I'm too busy to answer your queries. + +@match marquis|Marquis +Ah the Marquis! Yes I know him... or +rather, knew him. Strange occurances +have been manifest among his estate +to the south... + +endmsg x 13 y 45 end @@ -22514,9 +22539,17 @@ y 34 end arch guildmaster msg -@match * +@match hi|hello Standing around, waiting for an -audience with the king... +audience with the king... normally I +would have gone to the Marquis... +but... + +@match marquis|Marquis +The Marquis has been absent for quite +some time... + + endmsg x 20 y 34 @@ -37752,148 +37785,6 @@ y 87 nrof 3 carrying 75 randomitems none -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_blades -end -arch trap_needle -end -arch trap_needle -end -arch trap_needle -end -arch trap_needle -end -arch trap_needle -end -arch trap_needle -end -arch trap_needle -end -arch trap_needle -end -arch trap_needle -end -arch trap_needle -end arch note name O-W-N-E-D-! name_pl O-W-N-E-D-! @@ -37901,6 +37792,148 @@ msg You've been had! AHHAHAHAHAH!!!11111 endmsg end +arch trap_needle +end +arch trap_needle +end +arch trap_needle +end +arch trap_needle +end +arch trap_needle +end +arch trap_needle +end +arch trap_needle +end +arch trap_needle +end +arch trap_needle +end +arch trap_needle +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end +arch trap_blades +end end arch dungeon_magic x 34 @@ -38171,15 +38204,12 @@ msg @match hi|hello We have many nice rooms. Please don't hurt me. - @match dragon I fear them, and their lord Please don't hurt me. - @match elf|lord|Valdak I know only that the elves know more. Please don't hurt me. - endmsg x 34 y 113 @@ -45715,10 +45745,8 @@ msg @match hi|hello A rest is good for the warrior spirit! Especially a rich one eheheh! - @match elf|lord|Valdak You speak of Valdak? - @match yes Well... he was once a good elf, but now he's said to be a dark elf, can't @@ -45728,15 +45756,12 @@ they are, will steal your money pouch, your armour, and your daughter... all in the blink of en eye! Now it's time for me to rest. - @match no Well I can't help you then. Resting time. - @match dragon Dragons, you don't say! That's why I stay inside hehe! - endmsg x 41 y 109 @@ -125742,7 +125767,6 @@ msg @match * Jolly! It's good to be here, I know of know dangers! Jolly! - endmsg x 96 y 118 @@ -136333,22 +136357,16 @@ msg @match hi|hello Welcome and stay for awhile, replenish thy spirit and abilities. - @match elf|lord|Valdak To the west... but the castle of the dark elf lord is gaurded in opposition by the military of this city... - @match dragon Dragons here, the spies and soldiers of the dark elf lord... do not meddle in their affairs, flee in terror instead... - - - - endmsg face wizard.151 hp 100 diff --git a/unlinked/mlab-devel/mlab/mlabscrntrd1 b/unlinked/mlab-devel/mlab/mlabscrntrd1 index b09eee581..317599fc1 100644 --- a/unlinked/mlab-devel/mlab/mlabscrntrd1 +++ b/unlinked/mlab-devel/mlab/mlabscrntrd1 @@ -1,6 +1,7 @@ arch map reset_timeout 1 difficulty 1 +region scorn width 64 height 64 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/mlabscrntrd2 b/unlinked/mlab-devel/mlab/mlabscrntrd2 index 6367acc0f..aa6d14804 100644 --- a/unlinked/mlab-devel/mlab/mlabscrntrd2 +++ b/unlinked/mlab-devel/mlab/mlabscrntrd2 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region scorn width 64 height 64 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/mlabscrntrdb1 b/unlinked/mlab-devel/mlab/mlabscrntrdb1 index 1cc48546b..52d287801 100644 --- a/unlinked/mlab-devel/mlab/mlabscrntrdb1 +++ b/unlinked/mlab-devel/mlab/mlabscrntrdb1 @@ -1,6 +1,7 @@ arch map reset_timeout 1 difficulty 1 +region scorn width 64 height 64 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/mlabscrntrdb2 b/unlinked/mlab-devel/mlab/mlabscrntrdb2 index ca7bd21f5..6441cbf00 100644 --- a/unlinked/mlab-devel/mlab/mlabscrntrdb2 +++ b/unlinked/mlab-devel/mlab/mlabscrntrdb2 @@ -1,6 +1,7 @@ arch map reset_timeout 1 difficulty 1 +region scorn width 64 height 64 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/mlabscrntrdb3 b/unlinked/mlab-devel/mlab/mlabscrntrdb3 index 7ad8a7b88..95a2f6068 100644 --- a/unlinked/mlab-devel/mlab/mlabscrntrdb3 +++ b/unlinked/mlab-devel/mlab/mlabscrntrdb3 @@ -1,6 +1,7 @@ arch map reset_timeout 1 difficulty 1 +region scorn width 64 height 64 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/tavern b/unlinked/mlab-devel/mlab/tavern index 4d8f30b72..b026bace4 100644 --- a/unlinked/mlab-devel/mlab/tavern +++ b/unlinked/mlab-devel/mlab/tavern @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar width 95 height 80 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/tavern2 b/unlinked/mlab-devel/mlab/tavern2 index ec98750c5..03eab0fb2 100644 --- a/unlinked/mlab-devel/mlab/tavern2 +++ b/unlinked/mlab-devel/mlab/tavern2 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar width 60 height 41 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/tavern3 b/unlinked/mlab-devel/mlab/tavern3 index c986afd18..86304d6b9 100644 --- a/unlinked/mlab-devel/mlab/tavern3 +++ b/unlinked/mlab-devel/mlab/tavern3 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar width 60 height 40 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/tavern4 b/unlinked/mlab-devel/mlab/tavern4 index 92e77d9de..0ca251b4a 100644 --- a/unlinked/mlab-devel/mlab/tavern4 +++ b/unlinked/mlab-devel/mlab/tavern4 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar width 18 height 18 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/tavern5 b/unlinked/mlab-devel/mlab/tavern5 index e7b13f4bc..8a6f0dc82 100644 --- a/unlinked/mlab-devel/mlab/tavern5 +++ b/unlinked/mlab-devel/mlab/tavern5 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar width 18 height 18 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/tavern6 b/unlinked/mlab-devel/mlab/tavern6 index 350ddc3c1..673664fcf 100644 --- a/unlinked/mlab-devel/mlab/tavern6 +++ b/unlinked/mlab-devel/mlab/tavern6 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar width 18 height 18 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/tavern7 b/unlinked/mlab-devel/mlab/tavern7 index 2df0d654a..04d5becf0 100644 --- a/unlinked/mlab-devel/mlab/tavern7 +++ b/unlinked/mlab-devel/mlab/tavern7 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar width 18 height 18 enter_x 1 diff --git a/unlinked/mlab-devel/mlab/tavernb1 b/unlinked/mlab-devel/mlab/tavernb1 index 368c7d781..25128e946 100644 --- a/unlinked/mlab-devel/mlab/tavernb1 +++ b/unlinked/mlab-devel/mlab/tavernb1 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar darkness 3 width 180 height 40 diff --git a/unlinked/mlab-devel/mlab/tavernb2 b/unlinked/mlab-devel/mlab/tavernb2 index 0ba8bc7c6..a9bd7e1c2 100644 --- a/unlinked/mlab-devel/mlab/tavernb2 +++ b/unlinked/mlab-devel/mlab/tavernb2 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar darkness 4 width 60 height 40 diff --git a/unlinked/mlab-devel/mlab/tavernb3 b/unlinked/mlab-devel/mlab/tavernb3 index 6fccdd4dd..6d67cd045 100644 --- a/unlinked/mlab-devel/mlab/tavernb3 +++ b/unlinked/mlab-devel/mlab/tavernb3 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar darkness 5 width 60 height 40 diff --git a/unlinked/mlab-devel/mlab/tavernb4 b/unlinked/mlab-devel/mlab/tavernb4 index 645f0882d..671b14616 100644 --- a/unlinked/mlab-devel/mlab/tavernb4 +++ b/unlinked/mlab-devel/mlab/tavernb4 @@ -1,6 +1,7 @@ arch map reset_timeout 7200 difficulty 1 +region navar darkness 6 width 60 height 40