From a9cd913e17616c0b47512a3d324ca9d83c47522a Mon Sep 17 00:00:00 2001
From: Fate <fate-tmw@googlemail.com>
Date: Sat, 22 Nov 2008 01:15:00 -0700
Subject: Updated `marry' spell to new map location, made it NONMAGIC (cf.
 server update)

---
 conf/magic.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/magic.conf b/conf/magic.conf
index 7d3918b5..bfe56741 100644
--- a/conf/magic.conf
+++ b/conf/magic.conf
@@ -492,8 +492,8 @@ SPELL shroud : "#aw" =
 
 CONST MIN_MARRY_LEVEL = 32;
 
-SILENT SPELL marriage (target : PC) : "marry" =
-       (REQUIRE is_in(location(caster), @("new_29-1.gat", 28,39) @+ (8, 6)))=>
+NONMAGIC SILENT SPELL marriage (target : PC) : "marry" =
+       (REQUIRE is_in(location(caster), @("014-1.gat", 28,39) @+ (8, 6)))=>
        EFFECT IF target == caster  # no valid target or tried to marry self?
               THEN ABORT;
 
-- 
cgit v1.2.3-60-g2f50